summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt28
-rw-r--r--tests/regression/csgtermtest/assign-expected.term1
-rw-r--r--tests/regression/csgtermtest/child-expected.term1
-rw-r--r--tests/regression/csgtermtest/circle-expected.term1
-rw-r--r--tests/regression/csgtermtest/color-expected.term1
-rw-r--r--tests/regression/csgtermtest/cube-expected.term1
-rw-r--r--tests/regression/csgtermtest/cylinder-expected.term1
-rw-r--r--tests/regression/csgtermtest/difference-expected.term1
-rw-r--r--tests/regression/csgtermtest/dxf_linear_extrude-expected.term1
-rw-r--r--tests/regression/csgtermtest/dxf_rotate_extrude-expected.term1
-rw-r--r--tests/regression/csgtermtest/echo-expected.term1
-rw-r--r--tests/regression/csgtermtest/for-expected.term1
-rw-r--r--tests/regression/csgtermtest/glide-expected.term1
-rw-r--r--tests/regression/csgtermtest/group-expected.term1
-rw-r--r--tests/regression/csgtermtest/hull-expected.term1
-rw-r--r--tests/regression/csgtermtest/if-expected.term1
-rw-r--r--tests/regression/csgtermtest/import-expected.term1
-rw-r--r--tests/regression/csgtermtest/import_dxf-expected.term1
-rw-r--r--tests/regression/csgtermtest/import_off-expected.term1
-rw-r--r--tests/regression/csgtermtest/import_stl-expected.term1
-rw-r--r--tests/regression/csgtermtest/intersection-expected.term1
-rw-r--r--tests/regression/csgtermtest/intersection_for-expected.term1
-rw-r--r--tests/regression/csgtermtest/linear_extrude-expected.term1
-rw-r--r--tests/regression/csgtermtest/minkowski-expected.term1
-rw-r--r--tests/regression/csgtermtest/mirror-expected.term1
-rw-r--r--tests/regression/csgtermtest/multmatrix-expected.term1
-rw-r--r--tests/regression/csgtermtest/polygon-expected.term1
-rw-r--r--tests/regression/csgtermtest/polyhedron-expected.term1
-rw-r--r--tests/regression/csgtermtest/projection-expected.term1
-rw-r--r--tests/regression/csgtermtest/render-expected.term1
-rw-r--r--tests/regression/csgtermtest/rotate-expected.term1
-rw-r--r--tests/regression/csgtermtest/rotate_extrude-expected.term1
-rw-r--r--tests/regression/csgtermtest/scale-expected.term1
-rw-r--r--tests/regression/csgtermtest/sphere-expected.term1
-rw-r--r--tests/regression/csgtermtest/square-expected.term1
-rw-r--r--tests/regression/csgtermtest/subdiv-expected.term1
-rw-r--r--tests/regression/csgtermtest/surface-expected.term1
-rw-r--r--tests/regression/csgtermtest/translate-expected.term1
-rw-r--r--tests/regression/csgtermtest/union-expected.term1
-rw-r--r--tests/regression/csgtexttest/assign-expected.txt1
-rw-r--r--tests/regression/csgtexttest/child-expected.txt1
-rw-r--r--tests/regression/csgtexttest/circle-expected.txt1
-rw-r--r--tests/regression/csgtexttest/color-expected.txt1
-rw-r--r--tests/regression/csgtexttest/cube-expected.txt1
-rw-r--r--tests/regression/csgtexttest/cylinder-expected.txt1
-rw-r--r--tests/regression/csgtexttest/difference-expected.txt1
-rw-r--r--tests/regression/csgtexttest/dxf_linear_extrude-expected.txt1
-rw-r--r--tests/regression/csgtexttest/dxf_rotate_extrude-expected.txt1
-rw-r--r--tests/regression/csgtexttest/echo-expected.txt1
-rw-r--r--tests/regression/csgtexttest/for-expected.txt1
-rw-r--r--tests/regression/csgtexttest/glide-expected.txt1
-rw-r--r--tests/regression/csgtexttest/group-expected.txt1
-rw-r--r--tests/regression/csgtexttest/hull-expected.txt1
-rw-r--r--tests/regression/csgtexttest/if-expected.txt1
-rw-r--r--tests/regression/csgtexttest/import-expected.txt1
-rw-r--r--tests/regression/csgtexttest/import_dxf-expected.txt1
-rw-r--r--tests/regression/csgtexttest/import_off-expected.txt1
-rw-r--r--tests/regression/csgtexttest/import_stl-expected.txt1
-rw-r--r--tests/regression/csgtexttest/intersection-expected.txt1
-rw-r--r--tests/regression/csgtexttest/intersection_for-expected.txt1
-rw-r--r--tests/regression/csgtexttest/linear_extrude-expected.txt1
-rw-r--r--tests/regression/csgtexttest/minkowski-expected.txt1
-rw-r--r--tests/regression/csgtexttest/mirror-expected.txt1
-rw-r--r--tests/regression/csgtexttest/multmatrix-expected.txt1
-rw-r--r--tests/regression/csgtexttest/polygon-expected.txt1
-rw-r--r--tests/regression/csgtexttest/polyhedron-expected.txt1
-rw-r--r--tests/regression/csgtexttest/projection-expected.txt1
-rw-r--r--tests/regression/csgtexttest/render-expected.txt1
-rw-r--r--tests/regression/csgtexttest/rotate-expected.txt1
-rw-r--r--tests/regression/csgtexttest/rotate_extrude-expected.txt1
-rw-r--r--tests/regression/csgtexttest/scale-expected.txt1
-rw-r--r--tests/regression/csgtexttest/sphere-expected.txt1
-rw-r--r--tests/regression/csgtexttest/square-expected.txt1
-rw-r--r--tests/regression/csgtexttest/subdiv-expected.txt1
-rw-r--r--tests/regression/csgtexttest/surface-expected.txt1
-rw-r--r--tests/regression/csgtexttest/translate-expected.txt1
-rw-r--r--tests/regression/csgtexttest/union-expected.txt1
-rw-r--r--tests/regression/echotest/expression-shortcircuit-tests-expected.txt5
78 files changed, 23 insertions, 86 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ec75a18..0282622 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -713,7 +713,6 @@ configure_file(${CMAKE_SOURCE_DIR}/../testdata/scad/templates/import_dxf-tests-t
${CMAKE_SOURCE_DIR}/../testdata/scad/features/import_dxf-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)
file(GLOB BUGS_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/*.scad)
file(GLOB SCAD_DXF_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/dxf/*.scad)
@@ -721,7 +720,6 @@ file(GLOB FUNCTION_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/functions/*.scad)
file(GLOB EXAMPLE_FILES ${CMAKE_SOURCE_DIR}/../examples/*.scad)
list(APPEND ECHO_FILES ${FUNCTION_FILES}
- ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/echo.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/misc/echo-tests.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/misc/escape-test.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/misc/parser-tests.scad
@@ -735,14 +733,18 @@ list(APPEND ECHO_FILES ${FUNCTION_FILES}
${CMAKE_SOURCE_DIR}/../testdata/scad/misc/value-reassignment-tests.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/misc/value-reassignment-tests2.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/misc/variable-scope-tests.scad
- ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/lookup-tests.scad)
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/lookup-tests.scad
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/expression-shortcircuit-tests.scad)
-list(APPEND DUMPTEST_FILES ${MINIMAL_FILES} ${FEATURES_FILES} ${EXAMPLE_FILES})
+list(APPEND DUMPTEST_FILES ${FEATURES_FILES} ${EXAMPLE_FILES})
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
${CMAKE_SOURCE_DIR}/../testdata/scad/misc/localfiles-test.scad
- ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/localfiles_dir/localfiles-compatibility-test.scad)
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/localfiles_dir/localfiles-compatibility-test.scad
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/allexpressions.scad
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/allfunctions.scad
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/allmodules.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
@@ -877,11 +879,17 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake ${TMP})
add_cmdline_test(echotest SUFFIX txt FILES ${ECHO_FILES})
add_cmdline_test(dumptest SUFFIX csg FILES ${DUMPTEST_FILES})
add_cmdline_test(moduledumptest EXE ${GUI_BINPATH} ARGS -o SUFFIX ast FILES
- ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/allmodules.scad
- ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/allfunctions.scad
- ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/allexpressions.scad)
-add_cmdline_test(csgtexttest SUFFIX txt FILES ${MINIMAL_FILES})
-add_cmdline_test(csgtermtest EXE ${GUI_BINPATH} ARGS -o SUFFIX term FILES ${MINIMAL_FILES})
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/allmodules.scad
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/allfunctions.scad
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/allexpressions.scad)
+add_cmdline_test(csgtexttest SUFFIX txt FILES
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/allexpressions.scad
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/allfunctions.scad
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/allmodules.scad)
+add_cmdline_test(csgtermtest EXE ${GUI_BINPATH} ARGS -o SUFFIX term FILES
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/allexpressions.scad
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/allfunctions.scad
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/allmodules.scad)
add_cmdline_test(cgalpngtest EXE ${GUI_BINPATH} ARGS --render -o SUFFIX png FILES ${CGALPNGTEST_FILES})
add_cmdline_test(opencsgtest EXE ${GUI_BINPATH} ARGS -o SUFFIX png FILES ${OPENCSGTEST_FILES})
add_cmdline_test(throwntogethertest SUFFIX png FILES ${THROWNTOGETHERTEST_FILES})
diff --git a/tests/regression/csgtermtest/assign-expected.term b/tests/regression/csgtermtest/assign-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/assign-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/child-expected.term b/tests/regression/csgtermtest/child-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/child-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/circle-expected.term b/tests/regression/csgtermtest/circle-expected.term
deleted file mode 100644
index b8c8161..0000000
--- a/tests/regression/csgtermtest/circle-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-circle2
diff --git a/tests/regression/csgtermtest/color-expected.term b/tests/regression/csgtermtest/color-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/color-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/cube-expected.term b/tests/regression/csgtermtest/cube-expected.term
deleted file mode 100644
index 3393bc4..0000000
--- a/tests/regression/csgtermtest/cube-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-cube2
diff --git a/tests/regression/csgtermtest/cylinder-expected.term b/tests/regression/csgtermtest/cylinder-expected.term
deleted file mode 100644
index f3dd1f9..0000000
--- a/tests/regression/csgtermtest/cylinder-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-cylinder2
diff --git a/tests/regression/csgtermtest/difference-expected.term b/tests/regression/csgtermtest/difference-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/difference-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/dxf_linear_extrude-expected.term b/tests/regression/csgtermtest/dxf_linear_extrude-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/dxf_linear_extrude-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/dxf_rotate_extrude-expected.term b/tests/regression/csgtermtest/dxf_rotate_extrude-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/dxf_rotate_extrude-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/echo-expected.term b/tests/regression/csgtermtest/echo-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/echo-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/for-expected.term b/tests/regression/csgtermtest/for-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/for-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/glide-expected.term b/tests/regression/csgtermtest/glide-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/glide-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/group-expected.term b/tests/regression/csgtermtest/group-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/group-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/hull-expected.term b/tests/regression/csgtermtest/hull-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/hull-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/if-expected.term b/tests/regression/csgtermtest/if-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/if-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/import-expected.term b/tests/regression/csgtermtest/import-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/import-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/import_dxf-expected.term b/tests/regression/csgtermtest/import_dxf-expected.term
deleted file mode 100644
index 847d6c3..0000000
--- a/tests/regression/csgtermtest/import_dxf-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-import2
diff --git a/tests/regression/csgtermtest/import_off-expected.term b/tests/regression/csgtermtest/import_off-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/import_off-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/import_stl-expected.term b/tests/regression/csgtermtest/import_stl-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/import_stl-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/intersection-expected.term b/tests/regression/csgtermtest/intersection-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/intersection-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/intersection_for-expected.term b/tests/regression/csgtermtest/intersection_for-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/intersection_for-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/linear_extrude-expected.term b/tests/regression/csgtermtest/linear_extrude-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/linear_extrude-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/minkowski-expected.term b/tests/regression/csgtermtest/minkowski-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/minkowski-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/mirror-expected.term b/tests/regression/csgtermtest/mirror-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/mirror-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/multmatrix-expected.term b/tests/regression/csgtermtest/multmatrix-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/multmatrix-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/polygon-expected.term b/tests/regression/csgtermtest/polygon-expected.term
deleted file mode 100644
index b41dfc6..0000000
--- a/tests/regression/csgtermtest/polygon-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-polygon2
diff --git a/tests/regression/csgtermtest/polyhedron-expected.term b/tests/regression/csgtermtest/polyhedron-expected.term
deleted file mode 100644
index 5ccc055..0000000
--- a/tests/regression/csgtermtest/polyhedron-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-polyhedron2
diff --git a/tests/regression/csgtermtest/projection-expected.term b/tests/regression/csgtermtest/projection-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/projection-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/render-expected.term b/tests/regression/csgtermtest/render-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/render-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/rotate-expected.term b/tests/regression/csgtermtest/rotate-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/rotate-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/rotate_extrude-expected.term b/tests/regression/csgtermtest/rotate_extrude-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/rotate_extrude-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/scale-expected.term b/tests/regression/csgtermtest/scale-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/scale-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/sphere-expected.term b/tests/regression/csgtermtest/sphere-expected.term
deleted file mode 100644
index f9b8d73..0000000
--- a/tests/regression/csgtermtest/sphere-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-sphere2
diff --git a/tests/regression/csgtermtest/square-expected.term b/tests/regression/csgtermtest/square-expected.term
deleted file mode 100644
index 8190c0f..0000000
--- a/tests/regression/csgtermtest/square-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-square2
diff --git a/tests/regression/csgtermtest/subdiv-expected.term b/tests/regression/csgtermtest/subdiv-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/subdiv-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/surface-expected.term b/tests/regression/csgtermtest/surface-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/surface-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/translate-expected.term b/tests/regression/csgtermtest/translate-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/translate-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtermtest/union-expected.term b/tests/regression/csgtermtest/union-expected.term
deleted file mode 100644
index a40cf60..0000000
--- a/tests/regression/csgtermtest/union-expected.term
+++ /dev/null
@@ -1 +0,0 @@
-No top-level CSG object
diff --git a/tests/regression/csgtexttest/assign-expected.txt b/tests/regression/csgtexttest/assign-expected.txt
deleted file mode 100644
index a08e59e..0000000
--- a/tests/regression/csgtexttest/assign-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(group2)
diff --git a/tests/regression/csgtexttest/child-expected.txt b/tests/regression/csgtexttest/child-expected.txt
deleted file mode 100644
index 331822f..0000000
--- a/tests/regression/csgtexttest/child-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1
diff --git a/tests/regression/csgtexttest/circle-expected.txt b/tests/regression/csgtexttest/circle-expected.txt
deleted file mode 100644
index 44ca16a..0000000
--- a/tests/regression/csgtexttest/circle-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(circle)
diff --git a/tests/regression/csgtexttest/color-expected.txt b/tests/regression/csgtexttest/color-expected.txt
deleted file mode 100644
index 6140174..0000000
--- a/tests/regression/csgtexttest/color-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(color2)
diff --git a/tests/regression/csgtexttest/cube-expected.txt b/tests/regression/csgtexttest/cube-expected.txt
deleted file mode 100644
index 07b688d..0000000
--- a/tests/regression/csgtexttest/cube-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(cube)
diff --git a/tests/regression/csgtexttest/cylinder-expected.txt b/tests/regression/csgtexttest/cylinder-expected.txt
deleted file mode 100644
index 3f8a41f..0000000
--- a/tests/regression/csgtexttest/cylinder-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(cylinder)
diff --git a/tests/regression/csgtexttest/difference-expected.txt b/tests/regression/csgtexttest/difference-expected.txt
deleted file mode 100644
index 551bb16..0000000
--- a/tests/regression/csgtexttest/difference-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(difference2)
diff --git a/tests/regression/csgtexttest/dxf_linear_extrude-expected.txt b/tests/regression/csgtexttest/dxf_linear_extrude-expected.txt
deleted file mode 100644
index fa1671c..0000000
--- a/tests/regression/csgtexttest/dxf_linear_extrude-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(linear_extrude)
diff --git a/tests/regression/csgtexttest/dxf_rotate_extrude-expected.txt b/tests/regression/csgtexttest/dxf_rotate_extrude-expected.txt
deleted file mode 100644
index 452f8e4..0000000
--- a/tests/regression/csgtexttest/dxf_rotate_extrude-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(rotate_extrude)
diff --git a/tests/regression/csgtexttest/echo-expected.txt b/tests/regression/csgtexttest/echo-expected.txt
deleted file mode 100644
index a08e59e..0000000
--- a/tests/regression/csgtexttest/echo-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(group2)
diff --git a/tests/regression/csgtexttest/for-expected.txt b/tests/regression/csgtexttest/for-expected.txt
deleted file mode 100644
index a08e59e..0000000
--- a/tests/regression/csgtexttest/for-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(group2)
diff --git a/tests/regression/csgtexttest/glide-expected.txt b/tests/regression/csgtexttest/glide-expected.txt
deleted file mode 100644
index a792750..0000000
--- a/tests/regression/csgtexttest/glide-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(glide2)
diff --git a/tests/regression/csgtexttest/group-expected.txt b/tests/regression/csgtexttest/group-expected.txt
deleted file mode 100644
index a08e59e..0000000
--- a/tests/regression/csgtexttest/group-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(group2)
diff --git a/tests/regression/csgtexttest/hull-expected.txt b/tests/regression/csgtexttest/hull-expected.txt
deleted file mode 100644
index dc47755..0000000
--- a/tests/regression/csgtexttest/hull-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(hull2)
diff --git a/tests/regression/csgtexttest/if-expected.txt b/tests/regression/csgtexttest/if-expected.txt
deleted file mode 100644
index a08e59e..0000000
--- a/tests/regression/csgtexttest/if-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(group2)
diff --git a/tests/regression/csgtexttest/import-expected.txt b/tests/regression/csgtexttest/import-expected.txt
deleted file mode 100644
index a673ddb..0000000
--- a/tests/regression/csgtexttest/import-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(import)
diff --git a/tests/regression/csgtexttest/import_dxf-expected.txt b/tests/regression/csgtexttest/import_dxf-expected.txt
deleted file mode 100644
index a673ddb..0000000
--- a/tests/regression/csgtexttest/import_dxf-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(import)
diff --git a/tests/regression/csgtexttest/import_off-expected.txt b/tests/regression/csgtexttest/import_off-expected.txt
deleted file mode 100644
index a673ddb..0000000
--- a/tests/regression/csgtexttest/import_off-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(import)
diff --git a/tests/regression/csgtexttest/import_stl-expected.txt b/tests/regression/csgtexttest/import_stl-expected.txt
deleted file mode 100644
index a673ddb..0000000
--- a/tests/regression/csgtexttest/import_stl-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(import)
diff --git a/tests/regression/csgtexttest/intersection-expected.txt b/tests/regression/csgtexttest/intersection-expected.txt
deleted file mode 100644
index 0ce0967..0000000
--- a/tests/regression/csgtexttest/intersection-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(intersection2)
diff --git a/tests/regression/csgtexttest/intersection_for-expected.txt b/tests/regression/csgtexttest/intersection_for-expected.txt
deleted file mode 100644
index 0ce0967..0000000
--- a/tests/regression/csgtexttest/intersection_for-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(intersection2)
diff --git a/tests/regression/csgtexttest/linear_extrude-expected.txt b/tests/regression/csgtexttest/linear_extrude-expected.txt
deleted file mode 100644
index fa1671c..0000000
--- a/tests/regression/csgtexttest/linear_extrude-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(linear_extrude)
diff --git a/tests/regression/csgtexttest/minkowski-expected.txt b/tests/regression/csgtexttest/minkowski-expected.txt
deleted file mode 100644
index e601bac..0000000
--- a/tests/regression/csgtexttest/minkowski-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(minkowski2)
diff --git a/tests/regression/csgtexttest/mirror-expected.txt b/tests/regression/csgtexttest/mirror-expected.txt
deleted file mode 100644
index 80024d2..0000000
--- a/tests/regression/csgtexttest/mirror-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(transform2)
diff --git a/tests/regression/csgtexttest/multmatrix-expected.txt b/tests/regression/csgtexttest/multmatrix-expected.txt
deleted file mode 100644
index 80024d2..0000000
--- a/tests/regression/csgtexttest/multmatrix-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(transform2)
diff --git a/tests/regression/csgtexttest/polygon-expected.txt b/tests/regression/csgtexttest/polygon-expected.txt
deleted file mode 100644
index e308e30..0000000
--- a/tests/regression/csgtexttest/polygon-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(polygon)
diff --git a/tests/regression/csgtexttest/polyhedron-expected.txt b/tests/regression/csgtexttest/polyhedron-expected.txt
deleted file mode 100644
index 994b16d..0000000
--- a/tests/regression/csgtexttest/polyhedron-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(polyhedron)
diff --git a/tests/regression/csgtexttest/projection-expected.txt b/tests/regression/csgtexttest/projection-expected.txt
deleted file mode 100644
index 38b6abf..0000000
--- a/tests/regression/csgtexttest/projection-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(projection)
diff --git a/tests/regression/csgtexttest/render-expected.txt b/tests/regression/csgtexttest/render-expected.txt
deleted file mode 100644
index b53708e..0000000
--- a/tests/regression/csgtexttest/render-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(render2)
diff --git a/tests/regression/csgtexttest/rotate-expected.txt b/tests/regression/csgtexttest/rotate-expected.txt
deleted file mode 100644
index 80024d2..0000000
--- a/tests/regression/csgtexttest/rotate-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(transform2)
diff --git a/tests/regression/csgtexttest/rotate_extrude-expected.txt b/tests/regression/csgtexttest/rotate_extrude-expected.txt
deleted file mode 100644
index 452f8e4..0000000
--- a/tests/regression/csgtexttest/rotate_extrude-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(rotate_extrude)
diff --git a/tests/regression/csgtexttest/scale-expected.txt b/tests/regression/csgtexttest/scale-expected.txt
deleted file mode 100644
index 80024d2..0000000
--- a/tests/regression/csgtexttest/scale-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(transform2)
diff --git a/tests/regression/csgtexttest/sphere-expected.txt b/tests/regression/csgtexttest/sphere-expected.txt
deleted file mode 100644
index 2bf6a72..0000000
--- a/tests/regression/csgtexttest/sphere-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(sphere)
diff --git a/tests/regression/csgtexttest/square-expected.txt b/tests/regression/csgtexttest/square-expected.txt
deleted file mode 100644
index e235806..0000000
--- a/tests/regression/csgtexttest/square-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(square)
diff --git a/tests/regression/csgtexttest/subdiv-expected.txt b/tests/regression/csgtexttest/subdiv-expected.txt
deleted file mode 100644
index b096229..0000000
--- a/tests/regression/csgtexttest/subdiv-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(subdiv2)
diff --git a/tests/regression/csgtexttest/surface-expected.txt b/tests/regression/csgtexttest/surface-expected.txt
deleted file mode 100644
index 7c822d3..0000000
--- a/tests/regression/csgtexttest/surface-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(surface)
diff --git a/tests/regression/csgtexttest/translate-expected.txt b/tests/regression/csgtexttest/translate-expected.txt
deleted file mode 100644
index 80024d2..0000000
--- a/tests/regression/csgtexttest/translate-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(transform2)
diff --git a/tests/regression/csgtexttest/union-expected.txt b/tests/regression/csgtexttest/union-expected.txt
deleted file mode 100644
index 1884c0f..0000000
--- a/tests/regression/csgtexttest/union-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(union2)
diff --git a/tests/regression/echotest/expression-shortcircuit-tests-expected.txt b/tests/regression/echotest/expression-shortcircuit-tests-expected.txt
new file mode 100644
index 0000000..d7f1c40
--- /dev/null
+++ b/tests/regression/echotest/expression-shortcircuit-tests-expected.txt
@@ -0,0 +1,5 @@
+ECHO: "Pass"
+ECHO: "Pass"
+ECHO: "Pass"
+ECHO: "Pass"
+ECHO: "Pass"
contact: Jan Huwald // Impressum