Use the same test results for all STL/OFF export-import tests

2014-08-15 13:22:01 -04:00 · 2014-08-15 13:22:01 -04:00 · 99fb4ecb34
parent 6405456c8a
commit 99fb4ecb34
26 changed files with 1 additions and 1 deletions
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -1223,7 +1223,7 @@ add_cmdline_test(cgalstlsanitytest EXE ${CMAKE_SOURCE_DIR}/cgalstlsanitytest SUF

 # Export/Import 3d png tests.
 add_cmdline_test(stlpngtest EXE ${PYTHON_EXECUTABLE} SCRIPT ${CMAKE_SOURCE_DIR}/export_import_pngtest.py ARGS --openscad=${OPENSCAD_BINPATH} --format=STL SUFFIX png FILES ${EXPORT3D_TEST_FILES})
-add_cmdline_test(offpngtest EXE ${PYTHON_EXECUTABLE} SCRIPT ${CMAKE_SOURCE_DIR}/export_import_pngtest.py ARGS --openscad=${OPENSCAD_BINPATH} --format=OFF SUFFIX png FILES ${EXPORT3D_TEST_FILES})
+add_cmdline_test(offpngtest EXE ${PYTHON_EXECUTABLE} SCRIPT ${CMAKE_SOURCE_DIR}/export_import_pngtest.py ARGS --openscad=${OPENSCAD_BINPATH} --format=OFF EXPECTEDDIR stlpngtest SUFFIX png FILES ${EXPORT3D_TEST_FILES})

 # Add experimental tests

--- a/tests/regression/offpngtest/advance_intersection-expected.png
+++ b/tests/regression/offpngtest/advance_intersection-expected.png
--- a/tests/regression/offpngtest/chopped_blocks-expected.png
+++ b/tests/regression/offpngtest/chopped_blocks-expected.png
--- a/tests/regression/offpngtest/cut_view-expected.png
+++ b/tests/regression/offpngtest/cut_view-expected.png
--- a/tests/regression/offpngtest/demo_cut-expected.png
+++ b/tests/regression/offpngtest/demo_cut-expected.png
--- a/tests/regression/offpngtest/difference-expected.png
+++ b/tests/regression/offpngtest/difference-expected.png
--- a/tests/regression/offpngtest/difference_cube-expected.png
+++ b/tests/regression/offpngtest/difference_cube-expected.png
--- a/tests/regression/offpngtest/difference_sphere-expected.png
+++ b/tests/regression/offpngtest/difference_sphere-expected.png
--- a/tests/regression/offpngtest/fan_view-expected.png
+++ b/tests/regression/offpngtest/fan_view-expected.png
--- a/tests/regression/offpngtest/fence-expected.png
+++ b/tests/regression/offpngtest/fence-expected.png
--- a/tests/regression/offpngtest/intersecting-expected.png
+++ b/tests/regression/offpngtest/intersecting-expected.png
--- a/tests/regression/offpngtest/intersection-expected.png
+++ b/tests/regression/offpngtest/intersection-expected.png
--- a/tests/regression/offpngtest/logo_and_text-expected.png
+++ b/tests/regression/offpngtest/logo_and_text-expected.png
--- a/tests/regression/offpngtest/offset-expected.png
+++ b/tests/regression/offpngtest/offset-expected.png
--- a/tests/regression/offpngtest/polyhedron-expected.png
+++ b/tests/regression/offpngtest/polyhedron-expected.png
--- a/tests/regression/offpngtest/polyhedron-nonplanar-tests-expected.png
+++ b/tests/regression/offpngtest/polyhedron-nonplanar-tests-expected.png
--- a/tests/regression/offpngtest/rounded_box-expected.png
+++ b/tests/regression/offpngtest/rounded_box-expected.png
--- a/tests/regression/offpngtest/search-expected.png
+++ b/tests/regression/offpngtest/search-expected.png
--- a/tests/regression/offpngtest/sphere-expected.png
+++ b/tests/regression/offpngtest/sphere-expected.png
--- a/tests/regression/offpngtest/surface-expected.png
+++ b/tests/regression/offpngtest/surface-expected.png
--- a/tests/regression/offpngtest/text-expected.png
+++ b/tests/regression/offpngtest/text-expected.png
--- a/tests/regression/offpngtest/text_on_cube-expected.png
+++ b/tests/regression/offpngtest/text_on_cube-expected.png
--- a/tests/regression/offpngtest/translate-expected.png
+++ b/tests/regression/offpngtest/translate-expected.png
--- a/tests/regression/offpngtest/translation-expected.png
+++ b/tests/regression/offpngtest/translation-expected.png
--- a/tests/regression/offpngtest/tripod-expected.png
+++ b/tests/regression/offpngtest/tripod-expected.png
--- a/tests/regression/offpngtest/union-expected.png
+++ b/tests/regression/offpngtest/union-expected.png