From 3d2d61a4e08fe565f5e2fb0e519e1c767a127297 Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Fri, 10 May 2013 11:59:04 +0200 Subject: Split tests for ecma and xpath --- CMakeLists.txt | 3 ++- contrib/ctest/hosts/buildslave-centos-5-32.ctest | 8 +++++-- contrib/ctest/hosts/buildslave-centos-6-64.ctest | 6 ++++- contrib/ctest/hosts/buildslave-fedora-16-64.ctest | 6 ++++- .../ctest/hosts/buildslave-opensuse-12-32.ctest | 6 ++++- .../ctest/hosts/buildslave-ubuntu-1204-32.ctest | 6 ++++- contrib/ctest/hosts/centos6x64-vii.ctest | 8 +++++-- contrib/ctest/hosts/debian64.ctest | 8 +++++-- contrib/ctest/hosts/epikur-win7-64.ctest | 8 +++++-- contrib/ctest/hosts/epikur.local.ctest | 8 +++++-- contrib/ctest/tests/ecma.ctest | 2 ++ contrib/ctest/tests/generic.ctest | 1 - contrib/ctest/tests/xpath.ctest | 2 ++ test/CMakeLists.txt | 27 +++++++++++----------- 14 files changed, 70 insertions(+), 29 deletions(-) create mode 100644 contrib/ctest/tests/ecma.ctest delete mode 100644 contrib/ctest/tests/generic.ctest create mode 100644 contrib/ctest/tests/xpath.ctest diff --git a/CMakeLists.txt b/CMakeLists.txt index 86cd056..8e83d39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,7 +147,8 @@ if (CMAKE_CROSSCOMPILING) OPTION(BUILD_TESTS "Build USCXML tests" OFF) else() OPTION(BUILD_TESTS "Build USCXML tests" ON) - OPTION(RUN_W3C_TESTS "Run W3C tests" ON) + OPTION(RUN_W3C_ECMA_TESTS "Run W3C ECMAScript tests" OFF) + OPTION(RUN_W3C_XPATH_TESTS "Run W3C XPath tests" OFF) endif() OPTION(ENABLE_GCOV "Compile with gcov support" OFF) diff --git a/contrib/ctest/hosts/buildslave-centos-5-32.ctest b/contrib/ctest/hosts/buildslave-centos-5-32.ctest index eccb743..4d5ff46 100644 --- a/contrib/ctest/hosts/buildslave-centos-5-32.ctest +++ b/contrib/ctest/hosts/buildslave-centos-5-32.ctest @@ -2,6 +2,10 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_SITE "buildslave-centos-5-32") set(CTEST_BUILD_CONFIGURATION "Debug") -set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.1.2") -include("tests/generic.ctest") +set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.1.2 - ECMA datamodel") +include("tests/ecma.ctest") +include("common.ctest.inc") + +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 3eeca79..4b77b77 100644 --- a/contrib/ctest/hosts/buildslave-centos-6-64.ctest +++ b/contrib/ctest/hosts/buildslave-centos-6-64.ctest @@ -3,5 +3,9 @@ set(CTEST_SITE "buildslave-centos-6-64") set(CTEST_BUILD_CONFIGURATION "Debug") set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.4.6") -include("tests/generic.ctest") +include("tests/ecma.ctest") +include("common.ctest.inc") + +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 605ee8d..166856e 100644 --- a/contrib/ctest/hosts/buildslave-fedora-16-64.ctest +++ b/contrib/ctest/hosts/buildslave-fedora-16-64.ctest @@ -3,5 +3,9 @@ set(CTEST_SITE "buildslave-fedora-16-64") set(CTEST_BUILD_CONFIGURATION "Debug") set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.6.3") -include("tests/generic.ctest") +include("tests/ecma.ctest") +include("common.ctest.inc") + +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 a1c6cdb..b3da55a 100644 --- a/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest +++ b/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest @@ -3,5 +3,9 @@ set(CTEST_SITE "buildslave-opensuse-12-32") set(CTEST_BUILD_CONFIGURATION "Debug") set(CTEST_BUILD_NAME "linux-x86 gcc 4.7.2") -include("tests/generic.ctest") +include("tests/ecma.ctest") +include("common.ctest.inc") + +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 7d16ecd..39d40aa 100644 --- a/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest +++ b/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest @@ -3,5 +3,9 @@ set(CTEST_SITE "buildslave-ubuntu-1204-32") set(CTEST_BUILD_CONFIGURATION "Debug") set(CTEST_BUILD_NAME "linux-x86 gcc 4.6.3") -include("tests/generic.ctest") +include("tests/ecma.ctest") +include("common.ctest.inc") + +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 fc12e01..11af4e9 100644 --- a/contrib/ctest/hosts/centos6x64-vii.ctest +++ b/contrib/ctest/hosts/centos6x64-vii.ctest @@ -2,6 +2,10 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_SITE "centos6x64-vii") set(CTEST_BUILD_CONFIGURATION "Debug") -set(CTEST_BUILD_NAME "linux-x86_64 gcc generic") -include("tests/generic.ctest") +set(CTEST_BUILD_NAME "linux-x86_64 gcc") +include("tests/ecma.ctest") +include("common.ctest.inc") + +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 579e3dd..d2a2abb 100644 --- a/contrib/ctest/hosts/debian64.ctest +++ b/contrib/ctest/hosts/debian64.ctest @@ -2,6 +2,10 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_SITE "epikur.local") set(CTEST_BUILD_CONFIGURATION "Debug") -set(CTEST_BUILD_NAME "darwin-x86_64 llvm generic") -include("tests/generic.ctest") +set(CTEST_BUILD_NAME "darwin-x86_64 llvm") +include("tests/ecma.ctest") +include("common.ctest.inc") + +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 24c8dca..4ef001d 100644 --- a/contrib/ctest/hosts/epikur-win7-64.ctest +++ b/contrib/ctest/hosts/epikur-win7-64.ctest @@ -2,6 +2,10 @@ set(CTEST_CMAKE_GENERATOR "NMake Makefiles") set(CTEST_SITE "epikur-win7-64") set(CTEST_BUILD_CONFIGURATION "Debug") -set(CTEST_BUILD_NAME "win7-x86_64 msvc generic") -include("tests/generic.ctest") +set(CTEST_BUILD_NAME "win7-x86_64 msvc") +include("tests/ecma.ctest") +include("common.ctest.inc") + +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 579e3dd..d2a2abb 100644 --- a/contrib/ctest/hosts/epikur.local.ctest +++ b/contrib/ctest/hosts/epikur.local.ctest @@ -2,6 +2,10 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_SITE "epikur.local") set(CTEST_BUILD_CONFIGURATION "Debug") -set(CTEST_BUILD_NAME "darwin-x86_64 llvm generic") -include("tests/generic.ctest") +set(CTEST_BUILD_NAME "darwin-x86_64 llvm") +include("tests/ecma.ctest") +include("common.ctest.inc") + +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 new file mode 100644 index 0000000..9c6f401 --- /dev/null +++ b/contrib/ctest/tests/ecma.ctest @@ -0,0 +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 diff --git a/contrib/ctest/tests/generic.ctest b/contrib/ctest/tests/generic.ctest deleted file mode 100644 index 51db345..0000000 --- a/contrib/ctest/tests/generic.ctest +++ /dev/null @@ -1 +0,0 @@ -set(CTEST_BUILD_OPTIONS "-DRUN_W3C_TESTS:BOOL=ON -DENABLE_GCOV:BOOL=ON") diff --git a/contrib/ctest/tests/xpath.ctest b/contrib/ctest/tests/xpath.ctest new file mode 100644 index 0000000..25ccd30 --- /dev/null +++ b/contrib/ctest/tests/xpath.ctest @@ -0,0 +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 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 51bce49..4f803e7 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -73,22 +73,23 @@ set_target_properties(scxml-test-framework-client PROPERTIES FOLDER "Tests") # add_test(test-curl-multi-api ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-completion) # set_target_properties(test-curl-multi-api PROPERTIES FOLDER "Tests") -if (RUN_W3C_TESTS) - add_executable(test-w3c src/test-w3c.cpp ${PROJECT_SOURCE_DIR}/contrib/src/getopt/XGetopt.cpp) target_link_libraries(test-w3c uscxml) set_target_properties(test-w3c PROPERTIES FOLDER "Tests") - file(GLOB_RECURSE W3C_TESTS - samples/w3c/*.scxml - ) - - foreach( W3C_TEST ${W3C_TESTS} ) - string(REGEX MATCH "[^//]+/[^//]+.scxml" TEST_NAME ${W3C_TEST}) - #message("TEST_NAME: ${TEST_NAME}") - if (NOT TEST_NAME MATCHES ".*sub.*") +file(GLOB_RECURSE W3C_TESTS + samples/w3c/*.scxml +) + +foreach( W3C_TEST ${W3C_TESTS} ) + string(REGEX MATCH "[^//]+/[^//]+.scxml" TEST_NAME ${W3C_TEST}) + #message("TEST_NAME: ${TEST_NAME}") + if (NOT TEST_NAME MATCHES ".*sub.*") + if (RUN_W3C_ECMA_TESTS AND TEST_NAME MATCHES "^ecma\\/.*") + add_test(${TEST_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-w3c ${W3C_TEST}) + endif() + if (RUN_W3C_XPATH_TESTS AND TEST_NAME MATCHES "^xpath\\/.*") add_test(${TEST_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-w3c ${W3C_TEST}) endif() - endforeach() - -endif() \ No newline at end of file + endif() +endforeach() -- cgit v0.12