Merge pull request #49 from sradomski/master

Properly seperated tests into classes for build slaves

7 files changed, 30 insertions, 8 deletions

diff --git a/contrib/ctest/common.ctest.inc b/contrib/ctest/common.ctest.inc
index 40d2db7..c95259c 100644
--- a/contrib/ctest/common.ctest.inc
+++ b/contrib/ctest/common.ctest.inc
@@ -134,8 +134,16 @@ if (CTEST_TOOLCHAIN)
 else()
 	set(CTEST_BUILD_TARGET "")
 endif()
+
 ctest_build()                     # build custom target that depends on all the actual tests
-ctest_test()                      # run tests
+if (NOT "${USCXML_EXCLUDE_LABEL_REGEX}" STREQUAL "")
+	ctest_test(EXCLUDE_LABEL ${USCXML_EXCLUDE_LABEL_REGEX})
+elseif(NOT "${USCXML_INCLUDE_LABEL_REGEX}" STREQUAL "")
+	ctest_test(INCLUDE_LABEL ${USCXML_INCLUDE_LABEL_REGEX})
+else()
+	ctest_test()
+endif()
+
 
 if(CTEST_COVERAGE_COMMAND)
   ctest_coverage()
diff --git a/contrib/ctest/hosts/default.make.ctest b/contrib/ctest/hosts/default.make.ctest
index 7f5c652..12e161c 100644
--- a/contrib/ctest/hosts/default.make.ctest
+++ b/contrib/ctest/hosts/default.make.ctest
@@ -8,13 +8,17 @@ set(CTEST_BUILD_CONFIGURATION "Debug")
 set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}")
 
 set(RETAIN_BUILD_DIR OFF)
-include("tests/plugins.ctest")
+include("tests/general.ctest")
 include("common.ctest.inc")
 
-set(RETAIN_BUILD_DIR OFF)
+set(RETAIN_BUILD_DIR ON)
 include("tests/ecma.ctest")
 include("common.ctest.inc")
 
-set(RETAIN_BUILD_DIR OFF)
+set(RETAIN_BUILD_DIR ON)
 include("tests/xpath.ctest")
 include("common.ctest.inc")
+
+set(RETAIN_BUILD_DIR OFF)
+include("tests/plugins-ecma.ctest")
+include("common.ctest.inc")
diff --git a/contrib/ctest/tests/ecma.ctest b/contrib/ctest/tests/ecma.ctest
index 6396778..61a8da3 100644
--- a/contrib/ctest/tests/ecma.ctest
+++ b/contrib/ctest/tests/ecma.ctest
@@ -1,2 +1,4 @@
 set(CTEST_BUILD_OPTIONS "-DRUN_W3C_ECMA_TESTS:BOOL=ON -DENABLE_GCOV:BOOL=ON")
-set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME} - ecma")
\ No newline at end of file
+set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME} - ecma")
+set(USCXML_INCLUDE_LABEL_REGEX ".*ecma.*")
+set(USCXML_EXCLUDE_LABEL_REGEX "")
\ No newline at end of file
diff --git a/contrib/ctest/tests/general.ctest b/contrib/ctest/tests/general.ctest
new file mode 100644
index 0000000..701cc70
--- /dev/null
+++ b/contrib/ctest/tests/general.ctest
@@ -0,0 +1,4 @@
+set(CTEST_BUILD_OPTIONS "-DENABLE_GCOV:BOOL=ON")
+set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME} - general")
+set(USCXML_INCLUDE__LABEL_REGEX "")
+set(USCXML_EXCLUDE_LABEL_REGEX ".*[ecma|xpath].*")
diff --git a/contrib/ctest/tests/plugins-ecma.ctest b/contrib/ctest/tests/plugins-ecma.ctest
new file mode 100644
index 0000000..e9c2566
--- /dev/null
+++ b/contrib/ctest/tests/plugins-ecma.ctest
@@ -0,0 +1,4 @@
+set(CTEST_BUILD_OPTIONS "-DBUILD_AS_PLUGINS=ON -DENABLE_GCOV:BOOL=ON")
+set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME} - plugins")
+set(USCXML_INCLUDE_LABEL_REGEX ".*ecma.*")
+set(USCXML_EXCLUDE_LABEL_REGEX "")
diff --git a/contrib/ctest/tests/plugins.ctest b/contrib/ctest/tests/plugins.ctest
deleted file mode 100644
index a983bb9..0000000
--- a/contrib/ctest/tests/plugins.ctest
+++ /dev/null
@@ -1,2 +0,0 @@
-set(CTEST_BUILD_OPTIONS "-DBUILD_AS_PLUGINS=ON -DENABLE_GCOV:BOOL=ON")
-set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME} - plugins")
\ No newline at end of file
diff --git a/contrib/ctest/tests/xpath.ctest b/contrib/ctest/tests/xpath.ctest
index 5ebd47a..5e0e1dc 100644
--- a/contrib/ctest/tests/xpath.ctest
+++ b/contrib/ctest/tests/xpath.ctest
@@ -1,2 +1,4 @@
 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")
+set(USCXML_INCLUDE_LABEL_REGEX ".*xpath.*")
+set(USCXML_EXCLUDE_LABEL_REGEX "")