diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-04-12 20:20:56 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-04-12 20:20:56 (GMT) |
| commit | 3c0206b79166051fdec562b4575474d44daf5863 (patch) | |
| tree | e5425e7802ac2226e87e0fd71644e4f6e66c4cdc | |
| parent | 714c3d1ee60df7efb1523e752c26fe17e4c74fb2 (diff) | |
| download | uscxml-3c0206b79166051fdec562b4575474d44daf5863.zip uscxml-3c0206b79166051fdec562b4575474d44daf5863.tar.gz uscxml-3c0206b79166051fdec562b4575474d44daf5863.tar.bz2 | |
Reactivated coverage for nightly builds
| -rw-r--r-- | contrib/ctest/common.ctest.inc | 8 | ||||
| -rw-r--r-- | test/samples/w3c/ecma/test463.scxml | 2 | ||||
| -rw-r--r-- | test/samples/w3c/ecma/test530.scxml | 4 | ||||
| -rw-r--r-- | test/samples/w3c/ecma/test568.scxml | 6 |
4 files changed, 9 insertions, 11 deletions
diff --git a/contrib/ctest/common.ctest.inc b/contrib/ctest/common.ctest.inc index d00fac9..76b8e73 100644 --- a/contrib/ctest/common.ctest.inc +++ b/contrib/ctest/common.ctest.inc @@ -31,12 +31,14 @@ set(CTEST_SOURCE_DIRECTORY $ENV{USCXML_SOURCE_DIR}) set(CTEST_SUBMIT_TYPE $ENV{CTEST_SUBMIT_TYPE}) set(CTEST_BINARY_DIRECTORY "/tmp/build-uscxml-${CTEST_SUBMIT_TYPE}-${CTEST_SCRIPT_NAME}") -set(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 1048576) -set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 1048576) +set(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 4194304) +set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 4194304) ### Coverage and Memory checks? (untested) ################################ -#find_program(CTEST_COVERAGE_COMMAND NAMES gcov) +if (${CTEST_SUBMIT_TYPE} MATCHES "Nightly") + find_program(CTEST_COVERAGE_COMMAND NAMES gcov) +endif() #find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind) #set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE ${CTEST_SOURCE_DIRECTORY}/tests/valgrind.supp) diff --git a/test/samples/w3c/ecma/test463.scxml b/test/samples/w3c/ecma/test463.scxml index 8ff0555..4f32b84 100644 --- a/test/samples/w3c/ecma/test463.scxml +++ b/test/samples/w3c/ecma/test463.scxml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?><!-- test that the <data> tag creates an element in the XML datamodel with the correct name and id attr and binds an XPath variable to it --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath"> <datamodel> - <data id="foo" expr="20"/> + <data id="foo" expr="2"/> </datamodel> <state id="s0"> diff --git a/test/samples/w3c/ecma/test530.scxml b/test/samples/w3c/ecma/test530.scxml index 0090907..9361181 100644 --- a/test/samples/w3c/ecma/test530.scxml +++ b/test/samples/w3c/ecma/test530.scxml @@ -18,9 +18,7 @@ is evaluated at the right time, we should get invoke.done, otherwise an error - </invoke> <transition event="done.invoke" target="pass"/> - <transition event="*" target="fail"> - <log expr="_event.name" /> - </transition> + <transition event="*" target="fail"/> </state> <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final> diff --git a/test/samples/w3c/ecma/test568.scxml b/test/samples/w3c/ecma/test568.scxml index ebfce36..03d32dd 100644 --- a/test/samples/w3c/ecma/test568.scxml +++ b/test/samples/w3c/ecma/test568.scxml @@ -4,10 +4,8 @@ send events. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http: <state id="s0"> - <transition cond="$_ioprocessors/scxml/location/text()" target="pass"/> - <transition target="fail"> - <log expr="$_ioprocessors/processor[@name='scxml']/location/text()" /> - </transition> + <transition cond="$_ioprocessors/processor[@name='scxml']/location/text()" target="pass"/> + <transition target="fail"/> </state> |