From a49c068652d82ab40386bb702d0bd01e46015e7c Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Fri, 10 May 2013 12:51:46 +0200 Subject: Retain build dir in between tests --- contrib/ctest/common.ctest.inc | 4 ++-- contrib/ctest/hosts/buildslave-centos-5-32.ctest | 2 ++ contrib/ctest/hosts/buildslave-centos-6-64.ctest | 2 ++ contrib/ctest/hosts/buildslave-fedora-16-64.ctest | 2 ++ contrib/ctest/hosts/buildslave-opensuse-12-32.ctest | 2 ++ contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest | 2 ++ contrib/ctest/hosts/centos6x64-vii.ctest | 2 ++ contrib/ctest/hosts/debian64.ctest | 2 ++ contrib/ctest/hosts/epikur-win7-64.ctest | 2 ++ contrib/ctest/hosts/epikur.local.ctest | 2 ++ contrib/ctest/tests/ecma.ctest | 2 +- contrib/ctest/tests/xpath.ctest | 2 +- 12 files changed, 22 insertions(+), 4 deletions(-) diff --git a/contrib/ctest/common.ctest.inc b/contrib/ctest/common.ctest.inc index 2e25d22..c0ec100 100644 --- a/contrib/ctest/common.ctest.inc +++ b/contrib/ctest/common.ctest.inc @@ -97,9 +97,9 @@ set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_SOURCE_DIRECTO ### Test! ################################################################ # clean build directory for everything but continuous tests -#if (NOT ${CTEST_SUBMIT_TYPE} MATCHES ".*Continuous.*") +if (NOT RETAIN_BUILD_DIR) ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY}) -#endif() +endif() ctest_start(${CTEST_SUBMIT_TYPE}) # start testing # diff --git a/contrib/ctest/hosts/buildslave-centos-5-32.ctest b/contrib/ctest/hosts/buildslave-centos-5-32.ctest index 4d5ff46..cfc542f 100644 --- a/contrib/ctest/hosts/buildslave-centos-5-32.ctest +++ b/contrib/ctest/hosts/buildslave-centos-5-32.ctest @@ -2,10 +2,12 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_SITE "buildslave-centos-5-32") set(CTEST_BUILD_CONFIGURATION "Debug") +set(RETAIN_BUILD_DIR OFF) 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(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 4b77b77..beeeefd 100644 --- a/contrib/ctest/hosts/buildslave-centos-6-64.ctest +++ b/contrib/ctest/hosts/buildslave-centos-6-64.ctest @@ -2,10 +2,12 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_SITE "buildslave-centos-6-64") set(CTEST_BUILD_CONFIGURATION "Debug") +set(RETAIN_BUILD_DIR OFF) 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(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 166856e..717dcc7 100644 --- a/contrib/ctest/hosts/buildslave-fedora-16-64.ctest +++ b/contrib/ctest/hosts/buildslave-fedora-16-64.ctest @@ -2,10 +2,12 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_SITE "buildslave-fedora-16-64") set(CTEST_BUILD_CONFIGURATION "Debug") +set(RETAIN_BUILD_DIR OFF) 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(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 b3da55a..9192089 100644 --- a/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest +++ b/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest @@ -2,10 +2,12 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_SITE "buildslave-opensuse-12-32") set(CTEST_BUILD_CONFIGURATION "Debug") +set(RETAIN_BUILD_DIR OFF) set(CTEST_BUILD_NAME "linux-x86 gcc 4.7.2") include("tests/ecma.ctest") include("common.ctest.inc") +set(RETAIN_BUILD_DIR ON) 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 39d40aa..a09480e 100644 --- a/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest +++ b/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest @@ -2,10 +2,12 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_SITE "buildslave-ubuntu-1204-32") set(CTEST_BUILD_CONFIGURATION "Debug") +set(RETAIN_BUILD_DIR OFF) set(CTEST_BUILD_NAME "linux-x86 gcc 4.6.3") include("tests/ecma.ctest") include("common.ctest.inc") +set(RETAIN_BUILD_DIR ON) 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 11af4e9..d18bdaf 100644 --- a/contrib/ctest/hosts/centos6x64-vii.ctest +++ b/contrib/ctest/hosts/centos6x64-vii.ctest @@ -2,10 +2,12 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_SITE "centos6x64-vii") set(CTEST_BUILD_CONFIGURATION "Debug") +set(RETAIN_BUILD_DIR OFF) set(CTEST_BUILD_NAME "linux-x86_64 gcc") include("tests/ecma.ctest") include("common.ctest.inc") +set(RETAIN_BUILD_DIR ON) 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 d2a2abb..f0409e9 100644 --- a/contrib/ctest/hosts/debian64.ctest +++ b/contrib/ctest/hosts/debian64.ctest @@ -2,10 +2,12 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_SITE "epikur.local") set(CTEST_BUILD_CONFIGURATION "Debug") +set(RETAIN_BUILD_DIR OFF) set(CTEST_BUILD_NAME "darwin-x86_64 llvm") include("tests/ecma.ctest") include("common.ctest.inc") +set(RETAIN_BUILD_DIR ON) set(CTEST_BUILD_NAME "darwin-x86_64 llvm") include("tests/xpath.ctest") include("common.ctest.inc") diff --git a/contrib/ctest/hosts/epikur-win7-64.ctest b/contrib/ctest/hosts/epikur-win7-64.ctest index 4ef001d..95914cb 100644 --- a/contrib/ctest/hosts/epikur-win7-64.ctest +++ b/contrib/ctest/hosts/epikur-win7-64.ctest @@ -2,10 +2,12 @@ set(CTEST_CMAKE_GENERATOR "NMake Makefiles") set(CTEST_SITE "epikur-win7-64") set(CTEST_BUILD_CONFIGURATION "Debug") +set(RETAIN_BUILD_DIR OFF) set(CTEST_BUILD_NAME "win7-x86_64 msvc") include("tests/ecma.ctest") include("common.ctest.inc") +set(RETAIN_BUILD_DIR ON) set(CTEST_BUILD_NAME "win7-x86_64 msvc") include("tests/xpath.ctest") include("common.ctest.inc") diff --git a/contrib/ctest/hosts/epikur.local.ctest b/contrib/ctest/hosts/epikur.local.ctest index d2a2abb..f0409e9 100644 --- a/contrib/ctest/hosts/epikur.local.ctest +++ b/contrib/ctest/hosts/epikur.local.ctest @@ -2,10 +2,12 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_SITE "epikur.local") set(CTEST_BUILD_CONFIGURATION "Debug") +set(RETAIN_BUILD_DIR OFF) set(CTEST_BUILD_NAME "darwin-x86_64 llvm") include("tests/ecma.ctest") include("common.ctest.inc") +set(RETAIN_BUILD_DIR ON) set(CTEST_BUILD_NAME "darwin-x86_64 llvm") include("tests/xpath.ctest") include("common.ctest.inc") diff --git a/contrib/ctest/tests/ecma.ctest b/contrib/ctest/tests/ecma.ctest index 9c6f401..6396778 100644 --- a/contrib/ctest/tests/ecma.ctest +++ b/contrib/ctest/tests/ecma.ctest @@ -1,2 +1,2 @@ set(CTEST_BUILD_OPTIONS "-DRUN_W3C_ECMA_TESTS:BOOL=ON -DENABLE_GCOV:BOOL=ON") -set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME} - ECMAScript") \ No newline at end of file +set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME} - ecma") \ No newline at end of file diff --git a/contrib/ctest/tests/xpath.ctest b/contrib/ctest/tests/xpath.ctest index 25ccd30..5ebd47a 100644 --- a/contrib/ctest/tests/xpath.ctest +++ b/contrib/ctest/tests/xpath.ctest @@ -1,2 +1,2 @@ set(CTEST_BUILD_OPTIONS "-DRUN_W3C_XPATH_TESTS:BOOL=ON -DENABLE_GCOV:BOOL=ON") -set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME} - XPath") \ No newline at end of file +set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME} - xpath") \ No newline at end of file -- cgit v0.12