18 files changed, 3 insertions, 2 deletions
diff --git a/CHANGE-LOG b/CHANGE-LOG
index d878805..cad1ff7 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -4,6 +4,7 @@ Phoronix Test Suite (Git)
 
 - pts-core: Improve size detection of low-capacity hard disks
 - pts-core: Improve lspci support for distributions using /sbin/lspci (such as OpenSuSE)
+- pts-core: Move base test profiles and resources to pts/base-test-profiles/ and pts/base-test-resources/
 - pts_Graph: Tweak formatting of basic graph attributes
 - pts: Add UXA acceleration check to GtkPerf test note reporting
 
diff --git a/pts-core/functions/pts-init.php b/pts-core/functions/pts-init.php
index 0efb39d..07adc4c 100644
--- a/pts-core/functions/pts-init.php
+++ b/pts-core/functions/pts-init.php
@@ -78,10 +78,10 @@ function pts_define_directories()
 
 	// Test & Suite Locations
 	define("XML_PROFILE_DIR", PTS_DIR . "pts/test-profiles/");
-	define("XML_PROFILE_CTP_BASE_DIR", XML_PROFILE_DIR . "base/");
+	define("XML_PROFILE_CTP_BASE_DIR", PTS_DIR . "pts/base-test-profiles/");
 	define("XML_SUITE_DIR", PTS_DIR . "pts/test-suites/");
 	define("TEST_RESOURCE_DIR", PTS_DIR . "pts/test-resources/");
-	define("TEST_RESOURCE_CTP_BASE_DIR", TEST_RESOURCE_DIR . "base/");
+	define("TEST_RESOURCE_CTP_BASE_DIR", PTS_DIR . "pts/base-test-resources/");
 	define("XML_PROFILE_LOCAL_DIR", PTS_USER_DIR . "test-profiles/");
 	define("XML_PROFILE_LOCAL_CTP_BASE_DIR", XML_PROFILE_LOCAL_DIR . "base/");
 	define("XML_SUITE_LOCAL_DIR", PTS_USER_DIR . "test-suites/");
diff --git a/pts/test-profiles/base/java-environment.xml b/pts/base-test-profiles/java-environment.xml
index 8270803..8270803 100644
--- a/pts/test-profiles/base/java-environment.xml
+++ b/pts/base-test-profiles/java-environment.xml
diff --git a/pts/test-profiles/base/timed-audio-encode.xml b/pts/base-test-profiles/timed-audio-encode.xml
index 705a79c..705a79c 100644
--- a/pts/test-profiles/base/timed-audio-encode.xml
+++ b/pts/base-test-profiles/timed-audio-encode.xml
diff --git a/pts/test-profiles/base/timed-build.xml b/pts/base-test-profiles/timed-build.xml
index d4c80f6..d4c80f6 100644
--- a/pts/test-profiles/base/timed-build.xml
+++ b/pts/base-test-profiles/timed-build.xml
diff --git a/pts/test-profiles/base/video-sample.xml b/pts/base-test-profiles/video-sample.xml
index 8e9e30c..8e9e30c 100644
--- a/pts/test-profiles/base/video-sample.xml
+++ b/pts/base-test-profiles/video-sample.xml
diff --git a/pts/test-profiles/base/wine-humus-tests.xml b/pts/base-test-profiles/wine-humus-tests.xml
index 1b7d839..1b7d839 100644
--- a/pts/test-profiles/base/wine-humus-tests.xml
+++ b/pts/base-test-profiles/wine-humus-tests.xml
diff --git a/pts/test-profiles/base/wine-unstable.xml b/pts/base-test-profiles/wine-unstable.xml
index 6efccab..6efccab 100644
--- a/pts/test-profiles/base/wine-unstable.xml
+++ b/pts/base-test-profiles/wine-unstable.xml
diff --git a/pts/test-resources/base/java-environment/post.php b/pts/base-test-resources/java-environment/post.php
index 1130c39..1130c39 100644
--- a/pts/test-resources/base/java-environment/post.php
+++ b/pts/base-test-resources/java-environment/post.php
diff --git a/pts/test-resources/base/timed-audio-encode/downloads.xml b/pts/base-test-resources/timed-audio-encode/downloads.xml
index 0f88fd2..0f88fd2 100644
--- a/pts/test-resources/base/timed-audio-encode/downloads.xml
+++ b/pts/base-test-resources/timed-audio-encode/downloads.xml
diff --git a/pts/test-resources/base/timed-audio-encode/install.sh b/pts/base-test-resources/timed-audio-encode/install.sh
index 6d844de..6d844de 100755
--- a/pts/test-resources/base/timed-audio-encode/install.sh
+++ b/pts/base-test-resources/timed-audio-encode/install.sh
diff --git a/pts/test-resources/base/video-sample/downloads.xml b/pts/base-test-resources/video-sample/downloads.xml
index da6247d..da6247d 100644
--- a/pts/test-resources/base/video-sample/downloads.xml
+++ b/pts/base-test-resources/video-sample/downloads.xml
diff --git a/pts/test-resources/base/video-sample/install.sh b/pts/base-test-resources/video-sample/install.sh
index 43f5c3b..43f5c3b 100755
--- a/pts/test-resources/base/video-sample/install.sh
+++ b/pts/base-test-resources/video-sample/install.sh
diff --git a/pts/test-resources/base/wine-humus-tests/install.sh b/pts/base-test-resources/wine-humus-tests/install.sh
index e7bf6f5..e7bf6f5 100755
--- a/pts/test-resources/base/wine-humus-tests/install.sh
+++ b/pts/base-test-resources/wine-humus-tests/install.sh
diff --git a/pts/test-resources/base/wine-humus-tests/parse-results.php b/pts/base-test-resources/wine-humus-tests/parse-results.php
index 20b0f53..20b0f53 100644
--- a/pts/test-resources/base/wine-humus-tests/parse-results.php
+++ b/pts/base-test-resources/wine-humus-tests/parse-results.php
diff --git a/pts/test-resources/base/wine-unstable/downloads.xml b/pts/base-test-resources/wine-unstable/downloads.xml
index b421936..b421936 100644
--- a/pts/test-resources/base/wine-unstable/downloads.xml
+++ b/pts/base-test-resources/wine-unstable/downloads.xml
diff --git a/pts/test-resources/base/wine-unstable/install.sh b/pts/base-test-resources/wine-unstable/install.sh
index 1936c6c..1936c6c 100755
--- a/pts/test-resources/base/wine-unstable/install.sh
+++ b/pts/base-test-resources/wine-unstable/install.sh
diff --git a/pts/test-resources/base/wine-unstable/post.php b/pts/base-test-resources/wine-unstable/post.php
index 77f60c6..77f60c6 100644
--- a/pts/test-resources/base/wine-unstable/post.php
+++ b/pts/base-test-resources/wine-unstable/post.php