From 2c75b4c6f2d60f74594ec4b58d1d81f01d5b197c Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Thu, 31 Oct 2013 01:01:58 +0100 Subject: Default on test script if none given per host --- contrib/ctest/hosts/buildslave-centos-5-32.ctest | 4 ++-- contrib/ctest/hosts/buildslave-centos-6-64.ctest | 13 ------------- contrib/ctest/hosts/buildslave-fedora-16-64.ctest | 4 ++-- contrib/ctest/hosts/buildslave-opensuse-12-32.ctest | 6 +++--- contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest | 6 +++--- contrib/ctest/hosts/centos-6-64.ctest | 13 +++++++++++++ contrib/ctest/hosts/centos6x64-vii.ctest | 4 ++-- contrib/ctest/hosts/debian64.ctest | 4 ++-- contrib/ctest/hosts/default.unix.ctest | 18 ++++++++++++++++++ contrib/ctest/hosts/epikur-win7-64.ctest | 6 +++--- contrib/ctest/hosts/epikur.local.ctest | 6 +++--- contrib/ctest/hosts/hal9000.local.ctest | 6 +++--- contrib/ctest/run-tests.cron | 4 ++-- 13 files changed, 56 insertions(+), 38 deletions(-) delete mode 100644 contrib/ctest/hosts/buildslave-centos-6-64.ctest create mode 100644 contrib/ctest/hosts/centos-6-64.ctest create mode 100644 contrib/ctest/hosts/default.unix.ctest diff --git a/contrib/ctest/hosts/buildslave-centos-5-32.ctest b/contrib/ctest/hosts/buildslave-centos-5-32.ctest index 12aa0ab..4c1d4ab 100644 --- a/contrib/ctest/hosts/buildslave-centos-5-32.ctest +++ b/contrib/ctest/hosts/buildslave-centos-5-32.ctest @@ -3,11 +3,11 @@ 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") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 gcc") include("tests/ecma.ctest") include("common.ctest.inc") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.1.2 - XPath datamodel") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 gcc") 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 deleted file mode 100644 index 473b321..0000000 --- a/contrib/ctest/hosts/buildslave-centos-6-64.ctest +++ /dev/null @@ -1,13 +0,0 @@ -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 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 c920e10..6a7f35e 100644 --- a/contrib/ctest/hosts/buildslave-fedora-16-64.ctest +++ b/contrib/ctest/hosts/buildslave-fedora-16-64.ctest @@ -3,11 +3,11 @@ 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") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 gcc") include("tests/ecma.ctest") include("common.ctest.inc") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.6.3") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 gcc") 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 4dd0dab..ec84c1b 100644 --- a/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest +++ b/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest @@ -3,16 +3,16 @@ 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") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86 gcc") include("tests/ecma.ctest") include("common.ctest.inc") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "linux-x86 gcc 4.7.2") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86 gcc") include("tests/xpath.ctest") include("common.ctest.inc") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "linux-x86 gcc 4.7.2") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86 gcc") 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 ef3771e..1872a11 100644 --- a/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest +++ b/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest @@ -3,16 +3,16 @@ 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") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86 gcc") include("tests/ecma.ctest") include("common.ctest.inc") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "linux-x86 gcc 4.6.3") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86 gcc") include("tests/xpath.ctest") include("common.ctest.inc") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "linux-x86 gcc 4.6.3") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86 gcc") include("tests/plugins.ctest") include("common.ctest.inc") diff --git a/contrib/ctest/hosts/centos-6-64.ctest b/contrib/ctest/hosts/centos-6-64.ctest new file mode 100644 index 0000000..f950b98 --- /dev/null +++ b/contrib/ctest/hosts/centos-6-64.ctest @@ -0,0 +1,13 @@ +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 "${CMAKE_SYSTEM}-x86_64 gcc 4.4.6") +include("tests/ecma.ctest") +include("common.ctest.inc") + +set(RETAIN_BUILD_DIR OFF) +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 gcc 4.4.6") +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 168af2c..a63cca2 100644 --- a/contrib/ctest/hosts/centos6x64-vii.ctest +++ b/contrib/ctest/hosts/centos6x64-vii.ctest @@ -3,11 +3,11 @@ set(CTEST_SITE "centos6x64-vii") set(CTEST_BUILD_CONFIGURATION "Debug") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "linux-x86_64 gcc") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 gcc") include("tests/ecma.ctest") include("common.ctest.inc") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "linux-x86_64 gcc") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-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 2eae8ce..ea50039 100644 --- a/contrib/ctest/hosts/debian64.ctest +++ b/contrib/ctest/hosts/debian64.ctest @@ -3,11 +3,11 @@ set(CTEST_SITE "epikur.local") set(CTEST_BUILD_CONFIGURATION "Debug") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "darwin-x86_64 llvm") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 gcc") include("tests/ecma.ctest") include("common.ctest.inc") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "darwin-x86_64 llvm") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 gcc") include("tests/xpath.ctest") include("common.ctest.inc") diff --git a/contrib/ctest/hosts/default.unix.ctest b/contrib/ctest/hosts/default.unix.ctest new file mode 100644 index 0000000..ffa7bc1 --- /dev/null +++ b/contrib/ctest/hosts/default.unix.ctest @@ -0,0 +1,18 @@ +set(CTEST_CMAKE_GENERATOR "Unix Makefiles") +set(CTEST_SITE "Unknown") +set(CTEST_BUILD_CONFIGURATION "Debug") + +set(RETAIN_BUILD_DIR OFF) +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}") +include("tests/plugins.ctest") +include("common.ctest.inc") + +set(RETAIN_BUILD_DIR OFF) +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}") +include("tests/ecma.ctest") +include("common.ctest.inc") + +set(RETAIN_BUILD_DIR OFF) +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}") +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 4f6e711..1fdbb48 100644 --- a/contrib/ctest/hosts/epikur-win7-64.ctest +++ b/contrib/ctest/hosts/epikur-win7-64.ctest @@ -3,16 +3,16 @@ set(CTEST_SITE "epikur-win7-64") set(CTEST_BUILD_CONFIGURATION "Debug") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "win7-x86_64 msvc") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 msvc") include("tests/ecma.ctest") include("common.ctest.inc") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "win7-x86_64 msvc") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 msvc") include("tests/xpath.ctest") include("common.ctest.inc") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "win7-x86_64 msvc") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 msvc") include("tests/plugins.ctest") include("common.ctest.inc") diff --git a/contrib/ctest/hosts/epikur.local.ctest b/contrib/ctest/hosts/epikur.local.ctest index f7d728d..ae001d4 100644 --- a/contrib/ctest/hosts/epikur.local.ctest +++ b/contrib/ctest/hosts/epikur.local.ctest @@ -3,17 +3,17 @@ set(CTEST_SITE "epikur.local") set(CTEST_BUILD_CONFIGURATION "Debug") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "darwin-x86_64 llvm") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 clang") include("tests/plugins.ctest") include("common.ctest.inc") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "darwin-x86_64 llvm") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 clang") include("tests/ecma.ctest") include("common.ctest.inc") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "darwin-x86_64 llvm") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 clang") include("tests/xpath.ctest") include("common.ctest.inc") diff --git a/contrib/ctest/hosts/hal9000.local.ctest b/contrib/ctest/hosts/hal9000.local.ctest index 32089af..415ae28 100644 --- a/contrib/ctest/hosts/hal9000.local.ctest +++ b/contrib/ctest/hosts/hal9000.local.ctest @@ -3,17 +3,17 @@ set(CTEST_SITE "hal9000.local") set(CTEST_BUILD_CONFIGURATION "Debug") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "darwin-i386 llvm") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-i386 gcc") include("tests/plugins.ctest") include("common.ctest.inc") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "darwin-i386 llvm") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-i386 gcc") include("tests/ecma.ctest") include("common.ctest.inc") set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "darwin-i386 llvm") +set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-i386 gcc") include("tests/xpath.ctest") include("common.ctest.inc") diff --git a/contrib/ctest/run-tests.cron b/contrib/ctest/run-tests.cron index 299a7d4..5916f4b 100755 --- a/contrib/ctest/run-tests.cron +++ b/contrib/ctest/run-tests.cron @@ -46,8 +46,8 @@ if [ ! -e ${USCXML_SOURCE_DIR}/CMakeLists.txt ]; then fi if [ ! -e $TESTFILE ]; then - echo "Error: No tests for $HOSTNAME in $TESTFILE." - exit; + echo "Warning: No tests for $HOSTNAME in $TESTFILE - defaulting." + TESTFILE=$HOSTS/default.unix.ctest fi # -- cgit v0.12