diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-06-12 23:02:12 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-06-12 23:02:12 (GMT) |
| commit | 57510db0f3f10f85ecea53376ccf40688e2475bd (patch) | |
| tree | a5c19df017c945ab1c931c979ed2dbad1afe25e2 /test | |
| parent | d22ea4f60d6fee6a7dc564e5e83719eb2c189425 (diff) | |
| download | uscxml-57510db0f3f10f85ecea53376ccf40688e2475bd.zip uscxml-57510db0f3f10f85ecea53376ccf40688e2475bd.tar.gz uscxml-57510db0f3f10f85ecea53376ccf40688e2475bd.tar.bz2 | |
Fixed build issues on unices
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | test/samples/uscxml/test-prolog.scxml | 5 |
2 files changed, 16 insertions, 11 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 9bfe9da..6e00d52 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -10,16 +10,16 @@ if (NOT WIN32) set_target_properties(test-predicates PROPERTIES FOLDER "Tests") endif() -add_test(test-execution ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mmi-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-execution.scxml) -add_test(test-communication ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mmi-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-communication.scxml) -add_test(test-done-data ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mmi-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-donedata.scxml) +add_test(test-execution ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-execution.scxml) +add_test(test-communication ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-communication.scxml) +add_test(test-done-data ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-donedata.scxml) if (SWI_FOUND) - add_test(test-prolog-swi ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mmi-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-prolog.scxml) + add_test(test-prolog-swi ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-prolog.scxml) endif() if (V8_FOUND) - add_test(test-ecmascript ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mmi-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-ecmascript.scxml) + add_test(test-ecmascript ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-ecmascript.scxml) endif() if (OPENSCENEGRAPH_FOUND AND OFF) @@ -58,12 +58,12 @@ target_link_libraries(test-url uscxml) add_test(test-url ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-url) set_target_properties(test-url PROPERTIES FOLDER "Tests") -if (NOT WIN32) - add_executable(test-mmi src/test-mmi.cpp) - target_link_libraries(test-mmi uscxml) - add_test(test-url ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-mmi) - set_target_properties(test-mmi PROPERTIES FOLDER "Tests") -endif() +# if (NOT WIN32) +# add_executable(test-mmi src/test-mmi.cpp) +# target_link_libraries(test-mmi uscxml) +# add_test(test-url ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-mmi) +# set_target_properties(test-mmi PROPERTIES FOLDER "Tests") +# endif() add_executable(scxml-test-framework-client src/scxml-test-framework-client.cpp) diff --git a/test/samples/uscxml/test-prolog.scxml b/test/samples/uscxml/test-prolog.scxml index 3fe7608..8ccfd6b 100644 --- a/test/samples/uscxml/test-prolog.scxml +++ b/test/samples/uscxml/test-prolog.scxml @@ -1,5 +1,6 @@ <scxml datamodel="prolog"> <datamodel> + <data src="" /> <data id="father"> bob, jim. bob, john. @@ -58,6 +59,10 @@ <log expr="listing." /> <respond status="200" to="event(origin(X))" /> </transition> + <transition event="http.post" cond="" target="idle"> + <log expr="listing." /> + <respond status="200" to="event(origin(X))" /> + </transition> </state> <state id="end" final="true" /> |