Some fixes for the build slaves

7 files changed, 17 insertions, 0 deletions

diff --git a/contrib/ctest/common.ctest.inc b/contrib/ctest/common.ctest.inc
index c0ec100..53a6c83 100644
--- a/contrib/ctest/common.ctest.inc
+++ b/contrib/ctest/common.ctest.inc
@@ -101,6 +101,11 @@ if (NOT RETAIN_BUILD_DIR)
 	ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
 endif()
 
+if (REMOVE_PREBUILDS)
+	file(REMOVE_RECURSE ${CTEST_SOURCE_DIRECTORY}/contrib/prebuilt)
+	file(MAKE_DIRECTORY ${CTEST_SOURCE_DIRECTORY}/contrib/prebuilt)
+endif()
+
 ctest_start(${CTEST_SUBMIT_TYPE}) # start testing
 #
 # I accidentally resynced when running from IDE thrice!
diff --git a/contrib/ctest/hosts/buildslave-centos-5-32.ctest b/contrib/ctest/hosts/buildslave-centos-5-32.ctest
index cfc542f..dfc4434 100644
--- a/contrib/ctest/hosts/buildslave-centos-5-32.ctest
+++ b/contrib/ctest/hosts/buildslave-centos-5-32.ctest
@@ -3,11 +3,13 @@ set(CTEST_SITE "buildslave-centos-5-32")
 set(CTEST_BUILD_CONFIGURATION "Debug")
 
 set(RETAIN_BUILD_DIR OFF)
+set(REMOVE_PREBUILDS ON)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.1.2 - ECMA datamodel")
 include("tests/ecma.ctest")
 include("common.ctest.inc")
 
 set(RETAIN_BUILD_DIR ON)
+set(REMOVE_PREBUILDS OFF)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.1.2 - XPath datamodel")
 include("tests/xpath.ctest")
 include("common.ctest.inc")
diff --git a/contrib/ctest/hosts/buildslave-centos-6-64.ctest b/contrib/ctest/hosts/buildslave-centos-6-64.ctest
index beeeefd..1636078 100644
--- a/contrib/ctest/hosts/buildslave-centos-6-64.ctest
+++ b/contrib/ctest/hosts/buildslave-centos-6-64.ctest
@@ -3,11 +3,13 @@ set(CTEST_SITE "buildslave-centos-6-64")
 set(CTEST_BUILD_CONFIGURATION "Debug")
 
 set(RETAIN_BUILD_DIR OFF)
+set(REMOVE_PREBUILDS ON)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.4.6")
 include("tests/ecma.ctest")
 include("common.ctest.inc")
 
 set(RETAIN_BUILD_DIR ON)
+set(REMOVE_PREBUILDS OFF)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.4.6")
 include("tests/xpath.ctest")
 include("common.ctest.inc")
diff --git a/contrib/ctest/hosts/buildslave-fedora-16-64.ctest b/contrib/ctest/hosts/buildslave-fedora-16-64.ctest
index 717dcc7..f00af2b 100644
--- a/contrib/ctest/hosts/buildslave-fedora-16-64.ctest
+++ b/contrib/ctest/hosts/buildslave-fedora-16-64.ctest
@@ -3,11 +3,13 @@ set(CTEST_SITE "buildslave-fedora-16-64")
 set(CTEST_BUILD_CONFIGURATION "Debug")
 
 set(RETAIN_BUILD_DIR OFF)
+set(REMOVE_PREBUILDS ON)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.6.3")
 include("tests/ecma.ctest")
 include("common.ctest.inc")
 
 set(RETAIN_BUILD_DIR ON)
+set(REMOVE_PREBUILDS OFF)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.6.3")
 include("tests/xpath.ctest")
 include("common.ctest.inc")
diff --git a/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest b/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest
index 9192089..0d56b13 100644
--- a/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest
+++ b/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest
@@ -3,11 +3,13 @@ set(CTEST_SITE "buildslave-opensuse-12-32")
 set(CTEST_BUILD_CONFIGURATION "Debug")
 
 set(RETAIN_BUILD_DIR OFF)
+set(REMOVE_PREBUILDS ON)
 set(CTEST_BUILD_NAME "linux-x86 gcc 4.7.2")
 include("tests/ecma.ctest")
 include("common.ctest.inc")
 
 set(RETAIN_BUILD_DIR ON)
+set(REMOVE_PREBUILDS OFF)
 set(CTEST_BUILD_NAME "linux-x86 gcc 4.7.2")
 include("tests/xpath.ctest")
 include("common.ctest.inc")
diff --git a/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest b/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest
index a09480e..ed37664 100644
--- a/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest
+++ b/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest
@@ -3,11 +3,13 @@ set(CTEST_SITE "buildslave-ubuntu-1204-32")
 set(CTEST_BUILD_CONFIGURATION "Debug")
 
 set(RETAIN_BUILD_DIR OFF)
+set(REMOVE_PREBUILDS ON)
 set(CTEST_BUILD_NAME "linux-x86 gcc 4.6.3")
 include("tests/ecma.ctest")
 include("common.ctest.inc")
 
 set(RETAIN_BUILD_DIR ON)
+set(REMOVE_PREBUILDS OFF)
 set(CTEST_BUILD_NAME "linux-x86 gcc 4.6.3")
 include("tests/xpath.ctest")
 include("common.ctest.inc")
diff --git a/contrib/ctest/hosts/centos6x64-vii.ctest b/contrib/ctest/hosts/centos6x64-vii.ctest
index d18bdaf..5249ee2 100644
--- a/contrib/ctest/hosts/centos6x64-vii.ctest
+++ b/contrib/ctest/hosts/centos6x64-vii.ctest
@@ -3,11 +3,13 @@ set(CTEST_SITE "centos6x64-vii")
 set(CTEST_BUILD_CONFIGURATION "Debug")
 
 set(RETAIN_BUILD_DIR OFF)
+set(REMOVE_PREBUILDS ON)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc")
 include("tests/ecma.ctest")
 include("common.ctest.inc")
 
 set(RETAIN_BUILD_DIR ON)
+set(REMOVE_PREBUILDS OFF)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc")
 include("tests/xpath.ctest")
 include("common.ctest.inc")