diff --git a/plugins/processing/classification/test/DartTestfile.txt b/plugins/processing/classification/test/DartTestfile.txt index 60de8d20fe5e4f97029ff503bd4f4bc1b180d7c8..04fb506112b9763b2dd30c2c425cdb530e7c805f 100644 --- a/plugins/processing/classification/test/DartTestfile.txt +++ b/plugins/processing/classification/test/DartTestfile.txt @@ -18,7 +18,7 @@ FOREACH(TEST_NAME ${TEST_SCENARIOS}) SET(SCENARIO_TO_TEST "${TEST_NAME}.xml") - ADD_TEST(clean_Classification_${TEST_NAME} rm -f ${OV_LOGFILE} classifiers/multiclass.xml) + ADD_TEST(clean_Classification_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "remove" "-f" ${OV_LOGFILE} classifiers/multiclass.xml) ADD_TEST(run_Classification_${TEST_NAME} "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--invisible" "--no-session-management" --define Plugin_Classification_RandomizeKFoldTestData true "--play-fast" ${SCENARIO_TO_TEST}) ADD_TEST(compare_Classification_${TEST_NAME} "$ENV{OV_BINARY_PATH}/test_accuracy.${EXT}" "${OS_FLAGS}" "${OV_LOGFILE}") ADD_TEST(run_Classification_${TEST_NAME}_ProcessorBox "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--invisible" "--no-session-management" --define Plugin_Classification_RandomizeKFoldTestData true "--play-fast" "ProcessorBox-Test.xml") @@ -46,7 +46,7 @@ FOREACH(TEST_NAME ${TEST_SCENARIOS}) SET(SCENARIO_TO_TEST "shrinkageLDA/${TEST_NAME}.xml") - ADD_TEST(clean_Classification_${TEST_NAME} rm -f ${OV_LOGFILE}) + ADD_TEST(clean_Classification_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "remove" "-f" ${OV_LOGFILE}) ADD_TEST(run_Classification_${TEST_NAME} "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--invisible" "--no-session-management" --define Plugin_Classification_RandomizeKFoldTestData true "--play-fast" ${SCENARIO_TO_TEST}) ADD_TEST(compare_Classification_${TEST_NAME} "$ENV{OV_BINARY_PATH}/test_accuracy.${EXT}" "${OS_FLAGS}" "${OV_LOGFILE}" "${TEST_THRESHOLD}") diff --git a/plugins/processing/data-generation/test/DartTestfile.txt b/plugins/processing/data-generation/test/DartTestfile.txt index 163ef22c1cfa91ebaedaf7c89e45bf436b79056a..2a4281c52032d1cd5f1c5df2fdcb4a0c8bc4e57e 100644 --- a/plugins/processing/data-generation/test/DartTestfile.txt +++ b/plugins/processing/data-generation/test/DartTestfile.txt @@ -11,7 +11,7 @@ ELSE() SET(OS_FLAGS "") ENDIF() -ADD_TEST(clean_${TEST_NAME} "rm" "-f" "${TEST_NAME}.csv") +ADD_TEST(clean_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "remove" "-f" "${TEST_NAME}.csv") ADD_TEST(run_${TEST_NAME} "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--invisible" "--play" ${SCENARIO_TO_TEST}) ADD_TEST(compare_${TEST_NAME} "$ENV{OV_BINARY_PATH}/test_thresholdDataComparison.${EXT}" ${OS_FLAGS} "${TEST_NAME}.csv" "${TEST_NAME}.ref.csv" 0.001) diff --git a/plugins/processing/evaluation/test/DartTestfile.txt b/plugins/processing/evaluation/test/DartTestfile.txt index ef05c6fcc3b808b46db0ec121fe6646719f75a22..fdabe3204e14e8e287de41842f6d40d17f9f5571 100644 --- a/plugins/processing/evaluation/test/DartTestfile.txt +++ b/plugins/processing/evaluation/test/DartTestfile.txt @@ -10,7 +10,7 @@ ELSE(WIN32) SET(OS_FLAGS "") ENDIF(WIN32) -ADD_TEST(clean_Evaluation_kappa rm -f ${OV_LOGFILE}) +ADD_TEST(clean_Evaluation_kappa "${CMAKE_COMMAND}" "-E" "remove" "-f" ${OV_LOGFILE}) ADD_TEST(run_Evaluation_kappa "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--invisible" "--no-session-management" --define Plugin_Classification_RandomizeKFoldTestData true "--play-fast" Test-kappa.xml) ADD_TEST(compare_Evaluation_kappa "$ENV{OV_BINARY_PATH}/test_evaluation.${EXT}" "${OS_FLAGS}" "${OV_LOGFILE}") @@ -25,8 +25,8 @@ SET_TESTS_PROPERTIES(compare_Evaluation_kappa PROPERTIES ATTACHED_FILES_ON_FAIL ADD_TEST(run_Evaluation_statistic_generator "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--invisible" "--no-session-management" --define Plugin_Classification_RandomizeKFoldTestData true "--play-fast" Test-StatisticGenerator.xml) -ADD_TEST(compare_Evaluation_statistic_generator "diff" "--ignore-all-space" "stat.xml" "data/Statistic_comparison.xml") -ADD_TEST(clean_Evaluation_statistic_generator rm -f stat.xml) +ADD_TEST(compare_Evaluation_statistic_generator "git" "diff" "--no-index" "--ignore-space-change" "stat.xml" "data/Statistic_comparison.xml") +ADD_TEST(clean_Evaluation_statistic_generator "${CMAKE_COMMAND}" "-E" "remove" "-f" stat.xml) SET_TESTS_PROPERTIES(compare_Evaluation_statistic_generator PROPERTIES DEPENDS run_Evaluation_statistic_generator) @@ -37,7 +37,7 @@ SET_TESTS_PROPERTIES(compare_Evaluation_statistic_generator PROPERTIES ATTACHED_ #FIND_PROGRAM(SIKULI NAMES sikuli-ide) #IF(SIKULI) # IF(UNIX) -# ADD_TEST(sikuli_clean_Evaluation_ROC rm -f ${OV_LOGFILE} screenshot.png) +# ADD_TEST(sikuli_clean_Evaluation_ROC "${CMAKE_COMMAND}" "-E" "remove" "-f" ${OV_LOGFILE} screenshot.png) # ADD_TEST(sikuli_run_Evaluation_ROC "${SIKULI}" -t testROCCurve.UNIX.sikuli) # # SET_TESTS_PROPERTIES(sikuli_run_Evaluation_ROC PROPERTIES DEPENDS sikuli_clean_Evaluation_ROC) diff --git a/plugins/processing/file-io/test/DartTestfile.txt b/plugins/processing/file-io/test/DartTestfile.txt index 2c074bee1598e30448296872fcc744b30bfda268..179f5b01484f929ca5a52af37f3c18d9a793adc5 100644 --- a/plugins/processing/file-io/test/DartTestfile.txt +++ b/plugins/processing/file-io/test/DartTestfile.txt @@ -13,7 +13,7 @@ ENDIF() SET(TEST_NAME gdfreader) SET(SCENARIO_TO_TEST "${TEST_NAME}-test.xml") -ADD_TEST(clean_${TEST_NAME} "rm" "-f" "output_gdf*.csv") +ADD_TEST(clean_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "remove" "-f" "output_gdf*.csv") ADD_TEST(run_${TEST_NAME} "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--no-session-management" "--invisible" "--play-fast" ${SCENARIO_TO_TEST}) ADD_TEST(compare_${TEST_NAME}_125 "$ENV{OV_BINARY_PATH}/test_thresholdDataComparison.${EXT}" ${OS_FLAGS} "output_gdf125.csv" "test_gdfX.ref.csv" 0.0001) ADD_TEST(compare_${TEST_NAME}_211 "$ENV{OV_BINARY_PATH}/test_thresholdDataComparison.${EXT}" ${OS_FLAGS} "output_gdf211.csv" "test_gdfX.ref.csv" 0.0001) @@ -39,9 +39,9 @@ SET_TESTS_PROPERTIES(run_${TEST_NAME} PROPERTIES DEPENDS clean_${TEST_NAME}) SET(TEST_NAME ov-read-write) SET(SCENARIO_TO_TEST "${TEST_NAME}-test.xml") -ADD_TEST(clean_${TEST_NAME} "rm" "-f" "output_ov.ov") +ADD_TEST(clean_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "remove" "-f" "output_ov.ov") ADD_TEST(run_${TEST_NAME} "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--no-session-management" "--invisible" "--play-fast" ${SCENARIO_TO_TEST}) -ADD_TEST(compare_${TEST_NAME} diff "../signals/bci-motor-imagery.ov" "output_ov.ov") +ADD_TEST(compare_${TEST_NAME} "git" "diff" "--no-index" "../signals/bci-motor-imagery.ov" "output_ov.ov") SET_TESTS_PROPERTIES(run_${TEST_NAME} PROPERTIES ATTACHED_FILES_ON_FAIL ${OV_LOGFILE}) SET_TESTS_PROPERTIES(compare_${TEST_NAME} PROPERTIES ATTACHED_FILES_ON_FAIL ${OV_LOGFILE}) @@ -54,7 +54,7 @@ SET_TESTS_PROPERTIES(compare_${TEST_NAME} PROPERTIES DEPENDS run_${TEST_NAME}) SET(TEST_NAME csv-read-write) SET(SCENARIO_TO_TEST "${TEST_NAME}-test.xml") -ADD_TEST(clean_${TEST_NAME} "rm" "-f" "output_signal.csv" "output_streamedmatrix.csv" "output_stimulation.csv" "output_spectrum.csv" "output_features.csv") +ADD_TEST(clean_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "remove" "-f" "output_signal.csv" "output_streamedmatrix.csv" "output_stimulation.csv" "output_spectrum.csv" "output_features.csv") ADD_TEST(run_${TEST_NAME} "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--no-session-management" "--invisible" "--play-fast" ${SCENARIO_TO_TEST}) ADD_TEST(compare_${TEST_NAME}_signal "$ENV{OV_BINARY_PATH}/test_thresholdDataComparison.${EXT}" ${OS_FLAGS} "input_signal.csv" "output_signal.csv" 0.0001) ADD_TEST(compare_${TEST_NAME}_signal_badtimes "$ENV{OV_BINARY_PATH}/test_thresholdDataComparison.${EXT}" ${OS_FLAGS} "input_signal.csv" "output_signal_badtimes.csv" 0.0001) @@ -93,7 +93,7 @@ SET_TESTS_PROPERTIES(compare_${TEST_NAME}_features PROPERTIES DEPEND SET(TEST_NAME gdf-readwrite) -ADD_TEST(clean_${TEST_NAME} "rm" "-f" "output*.csv" "output*.gdf") +ADD_TEST(clean_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "remove" "-f" "output*.csv" "output*.gdf") ADD_TEST(run_${TEST_NAME}-1 "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--no-session-management" "--invisible" "--play-fast" "test-gdf-readwrite-1.xml") ADD_TEST(run_${TEST_NAME}-2 "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--no-session-management" "--invisible" "--play-fast" "test-gdf-readwrite-2.xml") ADD_TEST(run_${TEST_NAME}-3 "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--no-session-management" "--invisible" "--play-fast" "test-gdf-readwrite-3.xml") diff --git a/plugins/processing/signal-processing/test/DartTestfile.txt b/plugins/processing/signal-processing/test/DartTestfile.txt index 14bdfe1ffa21b11d3098db3215be5eee2faaa79f..5e95124d5fbf9a0fcc331bc12f3f1b087386121e 100644 --- a/plugins/processing/signal-processing/test/DartTestfile.txt +++ b/plugins/processing/signal-processing/test/DartTestfile.txt @@ -19,7 +19,7 @@ ELSE() SET(OS_FLAGS "") ENDIF() -ADD_TEST(clean_${TEST_NAME} "rm" "-f" "${SUBTEST1_NAME}.csv" "${SUBTEST2_NAME}.csv" "${SUBTEST3_NAME}.csv") +ADD_TEST(clean_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "remove" "-f" "${SUBTEST1_NAME}.csv" "${SUBTEST2_NAME}.csv" "${SUBTEST3_NAME}.csv") ADD_TEST(run_${TEST_NAME} "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--no-session-management" "--invisible" "--play" ${SCENARIO_TO_TEST}) # ADD_TEST(compare_${SUBTEST1_NAME} "$ENV{OV_BINARY_PATH}/test_thresholdDataComparison.${EXT}" ${OS_FLAGS} "${SUBTEST1_NAME}_${TEST_NAME}.csv" "${SUBTEST1_NAME}_${TEST_NAME}.ref.csv" 0.1) # ADD_TEST(compare_${SUBTEST2_NAME} "$ENV{OV_BINARY_PATH}/test_thresholdDataComparison.${EXT}" ${OS_FLAGS} "${SUBTEST2_NAME}_${TEST_NAME}.csv" "${SUBTEST2_NAME}_${TEST_NAME}.ref.csv" 0.1) @@ -42,7 +42,7 @@ SET_TESTS_PROPERTIES(run_${TEST_NAME} PROPERTIES ATTACHED_FILES_ON_FAIL ${OV_LOG #SET(TEST_NAME "PhaseLockingValue") #SET(SCENARIO_TO_TEST "${TEST_NAME}.xml") -#ADD_TEST(clean_${TEST_NAME} "rm" "-f" "${TEST_NAME}.csv") +#ADD_TEST(clean_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "remove" "-f" "${TEST_NAME}.csv") #ADD_TEST(run_${TEST_NAME} "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--no-session-management" "--invisible" "--play" ${SCENARIO_TO_TEST}) #ADD_TEST(compare_${TEST_NAME} "$ENV{OV_BINARY_PATH}/test_thresholdDataComparison.${EXT}" ${OS_FLAGS} "${TEST_NAME}.csv" "${TEST_NAME}.ref.csv" 0.1) @@ -61,7 +61,7 @@ SET_TESTS_PROPERTIES(run_${TEST_NAME} PROPERTIES ATTACHED_FILES_ON_FAIL ${OV_LOG SET(TEST_NAME "ARFeatures") SET(SCENARIO_TO_TEST "${TEST_NAME}.xml") -ADD_TEST(clean_${TEST_NAME} "rm" "-f" "${TEST_NAME}.csv") +ADD_TEST(clean_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "remove" "-f" "${TEST_NAME}.csv") ADD_TEST(run_${TEST_NAME} "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--no-session-management" "--invisible" "--play" ${SCENARIO_TO_TEST}) ADD_TEST(compare_${TEST_NAME} "$ENV{OV_BINARY_PATH}/test_thresholdDataComparison.${EXT}" ${OS_FLAGS} "${TEST_NAME}.csv" "${TEST_NAME}.ref.csv" 0.1) @@ -91,7 +91,7 @@ SET(TEST_THRESHOLDS 50 70 70 70) FOREACH(TEST_NAME ${TEST_SCENARIOS}) - ADD_TEST(clean_${TEST_NAME} rm -f ${OV_LOGFILE} output-${TEST_NAME}.txt) + ADD_TEST(clean_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "remove" "-f" ${OV_LOGFILE} output-${TEST_NAME}.txt) LIST(GET TEST_SHRINKS 0 PARAM_SHRINK) LIST(GET TEST_TIKHONOVS 0 PARAM_TIKHONOV) diff --git a/plugins/processing/stimulation/test/DartTestfile.txt b/plugins/processing/stimulation/test/DartTestfile.txt index a323a9dd61fafbfec513d3334238d77a060ef2f7..c856f016bd7cf1f136eda105edf8599e31936e28 100644 --- a/plugins/processing/stimulation/test/DartTestfile.txt +++ b/plugins/processing/stimulation/test/DartTestfile.txt @@ -3,18 +3,20 @@ IF(WIN32) SET(EXT cmd) SET(OS_FLAGS "--no-pause") + SET(OS_SUFFIX "") ELSE() SET(EXT sh) SET(OS_FLAGS "") + SET(OS_SUFFIX "-linux") ENDIF() # Simple Test of run-command box SET(TEST_NAME test-run-command) SET(SCENARIO_TO_TEST "${TEST_NAME}.xml") -ADD_TEST(clean_${TEST_NAME} "rm" "-f" "${TEST_NAME}.txt") +ADD_TEST(clean_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "remove" "-f" "${TEST_NAME}.txt") ADD_TEST(run_${TEST_NAME} "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--invisible" "--play" ${SCENARIO_TO_TEST}) -ADD_TEST(exist_${TEST_NAME} "ls" "${TEST_NAME}.txt") +ADD_TEST(exist_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "md5sum" "${TEST_NAME}.txt") ## add some properties that help to debug SET_TESTS_PROPERTIES(run_${TEST_NAME} PROPERTIES ATTACHED_FILES_ON_FAIL ${OV_LOGFILE}) @@ -29,14 +31,10 @@ SET_TESTS_PROPERTIES(run_${TEST_NAME} PROPERTIES DEPENDS clean_${TEST_NAME}}) # in both executable path and some of the arguments. We use cmake script 'wrap' to get access to the stdout # where the results are printed in this case. SET(TEST_NAME run-command-with-spaces) -IF(WIN32) - SET(SCENARIO_BASE "${TEST_NAME}") -ELSE(WIN32) - SET(SCENARIO_BASE "${TEST_NAME}-linux") -ENDIF(WIN32) -ADD_TEST(clean_${TEST_NAME} "rm" "-f" "${SCENARIO_BASE}.txt") -ADD_TEST(run_${TEST_NAME} "${CMAKE_COMMAND}" "-D" "SCENARIO_BASE:STRING=${SCENARIO_BASE}" "-P" "run-command-with-spaces-wrap.cmake") -ADD_TEST(compare_${TEST_NAME} "diff" "--strip-trailing-cr" "${SCENARIO_BASE}.ref.txt" "${SCENARIO_BASE}.txt") +SET(SCENARIO_TO_TEST "${TEST_NAME}.xml") +ADD_TEST(clean_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "remove" "-f" "${TEST_NAME}.txt") +ADD_TEST(run_${TEST_NAME} "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--invisible" "--no-session-management" "-d" "EXT" "${EXT}" "-d" "OUTFILE" "${TEST_NAME}.txt" "--play" ${SCENARIO_TO_TEST}) +ADD_TEST(compare_${TEST_NAME} "git" "diff" "--no-index" "--ignore-space-at-eol" "${TEST_NAME}${OS_SUFFIX}.ref.txt" "${TEST_NAME}.txt") ## add some properties that help to debug SET_TESTS_PROPERTIES(run_$ENV{OV_TEST_NAME} PROPERTIES ATTACHED_FILES_ON_FAIL ${OV_LOGFILE}) @@ -46,9 +44,9 @@ SET_TESTS_PROPERTIES(run_${TEST_NAME} PROPERTIES DEPENDS clean_${TEST_NAME}}) # Simple Test of timeout box SET(TEST_NAME test-timeout) SET(SCENARIO_TO_TEST "${TEST_NAME}.xml") -ADD_TEST(clean_${TEST_NAME} "rm" "-f" "${TEST_NAME}.txt") +ADD_TEST(clean_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "remove" "-f" "${TEST_NAME}.txt") ADD_TEST(run_${TEST_NAME} "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--invisible" "--play" ${SCENARIO_TO_TEST}) -ADD_TEST(exist_${TEST_NAME} "ls" "${TEST_NAME}.txt") +ADD_TEST(exist_${TEST_NAME} "${CMAKE_COMMAND}" "-E" "md5sum" "${TEST_NAME}.txt") ## add some properties that help to debug SET_TESTS_PROPERTIES(run_${TEST_NAME} PROPERTIES ATTACHED_FILES_ON_FAIL ${OV_LOGFILE}) diff --git a/plugins/processing/stimulation/test/run-command-with-spaces-linux.ref.txt b/plugins/processing/stimulation/test/run-command-with-spaces-linux.ref.txt index c13fb3259187aa7e341fc604cac05c548a831023..65528de85e6708bdf28c4e71cfd391d70c922dcc 100644 --- a/plugins/processing/stimulation/test/run-command-with-spaces-linux.ref.txt +++ b/plugins/processing/stimulation/test/run-command-with-spaces-linux.ref.txt @@ -1,3 +1,4 @@ +start TestRunCommand Params: 1=has space 2= 3= 4= TestRunCommand Params: 1=nospace 2= 3= 4= TestRunCommand Params: 1=has space 2=two 3= 4= diff --git a/plugins/processing/stimulation/test/run-command-with-spaces-linux.xml b/plugins/processing/stimulation/test/run-command-with-spaces-linux.xml deleted file mode 100755 index 422a7b668f9b4dd879bd9d69effeb4f3c6a0d8cc..0000000000000000000000000000000000000000 --- a/plugins/processing/stimulation/test/run-command-with-spaces-linux.xml +++ /dev/null @@ -1,413 +0,0 @@ - - 1 - openvibe - 2.0 - - - (0x000026b8, 0x00003463) - Run Command - (0x48843891, 0x7bfc57f4) - - - (0x6f752dd0, 0x082a321e) - Stimulations - - - - - (0x2c132d6e, 0x44ab0d97) - Stimulation 1 - OVTK_StimulationId_Label_01 - OVTK_StimulationId_Label_00 - false - - - (0x79a9edeb, 0x245d83fc) - Command 1 - - echo start - false - - - (0x2c132d6e, 0x44ab0d97) - Stimulation 2 - OVTK_StimulationId_Label_02 - OVTK_StimulationId_Label_00 - false - - - (0x79a9edeb, 0x245d83fc) - Command 2 - - "${Player_ScenarioDirectory}/space test/echoparams.sh" "has space" - false - - - (0x2c132d6e, 0x44ab0d97) - Stimulation 3 - OVTK_StimulationId_Label_03 - OVTK_StimulationId_Label_00 - false - - - (0x79a9edeb, 0x245d83fc) - Command 3 - - "${Player_ScenarioDirectory}/space test/echoparams.sh" nospace - false - - - (0x2c132d6e, 0x44ab0d97) - Stimulation 4 - OVTK_StimulationId_Label_04 - OVTK_StimulationId_Label_00 - false - - - (0x79a9edeb, 0x245d83fc) - Command 4 - - "${Player_ScenarioDirectory}/space test/echoparams.sh" "has space" two - false - - - (0x2c132d6e, 0x44ab0d97) - Stimulation 5 - OVTK_StimulationId_Label_05 - OVTK_StimulationId_Label_00 - false - - - (0x79a9edeb, 0x245d83fc) - Command 5 - - "${Player_ScenarioDirectory}/space test/echoparams.sh" - false - - - (0x2c132d6e, 0x44ab0d97) - Stimulation 6 - OVTK_StimulationId_Label_06 - OVTK_StimulationId_Label_00 - false - - - (0x79a9edeb, 0x245d83fc) - Command 6 - - "${Player_ScenarioDirectory}/space test/echoparams.sh" arg1 arg2 arg3 - false - - - - - (0x1fa7a38f, 0x54edbe0b) - 272.000000 - - - (0x1fa963f5, 0x1a638cd4) - 33 - - - (0x207c9054, 0x3c841b63) - 320.000000 - - - (0x4e7b798a, 0x183beafb) - (0xe44a71e7, 0x7964dd76) - - - (0x61d11811, 0x71e65362) - - - - (0xad100179, 0xa3c984ab) - 101 - - - (0xc46b3d00, 0x3e0454e1) - (0x00000000, 0x01871d22) - - - (0xc67a01dc, 0x28ce06c1) - - - - (0xc73e83ec, 0xf855c5bc) - false - - - (0xce18836a, 0x9c0eb403) - 2 - - - (0xcfad85b0, 0x7c6d841c) - 1 - - - - - (0x00004b2a, 0x00001be8) - Player Controller - (0x5f426dce, 0x08456e13) - - - (0x6f752dd0, 0x082a321e) - Stimulations - - - - - (0x2c132d6e, 0x44ab0d97) - Stimulation name - OVTK_StimulationId_Label_00 - OVTK_StimulationId_Label_00 - false - - - (0xcc14d8d6, 0xf27ecb73) - Action to perform - Pause - Stop - false - - - - - (0x1fa7a38f, 0x54edbe0b) - 336.000000 - - - (0x1fa963f5, 0x1a638cd4) - 23 - - - (0x207c9054, 0x3c841b63) - 496.000000 - - - (0x4e7b798a, 0x183beafb) - (0x568d148e, 0x650792b3) - - - (0xad100179, 0xa3c984ab) - 118 - - - (0xc46b3d00, 0x3e0454e1) - (0x00000000, 0x0133a23e) - - - (0xc73e83ec, 0xf855c5bc) - false - - - (0xce18836a, 0x9c0eb403) - 2 - - - (0xcfad85b0, 0x7c6d841c) - 1 - - - - - (0x00006d67, 0x00007b93) - Clock stimulator - (0x4f756d3f, 0x29ff0b96) - - - (0x6f752dd0, 0x082a321e) - Generated stimulations - - - - - (0x512a166f, 0x5c3ef83f) - Interstimulation interval (in sec) - 1.0 - 1 - false - - - (0x2c132d6e, 0x44ab0d97) - Stimulation - OVTK_StimulationId_Label_00 - OVTK_StimulationId_Label_00 - false - - - - - (0x1fa7a38f, 0x54edbe0b) - 193.000000 - - - (0x1fa963f5, 0x1a638cd4) - 23 - - - (0x207c9054, 0x3c841b63) - 496.000000 - - - (0x4e7b798a, 0x183beafb) - (0x27b3ee3c, 0xc50527e6) - - - (0xad100179, 0xa3c984ab) - 114 - - - (0xc46b3d00, 0x3e0454e1) - (0x00000000, 0x0155437c) - - - (0xc73e83ec, 0xf855c5bc) - false - - - (0xc80ce8af, 0xf699f813) - 1 - - - (0xce18836a, 0x9c0eb403) - 2 - - - - - (0x000078f5, 0x000049f4) - Clock stimulator - (0x4f756d3f, 0x29ff0b96) - - - (0x6f752dd0, 0x082a321e) - Generated stimulations - - - - - (0x512a166f, 0x5c3ef83f) - Interstimulation interval (in sec) - 1.0 - 1.0 - false - - - (0x2c132d6e, 0x44ab0d97) - Stimulation - OVTK_StimulationId_Label_00 - OVTK_StimulationId_Label_00 - false - - - - - (0x1fa7a38f, 0x54edbe0b) - 160.000000 - - - (0x1fa963f5, 0x1a638cd4) - 23 - - - (0x207c9054, 0x3c841b63) - 320.000000 - - - (0x4e7b798a, 0x183beafb) - (0x27b3ee3c, 0xc50527e6) - - - (0xad100179, 0xa3c984ab) - 114 - - - (0xc46b3d00, 0x3e0454e1) - (0x00000000, 0x0186214f) - - - (0xc73e83ec, 0xf855c5bc) - false - - - (0xc80ce8af, 0xf699f813) - 1 - - - (0xce18836a, 0x9c0eb403) - 2 - - - - - - - (0x00004df8, 0x00001737) - - (0x00006d67, 0x00007b93) - 0 - - - (0x00004b2a, 0x00001be8) - 0 - - - - (0x1b32c44c, 0x1905e0e9) - 211 - - - (0x358ae8b5, 0x0f8bacd1) - 496 - - - (0x3f0a3b27, 0x570913d2) - 320 - - - (0x6267b5c5, 0x676e3e42) - 496 - - - - - (0x00005fbf, 0x0000288c) - - (0x000078f5, 0x000049f4) - 0 - - - (0x000026b8, 0x00003463) - 0 - - - - (0x1b32c44c, 0x1905e0e9) - 178 - - - (0x358ae8b5, 0x0f8bacd1) - 320 - - - (0x3f0a3b27, 0x570913d2) - 251 - - - (0x6267b5c5, 0x676e3e42) - 320 - - - - - - - - (0x0000775c, 0x000078ff) - (0x3bcce5d2, 0x43f2d968) - [{"boxIdentifier":"(0xffffffff, 0xffffffff)","childCount":1,"height":320,"identifier":"(0x000037ad, 0x00007f7d)","index":0,"name":"Default window","parentIdentifier":"(0xffffffff, 0xffffffff)","type":1,"width":480},{"boxIdentifier":"(0xffffffff, 0xffffffff)","childCount":1,"identifier":"(0x00005418, 0x00006015)","index":0,"name":"Default tab","parentIdentifier":"(0x000037ad, 0x00007f7d)","type":2},{"boxIdentifier":"(0xffffffff, 0xffffffff)","childCount":0,"identifier":"(0x000034e0, 0x000049ae)","index":0,"name":"Empty","parentIdentifier":"(0x00005418, 0x00006015)","type":0}] - - - \ No newline at end of file diff --git a/plugins/processing/stimulation/test/run-command-with-spaces-wrap.cmake b/plugins/processing/stimulation/test/run-command-with-spaces-wrap.cmake deleted file mode 100644 index f8ba76ece35113fb043f92b76960dbee9bba7ae2..0000000000000000000000000000000000000000 --- a/plugins/processing/stimulation/test/run-command-with-spaces-wrap.cmake +++ /dev/null @@ -1,24 +0,0 @@ -IF(WIN32) - SET(EXT cmd) - SET(OS_FLAGS "--no-pause") -ELSE(WIN32) - SET(EXT sh) - SET(OS_FLAGS "") -ENDIF(WIN32) - -# MESSAGE(STATUS "PROC ${SCENARIO_BASE}") - -EXECUTE_PROCESS( - COMMAND "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--invisible" "--no-session-management" "--play" "${SCENARIO_BASE}.xml" - COMMAND "grep" "TestRunCommand Params:" - OUTPUT_VARIABLE OV_RESULT - OUTPUT_FILE "${SCENARIO_BASE}.txt") - -# MESSAGE(STATUS "Result was ${OV_RESULT}") - -# RETURN(${OV_RESULT}) - -# MESSAGE(STATUS "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--no-gui" "--no-session-management" "--play $ENV{OV_SCENARIO_TO_TEST}" OUTPUT_FILE "$ENV{OV_TEST_NAME}.tmp.txt") - - - diff --git a/plugins/processing/stimulation/test/run-command-with-spaces.ref.txt b/plugins/processing/stimulation/test/run-command-with-spaces.ref.txt index ef761c60871ed3abb40a934ee0897b888af273dd..ac88ce70c77fd86470a6764137a968e1c0796531 100755 --- a/plugins/processing/stimulation/test/run-command-with-spaces.ref.txt +++ b/plugins/processing/stimulation/test/run-command-with-spaces.ref.txt @@ -1,3 +1,4 @@ +start TestRunCommand Params: 1="has space" 2= 3= 4= TestRunCommand Params: 1=nospace 2= 3= 4= TestRunCommand Params: 1="has space" 2=two 3= 4= diff --git a/plugins/processing/stimulation/test/run-command-with-spaces.xml b/plugins/processing/stimulation/test/run-command-with-spaces.xml index bcb89057e48b25ce2c90453335bf6b8fc031bb48..95d43d0635b9d6d2a18910642e49c783c582b93c 100755 --- a/plugins/processing/stimulation/test/run-command-with-spaces.xml +++ b/plugins/processing/stimulation/test/run-command-with-spaces.xml @@ -25,7 +25,7 @@ (0x79a9edeb, 0x245d83fc) Command 1 - echo start + echo start > ${OUTFILE} false @@ -39,7 +39,7 @@ (0x79a9edeb, 0x245d83fc) Command 2 - "${Player_ScenarioDirectory}/space test/echoparams.bat" "has space" + "${Player_ScenarioDirectory}/space test/echoparams.${EXT}" "has space" >> ${OUTFILE} false @@ -53,7 +53,7 @@ (0x79a9edeb, 0x245d83fc) Command 3 - "${Player_ScenarioDirectory}/space test/echoparams.bat" nospace + "${Player_ScenarioDirectory}/space test/echoparams.${EXT}" nospace >> ${OUTFILE} false @@ -67,7 +67,7 @@ (0x79a9edeb, 0x245d83fc) Command 4 - "${Player_ScenarioDirectory}/space test/echoparams.bat" "has space" two + "${Player_ScenarioDirectory}/space test/echoparams.${EXT}" "has space" two >> ${OUTFILE} false @@ -81,7 +81,7 @@ (0x79a9edeb, 0x245d83fc) Command 5 - "${Player_ScenarioDirectory}/space test/echoparams.bat" + "${Player_ScenarioDirectory}/space test/echoparams.${EXT}" >> ${OUTFILE} false @@ -95,7 +95,7 @@ (0x79a9edeb, 0x245d83fc) Command 6 - "${Player_ScenarioDirectory}/space test/echoparams.bat" arg1 arg2 arg3 + "${Player_ScenarioDirectory}/space test/echoparams.${EXT}" arg1 arg2 arg3 >> ${OUTFILE} false diff --git a/plugins/processing/stimulation/test/space test/echoparams.bat b/plugins/processing/stimulation/test/space test/echoparams.cmd similarity index 100% rename from plugins/processing/stimulation/test/space test/echoparams.bat rename to plugins/processing/stimulation/test/space test/echoparams.cmd diff --git a/plugins/processing/stimulation/test/test-run-command.xml b/plugins/processing/stimulation/test/test-run-command.xml index b5db35fa39c661f73b1268d89904426036af6fdd..42ee5f7d8c5ac0b54e5a4864f3608d90d52cf9ba 100644 --- a/plugins/processing/stimulation/test/test-run-command.xml +++ b/plugins/processing/stimulation/test/test-run-command.xml @@ -82,7 +82,7 @@ (0x79a9edeb, 0x245d83fc) Command 1 - touch test-run-command.txt + echo "" > test-run-command.txt false diff --git a/plugins/processing/stimulation/test/test-timeout.xml b/plugins/processing/stimulation/test/test-timeout.xml index 7c71fcd239e2b26aef78a87b8b0a9082c3689c9a..1fef1067b1ed1be6c6b45d11db8d5d58b3f3994b 100644 --- a/plugins/processing/stimulation/test/test-timeout.xml +++ b/plugins/processing/stimulation/test/test-timeout.xml @@ -175,7 +175,7 @@ (0x79a9edeb, 0x245d83fc) Command 1 - touch test-timeout.txt + echo "" > test-timeout.txt false diff --git a/scripts/win32-openvibe-x.x.x-setup.nsi b/scripts/win32-openvibe-x.x.x-setup.nsi index d924e2422cc498076298e6f8db28ab2fc738fd03..7a8993134974b03c8a2e70e1de688bca46008e47 100644 --- a/scripts/win32-openvibe-x.x.x-setup.nsi +++ b/scripts/win32-openvibe-x.x.x-setup.nsi @@ -1,3 +1,12 @@ +; define a default for dep dir +!ifndef DEPENDENCIES_DIR + !define DEPENDENCIES_DIR "..\..\dependencies" +!endif + +!ifndef OUTFILE + !define OUTFILE "openvibe-2.0.0-setup.exe" +!endif + SetCompressor /FINAL /SOLID lzma SetCompressorDictSize 16 @@ -6,7 +15,7 @@ ;Name and file Name "OpenViBE 2.0.0" - OutFile "openvibe-2.0.0-setup.exe" + OutFile ${OUTFILE} ;Default installation folder InstallDir "$PROGRAMFILES\openvibe-2.0" @@ -136,10 +145,10 @@ no_need_to_install_directx: ; This is the destination path where the zips will be copied to SetOutPath "$INSTDIR\dependencies\arch" ; The following source paths are relative to this .nsi script location - File "..\..\dependencies\arch\build\windows\*runtime.zip" - File "..\..\dependencies\arch\build\windows\pthread*.zip" + File "${DEPENDENCIES_DIR}\arch\build\windows\*runtime.zip" + File "${DEPENDENCIES_DIR}\arch\build\windows\pthread*.zip" ; All vcredist packages extracted to the same folder - File "..\..\dependencies\arch\build\windows\vcredist*.zip" + File "${DEPENDENCIES_DIR}\arch\build\windows\vcredist*.zip" ; The zips are extracted here by the installer SetOutPath "$INSTDIR\dependencies" diff --git a/test/README.txt b/test/README.txt index 383c58a4b09937a71dca5fbdae86358377598808..a8039dea4086841579400828dd779df19560801a 100644 --- a/test/README.txt +++ b/test/README.txt @@ -43,7 +43,7 @@ ELSE(WIN32) ENDIF(WIN32) ADD_TEST(run_${TEST_NAME} "$ENV{OV_BINARY_PATH}/openvibe-designer.${EXT}" ${OS_FLAGS} "--invisible" "--play" ${SCENARIO_TO_TEST}) -ADD_TEST(comparator_${TEST_NAME} "diff" "${TEST_NAME}.csv" "${TEST_NAME}.ref.csv") +ADD_TEST(comparator_${TEST_NAME} "git" "diff" "--no-index" "${TEST_NAME}.csv" "${TEST_NAME}.ref.csv") ## add some properties that help to debug SET_TESTS_PROPERTIES(run_${TEST_NAME} PROPERTIES ATTACHED_FILES_ON_FAIL "${OV_LOGFILE}"}