diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2015-01-19 16:41:18 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2015-01-19 16:41:18 (GMT) |
| commit | ff86d690dc02d7dd495000331d378e7d8eb688ac (patch) | |
| tree | 5214786f7e575952d3cba0919e5071f3a783050b /test/w3c | |
| parent | 42437db418574f2a80d098e568b9498a21343800 (diff) | |
| download | uscxml-ff86d690dc02d7dd495000331d378e7d8eb688ac.zip uscxml-ff86d690dc02d7dd495000331d378e7d8eb688ac.tar.gz uscxml-ff86d690dc02d7dd495000331d378e7d8eb688ac.tar.bz2 | |
Plenty of smaller fixes and adaptations
Diffstat (limited to 'test/w3c')
| -rwxr-xr-x | test/w3c/analyze_tests.pl | 21 | ||||
| -rw-r--r-- | test/w3c/run_promela_test.cmake | 5 |
2 files changed, 17 insertions, 9 deletions
diff --git a/test/w3c/analyze_tests.pl b/test/w3c/analyze_tests.pl index 111db5a..a14c129 100755 --- a/test/w3c/analyze_tests.pl +++ b/test/w3c/analyze_tests.pl @@ -119,17 +119,22 @@ while ($block = <FILE>) { / Approximate\sComplexity:\s(\d+)\n Approximate\sActive\sComplexity:\s(\d+)\n - Actual\sComplexity:\s(\d+)\n - Actual\sActive\sComplexity:\s(\d+)\n - Internal\sQueue:\s(\d+)\n - External\sQueue:\s(\d+)\n /x ) { $test->{$currTest}->{'flat'}->{'cmplx'}->{'appr'} = $1; $test->{$currTest}->{'flat'}->{'cmplx'}->{'apprActv'} = $2; - $test->{$currTest}->{'flat'}->{'cmplx'}->{'actual'} = $3; - $test->{$currTest}->{'flat'}->{'cmplx'}->{'actualActv'} = $4; - $test->{$currTest}->{'flat'}->{'queue'}->{'internal'} = $5; - $test->{$currTest}->{'flat'}->{'queue'}->{'external'} = $6; + + if ($block =~ + / + Actual\sComplexity:\s(\d+)\n + Actual\sActive\sComplexity:\s(\d+)\n + Internal\sQueue:\s(\d+)\n + External\sQueue:\s(\d+)\n + /x ) { + $test->{$currTest}->{'flat'}->{'cmplx'}->{'actual'} = $1; + $test->{$currTest}->{'flat'}->{'cmplx'}->{'actualActv'} = $2; + $test->{$currTest}->{'flat'}->{'queue'}->{'internal'} = $3; + $test->{$currTest}->{'flat'}->{'queue'}->{'external'} = $4; + } if ($block =~ /State-vector (\d+) byte, depth reached (\d+), errors: (\d+)/) { $test->{$currTest}->{'pml'}->{'states'}->{'stateSize'} = $1; diff --git a/test/w3c/run_promela_test.cmake b/test/w3c/run_promela_test.cmake index e19148f..e6d2418 100644 --- a/test/w3c/run_promela_test.cmake +++ b/test/w3c/run_promela_test.cmake @@ -3,7 +3,10 @@ get_filename_component(TEST_FILE_NAME ${TESTFILE} NAME) execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${OUTDIR}) -execute_process(COMMAND ${USCXML_TRANSFORM_BIN} -i ${TESTFILE} -o ${OUTDIR}/${TEST_FILE_NAME}.pml RESULT_VARIABLE CMD_RESULT) +set(ENV{USCXML_PROMELA_TRANSITION_TRACE} "TRUE") +set(ENV{USCXML_PROMELA_TRANSITION_DEBUG} "TRUE") + +execute_process(COMMAND ${USCXML_TRANSFORM_BIN} -tpml -i ${TESTFILE} -o ${OUTDIR}/${TEST_FILE_NAME}.pml RESULT_VARIABLE CMD_RESULT) if(CMD_RESULT) message(FATAL_ERROR "Error running ${USCXML_TRANSFORM_BIN}: ${CMD_RESULT}") endif() |