diff options
| author | chrysn <chrysn@fsfe.org> | 2013-06-24 17:26:45 (GMT) |
|---|---|---|
| committer | chrysn <chrysn@fsfe.org> | 2013-06-25 11:41:48 (GMT) |
| commit | 06fd345dfc1b613d807ac31a766bd50fc4812148 (patch) | |
| tree | 486a82ba798acafd1b8abce720b68ca1ba88c90e | |
| parent | 887c4757b623395236694060a32a511db7a9b605 (diff) | |
drop cgalpngtest all together
replaced in CMakeLists.txt with direct openscad call, and duplicate
checks removed
cgalpngtest_text-search-test was left in the Heavy configuration,
resolving the ambiguity of it being heavy with cgalpngtest and not with
openscad-cgalpng (which does the same thing)
| -rw-r--r-- | tests/CMakeLists.txt | 15 | ||||
| -rwxr-xr-x | tests/cgalpngtest | 3 |
2 files changed, 2 insertions, 16 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b32ff1f..62e977a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -843,15 +843,7 @@ set_test_config(Heavy opencsgtest_minkowski3-tests cgalpngtest_for-tests cgalpngtest_for-nested-tests cgalpngtest_intersection-tests - cgalpngtest_text-search-test - 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) + cgalpngtest_text-search-test) foreach(FILE ${EXAMPLE_FILES}) get_test_fullname(cgalpngtest ${FILE} TEST_FULLNAME) @@ -917,7 +909,7 @@ add_cmdline_test(moduledumptest SUFFIX txt FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/allexpressions.scad) add_cmdline_test(csgtexttest SUFFIX txt FILES ${MINIMAL_FILES}) add_cmdline_test(csgtermtest SUFFIX txt FILES ${MINIMAL_FILES}) -add_cmdline_test(cgalpngtest SUFFIX png FILES ${CGALPNGTEST_FILES}) +add_cmdline_test(cgalpngtest EXE ${GUI_BINPATH} ARGS --render -o SUFFIX png FILES ${CGALPNGTEST_FILES}) add_cmdline_test(opencsgtest SUFFIX png FILES ${OPENCSGTEST_FILES}) add_cmdline_test(throwntogethertest SUFFIX png FILES ${THROWNTOGETHERTEST_FILES}) # FIXME: We don't actually need to compare the output of cgalstlsanitytest @@ -933,9 +925,6 @@ add_cmdline_test(openscad-nonascii EXE ${GUI_BINPATH} ARGS -o # Image output -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}) diff --git a/tests/cgalpngtest b/tests/cgalpngtest deleted file mode 100755 index a6ad6c0..0000000 --- a/tests/cgalpngtest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -openscad $1 -o $2 --render |