diff options
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 124 |
1 files changed, 86 insertions, 38 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c8eacfb..b38f278 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -674,11 +674,11 @@ endfunction() # # This functions adds cmd-line tests given files. # -# Usage add_cmdline_test(testname [EXE <executable>] [ARGS <args to exe>] +# Usage add_cmdline_test(testbasename [EXE <executable>] [ARGS <args to exe>] # [EXPECTEDDIR <shared dir>] SUFFIX <suffix> FILES <test files>) # find_package(PythonInterp) -function(add_cmdline_test TESTCMD) +function(add_cmdline_test TESTCMD_BASENAME) cmake_parse_arguments(TESTCMD "" "EXE;SUFFIX;EXPECTEDDIR" "FILES;ARGS" ${ARGN}) # If sharing results with another test, pass on this to the python script @@ -686,18 +686,18 @@ function(add_cmdline_test TESTCMD) set(EXTRA_OPTIONS -e ${TESTCMD_EXPECTEDDIR}) endif() - get_filename_component(TESTCMD_NAME ${TESTCMD} NAME_WE) - - # If no executable was specified, assume it was built by us and resides here - if (NOT TESTCMD_EXE) - set(TESTCMD_EXE ${CMAKE_BINARY_DIR}/${TESTCMD}) + if (TESTCMD_EXE) + set(TESTNAME_OPTION -t ${TESTCMD_BASENAME}) + else() + # If no executable was specified, assume it was built by us and resides here + set(TESTCMD_EXE ${CMAKE_BINARY_DIR}/${TESTCMD_BASENAME}) endif() # Add tests from args foreach (SCADFILE ${TESTCMD_FILES}) - get_filename_component(TESTNAME ${SCADFILE} NAME_WE) - string(REPLACE " " "_" TESTNAME ${TESTNAME}) # Test names cannot include spaces - set(TEST_FULLNAME "${TESTCMD_NAME}_${TESTNAME}") + get_filename_component(FILE_BASENAME ${SCADFILE} NAME_WE) + string(REPLACE " " "_" FILE_BASENAME ${FILE_BASENAME}) # Test names cannot include spaces + set(TEST_FULLNAME "${TESTCMD_BASENAME}_${FILE_BASENAME}") list(FIND DISABLED_TESTS ${TEST_FULLNAME} DISABLED) if (${DISABLED} EQUAL -1) @@ -719,10 +719,10 @@ function(add_cmdline_test TESTCMD) # The python script cannot extract the testname when given extra parameters if (TESTCMD_ARGS) - set(TESTNAME_OPTION -t ${TESTNAME}) + set(FILENAME_OPTION -f ${FILE_BASENAME}) endif() - add_test(NAME ${TEST_FULLNAME} ${CONFARG} ${CONFVAL} COMMAND ${PYTHON_EXECUTABLE} ${tests_SOURCE_DIR}/test_cmdline_tool.py ${MINGW_CROSS_ARG} --comparator=${COMPARATOR} -c ${ImageMagick_convert_EXECUTABLE} -s ${TESTCMD_SUFFIX} ${EXTRA_OPTIONS} ${TESTNAME_OPTION} ${TESTCMD_EXE} "${SCADFILE}" ${TESTCMD_ARGS}) + add_test(NAME ${TEST_FULLNAME} ${CONFARG} ${CONFVAL} COMMAND ${PYTHON_EXECUTABLE} ${tests_SOURCE_DIR}/test_cmdline_tool.py ${MINGW_CROSS_ARG} --comparator=${COMPARATOR} -c ${ImageMagick_convert_EXECUTABLE} -s ${TESTCMD_SUFFIX} ${EXTRA_OPTIONS} ${TESTNAME_OPTION} ${FILENAME_OPTION} ${TESTCMD_EXE} "${SCADFILE}" ${TESTCMD_ARGS}) set_property(TEST ${TEST_FULLNAME} PROPERTY ENVIRONMENT "${CTEST_ENVIRONMENT}") endif() endforeach() @@ -781,8 +781,8 @@ list(APPEND THROWNTOGETHERTEST_FILES ${OPENCSGTEST_FILES}) list(APPEND CGALSTLSANITYTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/normal-nan.scad) -list(APPEND GUICGALPNGTEST_FILES ${CGALPNGTEST_FILES}) -list(APPEND GUIOPENCSGTEST_FILES ${OPENCSGTEST_FILES}) +list(APPEND OPENSCAD-CGALPNG_FILES ${CGALPNGTEST_FILES}) +list(APPEND OPENSCAD-CSGPNG_FILES ${OPENCSGTEST_FILES}) # Disable tests which are known to cause floating point comparison issues # Once we're capable of comparing these across platforms, we can put these back in @@ -808,19 +808,19 @@ disable_tests(dumptest_transform-tests # FIXME: This test illustrates a weakness in child() combined with modifiers. # Reenable it when this is improved disable_tests(opencsgtest_child-background) -disable_tests(guiopencsgtest_child-background) +disable_tests(openscad-csgpng_child-background) # FIXME: This single test takes over an hour to run on a 2.7 GHz P4 disable_tests(opencsgtest_example006 cgalpngtest_example006) -disable_tests(guiopencsgtest_example006 guicgalpngtest_example006) +disable_tests(openscad-csgpng_example006 openscad-cgalpng_example006) # These tests only makes sense in OpenCSG mode disable_tests(cgalpngtest_child-background cgalpngtest_highlight-and-background-modifier cgalpngtest_testcolornames - guicgalpngtest_child-background - guicgalpngtest_highlight-and-background-modifier - guicgalpngtest_testcolornames + openscad-cgalpng_child-background + openscad-cgalpng_highlight-and-background-modifier + openscad-cgalpng_testcolornames throwntogethertest_child-background throwntogethertest_highlight-and-background-modifier throwntogethertest_testcolornames) @@ -829,8 +829,8 @@ disable_tests(cgalpngtest_child-background set_test_config(Heavy opencsgtest_minkowski3-tests opencsgtest_projection-tests - guiopencsgtest_minkowski3-tests - guiopencsgtest_projection-tests + openscad-csgpng_minkowski3-tests + openscad-csgpng_projection-tests throwntogethertest_minkowski3-tests throwntogethertest_projection-tests cgalpngtest_projection-tests @@ -842,14 +842,14 @@ set_test_config(Heavy opencsgtest_minkowski3-tests cgalpngtest_for-nested-tests cgalpngtest_intersection-tests cgalpngtest_text-search-test - guicgalpngtest_projection-tests - guicgalpngtest_rotate_extrude-tests - guicgalpngtest_surface-tests - guicgalpngtest_sphere-tests - guicgalpngtest_minkowski3-tests - guicgalpngtest_for-tests - guicgalpngtest_for-nested-tests - guicgalpngtest_intersection-tests) + openscad-cgalpng_projection-tests + openscad-cgalpng_rotate_extrude-tests + openscad-cgalpng_surface-tests + openscad-cgalpng_sphere-tests + openscad-cgalpng_minkowski3-tests + openscad-cgalpng_for-tests + openscad-cgalpng_for-nested-tests + openscad-cgalpng_intersection-tests) foreach(FILE ${EXAMPLE_FILES}) get_test_fullname(cgalpngtest ${FILE} TEST_FULLNAME) @@ -858,9 +858,9 @@ foreach(FILE ${EXAMPLE_FILES}) set_test_config(Examples ${TEST_FULLNAME}) get_test_fullname(throwntogethertest ${FILE} TEST_FULLNAME) set_test_config(Examples ${TEST_FULLNAME}) - get_test_fullname(guicgalpngtest ${FILE} TEST_FULLNAME) + get_test_fullname(openscad-cgalpng ${FILE} TEST_FULLNAME) set_test_config(Examples ${TEST_FULLNAME}) - get_test_fullname(guiopencsgtest ${FILE} TEST_FULLNAME) + get_test_fullname(openscad-csgpng ${FILE} TEST_FULLNAME) set_test_config(Examples ${TEST_FULLNAME}) endforeach() @@ -914,17 +914,65 @@ add_cmdline_test(csgtermtest SUFFIX txt FILES ${MINIMAL_FILES}) add_cmdline_test(cgalpngtest SUFFIX png FILES ${CGALPNGTEST_FILES}) add_cmdline_test(opencsgtest SUFFIX png FILES ${OPENCSGTEST_FILES}) add_cmdline_test(throwntogethertest SUFFIX png FILES ${THROWNTOGETHERTEST_FILES}) -add_cmdline_test(guicgalpngtest EXE ${GUI_BINPATH} ARGS --render -o - EXPECTEDDIR cgalpngtest SUFFIX png - FILES ${GUICGALPNGTEST_FILES}) -add_cmdline_test(guiopencsgtest EXE ${GUI_BINPATH} ARGS -o - EXPECTEDDIR opencsgtest SUFFIX png - FILES ${GUICGALPNGTEST_FILES}) - # FIXME: We don't actually need to compare the output of cgalstlsanitytest # with anything. It's self-contained and returns != 0 on error add_cmdline_test(cgalstlsanitytest SUFFIX txt FILES ${CGALSTLSANITYTEST_FILES}) +# Tests using the actual OpenSCAD binary +add_cmdline_test(openscad-cgalpng EXE ${GUI_BINPATH} ARGS --render -o + EXPECTEDDIR cgalpngtest SUFFIX png + FILES ${OPENSCAD-CGALPNG_FILES}) +add_cmdline_test(openscad-csgpng EXE ${GUI_BINPATH} ARGS -o + EXPECTEDDIR opencsgtest SUFFIX png + FILES ${OPENSCAD-CGALPNG_FILES}) + +add_cmdline_test(openscad-imgsize EXE ${GUI_BINPATH} + ARGS --imgsize 100,100 -o + SUFFIX png + FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) +add_cmdline_test(openscad-imgstretch EXE ${GUI_BINPATH} + ARGS --imgsize 500,100 -o + SUFFIX png + FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) +add_cmdline_test(openscad-imgstretch2 EXE ${GUI_BINPATH} + ARGS --imgsize 100,500 -o + SUFFIX png + FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) +add_cmdline_test(openscad-camdist EXE ${GUI_BINPATH} + ARGS --imgsize=500,500 --camera=0,0,0,0,0,0,300 examples/example001.scad -o + SUFFIX png + FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) +add_cmdline_test(openscad-camrot EXE ${GUI_BINPATH} + ARGS --imgsize=500,500 --camera=0,0,0,10,22.5,45,300 examples/example001.scad -o + SUFFIX png + FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) +add_cmdline_test(openscad-camtrans EXE ${GUI_BINPATH} + ARGS --imgsize=500,500 --camera=20,100,10,0,0,0,300 examples/example001.scad -o + SUFFIX png + FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) +add_cmdline_test(openscad-camortho EXE ${GUI_BINPATH} + ARGS --imgsize=500,500 --camera=20,100,10,0,0,0,300 examples/example001.scad --projection=o -o + SUFFIX png + FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) +add_cmdline_test(openscad-cameye EXE ${GUI_BINPATH} + ARGS --imgsize=500,500 --camera=60,40,30,0,0,0 examples/example001.scad -o + SUFFIX png + FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) +add_cmdline_test(openscad-cameye2 EXE ${GUI_BINPATH} + ARGS --imgsize=500,500 --camera=160,140,130,0,0,0 examples/example001.scad -o + SUFFIX png + FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) +add_cmdline_test(openscad-cameyeortho EXE ${GUI_BINPATH} + ARGS --imgsize=500,500 --camera=160,140,130,0,0,0 examples/example001.scad --projection=o -o + SUFFIX png + FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) +add_cmdline_test(openscad-camcenter EXE ${GUI_BINPATH} + ARGS --imgsize=500,500 --camera=60,40,30,20,10,30 -o + SUFFIX png + FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) + + + message("Available test configurations: ${TEST_CONFIGS}") #foreach(CONF ${TEST_CONFIGS}) # message("${CONF}: ${${CONF}_TEST_CONFIG}") |