Generalized test scripts

15 files changed, 19 insertions, 154 deletions

diff --git a/contrib/ctest/common.ctest.inc b/contrib/ctest/common.ctest.inc
index 5be26ac..40d2db7 100644
--- a/contrib/ctest/common.ctest.inc
+++ b/contrib/ctest/common.ctest.inc
@@ -39,7 +39,8 @@
 # CTEST_CUSTOM_COVERAGE_EXCLUDE                     Regular expression for excluding files from coverage testing 
 
 if ("$ENV{CTEST_SUBMIT_TYPE}" STREQUAL "")
-	message(FATAL_ERROR "ENV{CTEST_SUBMIT_TYPE} is emtpy")
+	set(CTEST_SUBMIT_TYPE "Experimental")
+	message(STATUS "ENV{CTEST_SUBMIT_TYPE} is emtpy - defaulting to Experimental")
 endif()
 
 if ("$ENV{USCXML_SOURCE_DIR}" STREQUAL "")
diff --git a/contrib/ctest/hosts/buildslave-centos-5-32.ctest b/contrib/ctest/hosts/buildslave-centos-5-32.ctest
deleted file mode 100644
index 4c1d4ab..0000000
--- a/contrib/ctest/hosts/buildslave-centos-5-32.ctest
+++ /dev/null
@@ -1,13 +0,0 @@
-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 "${CMAKE_SYSTEM}-x86_64 gcc")
-include("tests/ecma.ctest")
-include("common.ctest.inc")
-
-set(RETAIN_BUILD_DIR OFF)
-set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 gcc")
-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
deleted file mode 100644
index 6a7f35e..0000000
--- a/contrib/ctest/hosts/buildslave-fedora-16-64.ctest
+++ /dev/null
@@ -1,13 +0,0 @@
-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 "${CMAKE_SYSTEM}-x86_64 gcc")
-include("tests/ecma.ctest")
-include("common.ctest.inc")
-
-set(RETAIN_BUILD_DIR OFF)
-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
deleted file mode 100644
index ec84c1b..0000000
--- a/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest
+++ /dev/null
@@ -1,18 +0,0 @@
-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 "${CMAKE_SYSTEM}-x86 gcc")
-include("tests/ecma.ctest")
-include("common.ctest.inc")
-
-set(RETAIN_BUILD_DIR OFF)
-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 "${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
deleted file mode 100644
index 1872a11..0000000
--- a/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest
+++ /dev/null
@@ -1,18 +0,0 @@
-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 "${CMAKE_SYSTEM}-x86 gcc")
-include("tests/ecma.ctest")
-include("common.ctest.inc")
-
-set(RETAIN_BUILD_DIR OFF)
-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 "${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
deleted file mode 100644
index f950b98..0000000
--- a/contrib/ctest/hosts/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 "${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
deleted file mode 100644
index a63cca2..0000000
--- a/contrib/ctest/hosts/centos6x64-vii.ctest
+++ /dev/null
@@ -1,13 +0,0 @@
-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 "${CMAKE_SYSTEM}-x86_64 gcc")
-include("tests/ecma.ctest")
-include("common.ctest.inc")
-
-set(RETAIN_BUILD_DIR OFF)
-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
deleted file mode 100644
index ea50039..0000000
--- a/contrib/ctest/hosts/debian64.ctest
+++ /dev/null
@@ -1,13 +0,0 @@
-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 "${CMAKE_SYSTEM}-x86_64 gcc")
-include("tests/ecma.ctest")
-include("common.ctest.inc")
-
-set(RETAIN_BUILD_DIR OFF)
-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.make.ctest
index ffa7bc1..7f5c652 100644
--- a/contrib/ctest/hosts/default.unix.ctest
+++ b/contrib/ctest/hosts/default.make.ctest
@@ -1,18 +1,20 @@
+if (NOT HOSTNAME)
+	set(HOSTNAME "Unknown Host")
+endif()
+
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
-set(CTEST_SITE "Unknown")
+set(CTEST_SITE "${HOSTNAME}")
 set(CTEST_BUILD_CONFIGURATION "Debug")
+set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}")
 
 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/default.nmake.ctest
index 1fdbb48..a9ea76d 100644
--- a/contrib/ctest/hosts/epikur-win7-64.ctest
+++ b/contrib/ctest/hosts/default.nmake.ctest
@@ -1,18 +1,20 @@
+if (NOT HOSTNAME)
+	set(HOSTNAME "Unknown Host")
+endif()
+
 set(CTEST_CMAKE_GENERATOR "NMake Makefiles")
-set(CTEST_SITE "epikur-win7-64")
+set(CTEST_SITE "${HOSTNAME}")
 set(CTEST_BUILD_CONFIGURATION "Debug")
+set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}")
 
 set(RETAIN_BUILD_DIR OFF)
-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 "${CMAKE_SYSTEM}-x86_64 msvc")
 include("tests/xpath.ctest")
 include("common.ctest.inc")
 
 set(RETAIN_BUILD_DIR OFF)
-set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}-x86_64 msvc")
 include("tests/plugins.ctest")
 include("common.ctest.inc")
diff --git a/contrib/ctest/hosts/dhcp1.alkit.se.ctest b/contrib/ctest/hosts/dhcp1.alkit.se.ctest
deleted file mode 120000
index 0116ab8..0000000
--- a/contrib/ctest/hosts/dhcp1.alkit.se.ctest
+++ /dev/null
@@ -1 +0,0 @@
-epikur.local.ctest
\ No newline at end of file
diff --git a/contrib/ctest/hosts/epikur.local.ctest b/contrib/ctest/hosts/epikur.local.ctest
deleted file mode 100644
index ae001d4..0000000
--- a/contrib/ctest/hosts/epikur.local.ctest
+++ /dev/null
@@ -1,19 +0,0 @@
-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 "${CMAKE_SYSTEM}-x86_64 clang")
-include("tests/plugins.ctest")
-include("common.ctest.inc")
-
-set(RETAIN_BUILD_DIR OFF)
-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 "${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
deleted file mode 100644
index 415ae28..0000000
--- a/contrib/ctest/hosts/hal9000.local.ctest
+++ /dev/null
@@ -1,19 +0,0 @@
-set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
-set(CTEST_SITE "hal9000.local")
-set(CTEST_BUILD_CONFIGURATION "Debug")
-
-set(RETAIN_BUILD_DIR OFF)
-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 "${CMAKE_SYSTEM}-i386 gcc")
-include("tests/ecma.ctest")
-include("common.ctest.inc")
-
-set(RETAIN_BUILD_DIR OFF)
-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 5916f4b..24a6f85 100755
--- a/contrib/ctest/run-tests.cron
+++ b/contrib/ctest/run-tests.cron
@@ -47,7 +47,7 @@ fi
 
 if [ ! -e $TESTFILE ]; then
 	echo "Warning: No tests for $HOSTNAME in $TESTFILE - defaulting."
-	TESTFILE=$HOSTS/default.unix.ctest
+	TESTFILE=$HOSTS/default.make.ctest
 fi
 
 #
@@ -76,4 +76,4 @@ if [ "$CTEST_SUBMIT_TYPE" = "Continuous" ]; then
 fi
 
 cd $TEST_DIR
-nice $CTEST -VV --timeout 20 -S $TESTFILE
\ No newline at end of file
+nice $CTEST -VV --timeout 20 -S $TESTFILE -DHOSTNAME=$HOSTNAME
\ No newline at end of file
diff --git a/contrib/ctest/run-tests.vbs b/contrib/ctest/run-tests.vbs
index 03e2774..6f73ddf 100644
--- a/contrib/ctest/run-tests.vbs
+++ b/contrib/ctest/run-tests.vbs
@@ -56,8 +56,8 @@ if (NOT fso.FileExists(USCXML_SOURCE_DIR + "\CMakeLists.txt")) Then
 End If
 
 if (NOT fso.FileExists(TESTFILE)) Then
-	MsgBox "Could not find test file for this host at " + TESTFILE
-	WScript.Quit
+	MsgBox "Warning: Could not find test file for this host at " + TESTFILE + " - defaulting"
+	TESTFILE = HOSTS + "\default.nmake.ctest"
 End If
 
 ' continue with cscript
@@ -79,7 +79,7 @@ if (CTEST_SUBMIT_TYPE = "Continuous") Then
 End If
 
 shell.CurrentDirectory = TEST_DIR
-Set exec = shell.Exec("CMD /S /K ctest -VV --timeout 100 -S " + TESTFILE + " 2>&1")
+Set exec = shell.Exec("CMD /S /K ctest -VV --timeout 100 -S " + TESTFILE + " -DHOSTNAME=" + HOSTNAME + " 2>&1")
 Do While exec.Status = 0
     WScript.Sleep 10
     WScript.StdOut.Write(exec.StdOut.ReadLine() & vbCRLF)