diff options
| author | Stefan Radomski <sradomski@mintwerk.de> | 2016-01-28 22:13:18 (GMT) |
|---|---|---|
| committer | Stefan Radomski <sradomski@mintwerk.de> | 2016-01-28 22:13:18 (GMT) |
| commit | 81799f6f7d667e11ba0a30875046ca3dc0c63fe7 (patch) | |
| tree | 77e8047d8854e5210cfe1f261cf8a43451f7dae8 /test/CMakeLists.txt | |
| parent | 2c0b28093912f23e52e79281dddb6e2049673f29 (diff) | |
| download | uscxml-81799f6f7d667e11ba0a30875046ca3dc0c63fe7.zip uscxml-81799f6f7d667e11ba0a30875046ca3dc0c63fe7.tar.gz uscxml-81799f6f7d667e11ba0a30875046ca3dc0c63fe7.tar.bz2 | |
Actually generate ANSI C code in uscxml-transform
Diffstat (limited to 'test/CMakeLists.txt')
| -rw-r--r-- | test/CMakeLists.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a47368f..42e518b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -81,8 +81,8 @@ add_test(test-done-data ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE # declare W#C tests find_program(SPIN spin) -find_program(GCC gcc) -find_program(GPP g++) +find_program(CC gcc) +find_program(CXX g++) if (NOT BUILD_MINIMAL) # compile and add all reported issues tests @@ -199,8 +199,8 @@ if (NOT BUILD_MINIMAL) -DTARGETLANG=${TEST_TARGET} -DJSC_LIBRARY:FILEPATH=${JSC_LIBRARY} -DUSCXML_TRANSFORM_BIN:FILEPATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-transform - -DGCC_BIN:FILEPATH=${GCC} - -DGPP_BIN:FILEPATH=${GPP} + -DCC_BIN:FILEPATH=${CC} + -DCXX_BIN:FILEPATH=${CXX} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DUSCXML_PLATFORM_ID=${USCXML_PLATFORM_ID} -DCMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} @@ -234,7 +234,7 @@ if (NOT BUILD_MINIMAL) -DTESTFILE:FILEPATH=${W3C_TEST} -DUSCXML_TRANSFORM_BIN:FILEPATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-transform -DSPIN_BIN:FILEPATH=${SPIN} - -DGCC_BIN:FILEPATH=${GCC} + -DCC_BIN:FILEPATH=${CC} -P ${CMAKE_CURRENT_SOURCE_DIR}/w3c/run_promela_test.cmake) set_tests_properties("${TEST_NAME}" PROPERTIES PASS_REGULAR_EXPRESSION "depth reached [0-9]+, errors: 0") set_tests_properties("${TEST_NAME}" PROPERTIES FAIL_REGULAR_EXPRESSION "depth reached [0-9]+, errors: [1-9]+") @@ -290,8 +290,8 @@ if (NOT BUILD_MINIMAL) # -DTESTFILE:FILEPATH=${W3C_TEST} # -DJSC_LIBRARY:FILEPATH=${JSC_LIBRARY} # -DUSCXML_TRANSFORM_BIN:FILEPATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-transform - # -DGCC_BIN:FILEPATH=${GCC} - # -DGPP_BIN:FILEPATH=${GPP} + # -DCC_BIN:FILEPATH=${CC} + # -DCXX_BIN:FILEPATH=${CXX} # -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} # -DUSCXML_PLATFORM_ID=${USCXML_PLATFORM_ID} # -DCMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} @@ -387,7 +387,7 @@ if (NOT BUILD_MINIMAL) # endif() # endif() # - # if (GCC AND SPIN AND BUILD_DM_PROMELA AND BUILD_TESTS_W3C_PROMELA AND TEST_NAME MATCHES "^promela\\/.*") + # if (CC AND SPIN AND BUILD_DM_PROMELA AND BUILD_TESTS_W3C_PROMELA AND TEST_NAME MATCHES "^promela\\/.*") # # add_test(NAME "spin/${TEST_NAME}" # COMMAND ${CMAKE_COMMAND} @@ -395,7 +395,7 @@ if (NOT BUILD_MINIMAL) # -DTESTFILE:FILEPATH=${W3C_TEST} # -DUSCXML_TRANSFORM_BIN:FILEPATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-transform # -DSPIN_BIN:FILEPATH=${SPIN} - # -DGCC_BIN:FILEPATH=${GCC} + # -DCC_BIN:FILEPATH=${CC} # -P ${CMAKE_CURRENT_SOURCE_DIR}/w3c/run_promela_test.cmake) # set_property(TEST "spin/${TEST_NAME}" PROPERTY LABELS "spin/${TEST_NAME}") # set_tests_properties("spin/${TEST_NAME}" PROPERTIES TIMEOUT ${TEST_TIMEOUT}) |