diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-29 18:02:19 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-29 18:02:19 (GMT) |
| commit | e541df8bb50df403afded7dfe73d9df5b542d2e4 (patch) | |
| tree | 1b4451b2a910c11d6dd6e8a3b80645e50f80d1d3 | |
| parent | 3c3bb91520ea841ef20b9bf7e6dd162abd1cfaa1 (diff) | |
Added test case for recently fixed csg normalization bugfix
| -rw-r--r-- | doc/TODO.txt | 2 | ||||
| -rw-r--r-- | testdata/scad/bugs/intersection-prune-test.scad | 9 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/regression/opencsgtest/intersection-prune-test-expected.png | bin | 0 -> 4408 bytes | |||
| -rw-r--r-- | tests/regression/throwntogethertest/intersection-prune-test-expected.png | bin | 0 -> 4408 bytes |
5 files changed, 10 insertions, 2 deletions
diff --git a/doc/TODO.txt b/doc/TODO.txt index 2b19a12..e7e0105 100644 --- a/doc/TODO.txt +++ b/doc/TODO.txt @@ -254,8 +254,6 @@ o Caching - Test that caching is actually performed (speedup + same results) - Test the modifier characters correctly influence the cache (also when added/removed) -o CSG normalization - - Empty top-level intersection o other tests - export - cmd-line tests diff --git a/testdata/scad/bugs/intersection-prune-test.scad b/testdata/scad/bugs/intersection-prune-test.scad new file mode 100644 index 0000000..3c6df7a --- /dev/null +++ b/testdata/scad/bugs/intersection-prune-test.scad @@ -0,0 +1,9 @@ +// This tree cannot be pruned inline, but will still result in an empty CSG tree +// Crashes OpenSCAD-2011.12. Bug fixed in 14e4f3bb +intersection() { + union() { + cube(); + translate([4,0,0]) cube(); + } + translate([2,0,0]) cube(); +} diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 931fb12..665bd92 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -619,6 +619,7 @@ list(APPEND CGALPNGTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/include- ${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 OPENCSGTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/intersection-prune-test.scad) list(APPEND THROWNTOGETHERTEST_FILES ${OPENCSGTEST_FILES}) list(APPEND CGALSTLSANITYTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/normal-nan.scad) diff --git a/tests/regression/opencsgtest/intersection-prune-test-expected.png b/tests/regression/opencsgtest/intersection-prune-test-expected.png Binary files differnew file mode 100644 index 0000000..50d838c --- /dev/null +++ b/tests/regression/opencsgtest/intersection-prune-test-expected.png diff --git a/tests/regression/throwntogethertest/intersection-prune-test-expected.png b/tests/regression/throwntogethertest/intersection-prune-test-expected.png Binary files differnew file mode 100644 index 0000000..50d838c --- /dev/null +++ b/tests/regression/throwntogethertest/intersection-prune-test-expected.png |
