diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-03 01:40:26 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-03 01:40:26 (GMT) |
| commit | 44cddd0b3cf69b1e10811f0000c0ddef02c15d58 (patch) | |
| tree | 536dc65cf43152e3934ac123086afa9d9d648483 /tests | |
| parent | b390d54471201731db1158fa21aa54fcef1f7582 (diff) | |
| parent | e5448f5e69f6d59256ba1816acf2647e808e10db (diff) | |
Merge branch 'master' of github.com:openscad/openscad into cmake_workaround
Conflicts:
tests/virtualfb.sh
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/CTestCustom.template | 6 | ||||
| -rwxr-xr-x | tests/test_cmdline_tool.py | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 611cb5f..8b7a252 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -179,6 +179,11 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(CMAKE_INCLUDE_DIRECTORIES_BEFORE ON) find_package(OpenGL REQUIRED) +if ( "${OPENGL_glu_LIBRARY}" MATCHES "NOTFOUND" ) + # GLU and Mesa split in late 2012 so some systems dont have GLU + find_library(OPENGL_glu_LIBRARY GLU HINTS "$ENV{OPENSCAD_LIBRARIES}/lib" REQUIRED) + set( OPENGL_LIBRARY ${OPENGL_glu_LIBRARY} ${OPENGL_LIBRARY} ) +endif() if (MINGW_CROSS_ENV_DIR) mingw_cross_env_find_qt() diff --git a/tests/CTestCustom.template b/tests/CTestCustom.template index 8ab2f5b..338f4b6 100644 --- a/tests/CTestCustom.template +++ b/tests/CTestCustom.template @@ -36,8 +36,10 @@ if( __cmake_system_name__ MATCHES "Linux|BSD") message("Process ID of vfb: ${VFB_PID}") endif() if ("${VFB_DISPLAY}" STREQUAL "" OR "${VFB_PID}" STREQUAL "") - message("Virtual framebuffer had a problem starting.") - execute_process("cat virtualfblog") + set(VFBLOG "virtualfb.log") + message("Virtual framebuffer had a problem starting. Printing ${VFBLOG}") + execute_process(COMMAND cat virtualfb.log OUTPUT_VARIABLE VFBLOGTXT) + message("Log: ${VFBLOGTXT}") else() message("Virtual framebuffer started. DISPLAY=${VFB_DISPLAY}, PID=${VFB_PID}") endif() diff --git a/tests/test_cmdline_tool.py b/tests/test_cmdline_tool.py index f29acc0..889c429 100755 --- a/tests/test_cmdline_tool.py +++ b/tests/test_cmdline_tool.py @@ -101,7 +101,7 @@ def compare_png(resultfilename): msg += '\n expected image: ' + expectedfilename + '\n' print >> sys.stderr, msg if not resultfilename: - print >> sys.stderr, "Error: OpenSCAD did not generate an image to test" + print >> sys.stderr, "Error: OpenSCAD error during test image generation" return False print >> sys.stderr, ' actual image: ', resultfilename |