summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-10-24 18:58:19 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-10-24 18:58:19 (GMT)
commit2dff693e6e9134678da9c77533a999bd0f6d60ca (patch)
treeb8144b63659fe93216cbd3c2adf35724a80dbc84 /contrib
parentf3b46947a66b00d3e15edb5addba6bacceae535a (diff)
downloaduscxml-2dff693e6e9134678da9c77533a999bd0f6d60ca.zip
uscxml-2dff693e6e9134678da9c77533a999bd0f6d60ca.tar.gz
uscxml-2dff693e6e9134678da9c77533a999bd0f6d60ca.tar.bz2
Removed removal of prebuilts as part of tests
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ctest/common.ctest.inc11
-rw-r--r--contrib/ctest/hosts/buildslave-centos-5-32.ctest2
-rw-r--r--contrib/ctest/hosts/buildslave-centos-6-64.ctest2
-rw-r--r--contrib/ctest/hosts/buildslave-fedora-16-64.ctest2
-rw-r--r--contrib/ctest/hosts/buildslave-opensuse-12-32.ctest3
-rw-r--r--contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest3
-rw-r--r--contrib/ctest/hosts/centos6x64-vii.ctest2
-rw-r--r--contrib/ctest/hosts/debian64.ctest2
8 files changed, 0 insertions, 27 deletions
diff --git a/contrib/ctest/common.ctest.inc b/contrib/ctest/common.ctest.inc
index 39ffb30..5be26ac 100644
--- a/contrib/ctest/common.ctest.inc
+++ b/contrib/ctest/common.ctest.inc
@@ -105,17 +105,6 @@ if (NOT RETAIN_BUILD_DIR)
ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
endif()
-if (REMOVE_PREBUILDS)
- # on some platforms, REMOVE_RECURSE chokes on symlinks
- file(GLOB_RECURSE PREBUILDS "${CTEST_SOURCE_DIRECTORY}/contrib/prebuilt/*")
- if (PREBUILDS)
- file(REMOVE ${PREBUILDS})
- endif()
- file(REMOVE_RECURSE "${CTEST_SOURCE_DIRECTORY}/contrib/prebuilt")
- file(REMOVE "${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 80434c1..12aa0ab 100644
--- a/contrib/ctest/hosts/buildslave-centos-5-32.ctest
+++ b/contrib/ctest/hosts/buildslave-centos-5-32.ctest
@@ -3,13 +3,11 @@ 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 OFF)
-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 b068b75..473b321 100644
--- a/contrib/ctest/hosts/buildslave-centos-6-64.ctest
+++ b/contrib/ctest/hosts/buildslave-centos-6-64.ctest
@@ -3,13 +3,11 @@ 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 OFF)
-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 c84fa3f..c920e10 100644
--- a/contrib/ctest/hosts/buildslave-fedora-16-64.ctest
+++ b/contrib/ctest/hosts/buildslave-fedora-16-64.ctest
@@ -3,13 +3,11 @@ 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 OFF)
-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 e5a0406..4dd0dab 100644
--- a/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest
+++ b/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest
@@ -3,19 +3,16 @@ 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 OFF)
-set(REMOVE_PREBUILDS OFF)
set(CTEST_BUILD_NAME "linux-x86 gcc 4.7.2")
include("tests/xpath.ctest")
include("common.ctest.inc")
set(RETAIN_BUILD_DIR OFF)
-set(REMOVE_PREBUILDS OFF)
set(CTEST_BUILD_NAME "linux-x86 gcc 4.7.2")
include("tests/plugins.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 b77b3a7..ef3771e 100644
--- a/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest
+++ b/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest
@@ -3,19 +3,16 @@ 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 OFF)
-set(REMOVE_PREBUILDS OFF)
set(CTEST_BUILD_NAME "linux-x86 gcc 4.6.3")
include("tests/xpath.ctest")
include("common.ctest.inc")
set(RETAIN_BUILD_DIR OFF)
-set(REMOVE_PREBUILDS OFF)
set(CTEST_BUILD_NAME "linux-x86 gcc 4.6.3")
include("tests/plugins.ctest")
include("common.ctest.inc")
diff --git a/contrib/ctest/hosts/centos6x64-vii.ctest b/contrib/ctest/hosts/centos6x64-vii.ctest
index db42577..168af2c 100644
--- a/contrib/ctest/hosts/centos6x64-vii.ctest
+++ b/contrib/ctest/hosts/centos6x64-vii.ctest
@@ -3,13 +3,11 @@ 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 OFF)
-set(REMOVE_PREBUILDS OFF)
set(CTEST_BUILD_NAME "linux-x86_64 gcc")
include("tests/xpath.ctest")
include("common.ctest.inc")
diff --git a/contrib/ctest/hosts/debian64.ctest b/contrib/ctest/hosts/debian64.ctest
index 325c050..2eae8ce 100644
--- a/contrib/ctest/hosts/debian64.ctest
+++ b/contrib/ctest/hosts/debian64.ctest
@@ -3,13 +3,11 @@ set(CTEST_SITE "epikur.local")
set(CTEST_BUILD_CONFIGURATION "Debug")
set(RETAIN_BUILD_DIR OFF)
-set(REMOVE_PREBUILDS OFF)
set(CTEST_BUILD_NAME "darwin-x86_64 llvm")
include("tests/ecma.ctest")
include("common.ctest.inc")
set(RETAIN_BUILD_DIR OFF)
-set(REMOVE_PREBUILDS OFF)
set(CTEST_BUILD_NAME "darwin-x86_64 llvm")
include("tests/xpath.ctest")
include("common.ctest.inc")