diff options
| author | don bright <hugh.m.bright@gmail.com> | 2011-11-26 17:11:55 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2011-11-26 17:11:55 (GMT) |
| commit | 14b4ed4b5baa0efa7eea90322faca4fecfbfa294 (patch) | |
| tree | 89a983e6d631c2b43a6dd1f0fa25c8bd3969ff41 /tests/regression/dumptest | |
| parent | c2fb5d3650ffaa42c68e02891168c711d3b5f079 (diff) | |
| parent | 7678f0f08305ecbc9d6f137f9deb19c60c904346 (diff) | |
Merge remote-tracking branch 'upstream/master' into cakebaby
and tweak tests for win32 run
Conflicts:
tests/test_cmdline_tool.py
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); + } |