diff options
| author | Marius Kintel <marius@kintel.net> | 2013-02-03 02:13:37 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-02-03 02:13:37 (GMT) |
| commit | d2d22503eb0e9b5cfe3846562aa84af18a044907 (patch) | |
| tree | 536dc65cf43152e3934ac123086afa9d9d648483 /tests/CTestCustom.template | |
| parent | e5448f5e69f6d59256ba1816acf2647e808e10db (diff) | |
| parent | 44cddd0b3cf69b1e10811f0000c0ddef02c15d58 (diff) | |
Merge pull request #271 from openscad/cmake_workaround
Cmake workaround
Diffstat (limited to 'tests/CTestCustom.template')
| -rw-r--r-- | tests/CTestCustom.template | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/CTestCustom.template b/tests/CTestCustom.template index 0e51e21..338f4b6 100644 --- a/tests/CTestCustom.template +++ b/tests/CTestCustom.template @@ -24,8 +24,7 @@ if( __cmake_system_name__ MATCHES "Linux|BSD") else() message("X11 DISPLAY environment variable not found. Calling virtualfb.sh") execute_process( - COMMAND __cmake_current_source_dir__/virtualfb.sh start - OUTPUT_VARIABLE SVFB_OUT) + COMMAND __cmake_current_source_dir__/virtualfb.sh OUTPUT_VARIABLE SVFB_OUT) string(REGEX MATCH "DISPLAY=:[0-9.]*" VFB_DISPLAY_STR "${SVFB_OUT}") string(REGEX MATCH ":[0-9.]*" VFB_DISPLAY "${VFB_DISPLAY_STR}") string(REGEX MATCH "PID=[0-9.]*" VFB_PID_STR "${SVFB_OUT}") @@ -52,7 +51,7 @@ if( __cmake_system_name__ MATCHES "Linux|BSD") # in the build directory). set(ENV{DISPLAY} "${VFB_DISPLAY}") - set(CTEST_CUSTOM_POST_TEST "kill ${VFB_PID}") + set(CTEST_CUSTOM_POST_TEST "__cmake_current_source_dir__/virtualfb.sh") endif() endif() @@ -61,7 +60,7 @@ endif() message("running 'opencsgtest --info' to generate sysinfo.txt") execute_process(COMMAND __wine__ __cmake_current_binary_dir__/opencsgtest --info OUTPUT_FILE sysinfo.txt) -set(CTEST_CUSTOM_POST_TEST ${CTEST_CUSTOM_POST_TEST} "__python__ __cmake_current_source_dir__/test_pretty_print.py --builddir=__cmake_current_binary_dir__") +set(CTEST_CUSTOM_POST_TEST ${CTEST_CUSTOM_POST_TEST} "__cmake_current_binary_dir__/test_pretty_print") if ( ${debug_openscad_template} ) foreach(post_test ${CTEST_CUSTOM_POST_TEST} ) |