diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | tests/regression/cgalpngtest/include-tests-expected.png | bin | 11444 -> 10582 bytes | |||
| -rw-r--r-- | tests/regression/cgalpngtest/use-tests-expected.png | bin | 10852 -> 10586 bytes | |||
| -rw-r--r-- | tests/regression/dumptest/include-tests-expected.txt | 5 | ||||
| -rw-r--r-- | tests/regression/dumptest/use-tests-expected.txt | 5 | ||||
| -rw-r--r-- | tests/regression/opencsgtest/include-tests-expected.png | bin | 11994 -> 11304 bytes | |||
| -rw-r--r-- | tests/regression/opencsgtest/use-tests-expected.png | bin | 11165 -> 11050 bytes | |||
| -rw-r--r-- | tests/regression/throwntogethertest/include-tests-expected.png | bin | 8317 -> 11420 bytes | |||
| -rw-r--r-- | tests/regression/throwntogethertest/use-tests-expected.png | bin | 11618 -> 11432 bytes |
9 files changed, 21 insertions, 7 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3b379d6..9d5e24e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -588,15 +588,15 @@ endforeach() set_directory_properties(PROPERTIES TEST_INCLUDE_FILE "${CMAKE_SOURCE_DIR}/EnforceConfig.cmake") +# Subst files +configure_file(${CMAKE_SOURCE_DIR}/../testdata/scad/misc/include-tests-template.scad + ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/include-tests.scad) +configure_file(${CMAKE_SOURCE_DIR}/../testdata/scad/misc/use-tests-template.scad + ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/use-tests.scad) + # Find all scad files file(GLOB MINIMAL_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/*.scad) file(GLOB FEATURES_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/features/*.scad) -# Remove included files not to be used as tests -list(REMOVE_ITEM FEATURES_FILES - ${CMAKE_SOURCE_DIR}/../testdata/scad/features/include\ test6.scad - ${CMAKE_SOURCE_DIR}/../testdata/scad/features/include-test5.scad - ${CMAKE_SOURCE_DIR}/../testdata/scad/features/use\ test6.scad - ${CMAKE_SOURCE_DIR}/../testdata/scad/features/use-test5.scad) file(GLOB BUGS_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/*.scad) file(GLOB SCAD_DXF_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/dxf/*.scad) file(GLOB FUNCTION_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/functions/*.scad) @@ -613,9 +613,13 @@ list(APPEND ECHO_FILES ${FUNCTION_FILES} ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/string-indexing.scad) list(APPEND DUMPTEST_FILES ${MINIMAL_FILES} ${FEATURES_FILES} ${EXAMPLE_FILES}) -list(APPEND DUMPTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/escape-test.scad) +list(APPEND DUMPTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/escape-test.scad + ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/include-tests.scad + ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/use-tests.scad) list(APPEND CGALPNGTEST_FILES ${FEATURES_FILES} ${SCAD_DXF_FILES} ${EXAMPLE_FILES}) +list(APPEND CGALPNGTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/include-tests.scad + ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/use-tests.scad) list(APPEND OPENCSGTEST_FILES ${CGALPNGTEST_FILES}) list(APPEND OPENCSGTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/bbox-transform-bug.scad) list(APPEND THROWNTOGETHERTEST_FILES ${OPENCSGTEST_FILES}) diff --git a/tests/regression/cgalpngtest/include-tests-expected.png b/tests/regression/cgalpngtest/include-tests-expected.png Binary files differindex 99ebcc7..031dcda 100644 --- a/tests/regression/cgalpngtest/include-tests-expected.png +++ b/tests/regression/cgalpngtest/include-tests-expected.png diff --git a/tests/regression/cgalpngtest/use-tests-expected.png b/tests/regression/cgalpngtest/use-tests-expected.png Binary files differindex 21747cc..5afa74e 100644 --- a/tests/regression/cgalpngtest/use-tests-expected.png +++ b/tests/regression/cgalpngtest/use-tests-expected.png diff --git a/tests/regression/dumptest/include-tests-expected.txt b/tests/regression/dumptest/include-tests-expected.txt index d4b5065..00e7beb 100644 --- a/tests/regression/dumptest/include-tests-expected.txt +++ b/tests/regression/dumptest/include-tests-expected.txt @@ -25,6 +25,11 @@ } } } + multmatrix([[1, 0, 0, 0], [0, 1, 0, 2], [0, 0, 1, 0], [0, 0, 0, 1]]) { + group() { + cube(size = [0.5, 0.5, 1], center = true); + } + } multmatrix([[1, 0, 0, 0], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) { sphere($fn = 16, $fa = 12, $fs = 2, r = 0.7); } diff --git a/tests/regression/dumptest/use-tests-expected.txt b/tests/regression/dumptest/use-tests-expected.txt index 7ba3ac5..c320af6 100644 --- a/tests/regression/dumptest/use-tests-expected.txt +++ b/tests/regression/dumptest/use-tests-expected.txt @@ -27,6 +27,11 @@ } } } + multmatrix([[1, 0, 0, 0], [0, 1, 0, 2], [0, 0, 1, 0], [0, 0, 0, 1]]) { + group() { + cube(size = [0.5, 0.5, 1], center = true); + } + } multmatrix([[1, 0, 0, 0], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) { sphere($fn = 16, $fa = 12, $fs = 2, r = 1); } diff --git a/tests/regression/opencsgtest/include-tests-expected.png b/tests/regression/opencsgtest/include-tests-expected.png Binary files differindex 62be03c..c1e780b 100644 --- a/tests/regression/opencsgtest/include-tests-expected.png +++ b/tests/regression/opencsgtest/include-tests-expected.png diff --git a/tests/regression/opencsgtest/use-tests-expected.png b/tests/regression/opencsgtest/use-tests-expected.png Binary files differindex 8a85ad5..5141b37 100644 --- a/tests/regression/opencsgtest/use-tests-expected.png +++ b/tests/regression/opencsgtest/use-tests-expected.png diff --git a/tests/regression/throwntogethertest/include-tests-expected.png b/tests/regression/throwntogethertest/include-tests-expected.png Binary files differindex 5b1857b..b6dc00e 100644 --- a/tests/regression/throwntogethertest/include-tests-expected.png +++ b/tests/regression/throwntogethertest/include-tests-expected.png diff --git a/tests/regression/throwntogethertest/use-tests-expected.png b/tests/regression/throwntogethertest/use-tests-expected.png Binary files differindex e5bf382..7e2f702 100644 --- a/tests/regression/throwntogethertest/use-tests-expected.png +++ b/tests/regression/throwntogethertest/use-tests-expected.png |
