diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-11-26 18:17:54 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-11-26 18:17:54 (GMT) |
| commit | 8197294d4c30d533c88ef2901e298d2b2863aa87 (patch) | |
| tree | 7f26004c4b4d1ae12970913ea4d0201be5c50088 /tests/regression/dumptest | |
| parent | 2bd48629ef8482a957f7db0921a3b3c7fdc458e1 (diff) | |
| parent | 14b4ed4b5baa0efa7eea90322faca4fecfbfa294 (diff) | |
Merge branch 'cakebaby' of github.com:donbright/openscad into cakebaby
Conflicts:
tests/CMakeLists.txt
Diffstat (limited to 'tests/regression/dumptest')
| -rw-r--r-- | tests/regression/dumptest/escape-test-expected.txt | 2 | ||||
| -rw-r--r-- | tests/regression/dumptest/polygon-tests-expected.txt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/regression/dumptest/escape-test-expected.txt b/tests/regression/dumptest/escape-test-expected.txt index bea0156..2097dc4 100644 --- a/tests/regression/dumptest/escape-test-expected.txt +++ b/tests/regression/dumptest/escape-test-expected.txt @@ -1,2 +1,2 @@ - import(file = "A-\\ B-\" C-\t D-\n E-' F-\\\\", layer = "A:\\ B:\" C:\t D:\n E:' F:\\\\", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1); + import(file = "B-\" C-\t D-\n E-'", layer = "A:\\ B:\" C:\t D:\n E:' F:\\\\", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1); diff --git a/tests/regression/dumptest/polygon-tests-expected.txt b/tests/regression/dumptest/polygon-tests-expected.txt index ce4ad87..be66d21 100644 --- a/tests/regression/dumptest/polygon-tests-expected.txt +++ b/tests/regression/dumptest/polygon-tests-expected.txt @@ -29,4 +29,7 @@ multmatrix([[1, 0, 0, -2], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) { polygon(points = [[0, 0], [0.5, -0.2], [1, 0], [1.2, 0.5], [1, 1], [0.5, 1.2], [0, 1], [-0.2, 0.5]], paths = [[0, 1, 2, 3], [4, 5, 6, 7]], convexity = 1); } + multmatrix([[1, 0, 0, 2], [0, 1, 0, -4], [0, 0, 1, 0], [0, 0, 0, 1]]) { + polygon(points = [[0, 0], [1, 0], [1, 1], [0, 0]], paths = undef, convexity = 1); + } |