Merge branch 'master' into cakebaby

22 files changed, 25 insertions, 59 deletions

diff --git a/tests/regression/cgalpngtest/hull3-tests-expected.png b/tests/regression/cgalpngtest/hull3-tests-expected.png
new file mode 100644
index 0000000..50d838c
--- /dev/null
+++ b/tests/regression/cgalpngtest/hull3-tests-expected.png
diff --git a/tests/regression/cgalpngtest/import_stl-tests-expected.png b/tests/regression/cgalpngtest/import_stl-tests-expected.png
new file mode 100644
index 0000000..31395c2
--- /dev/null
+++ b/tests/regression/cgalpngtest/import_stl-tests-expected.png
diff --git a/tests/regression/cgalpngtest/null-polygons-expected.png b/tests/regression/cgalpngtest/null-polygons-expected.png
new file mode 100644
index 0000000..3368f13
--- /dev/null
+++ b/tests/regression/cgalpngtest/null-polygons-expected.png
diff --git a/tests/regression/csgtexttest/dim-all-expected.txt b/tests/regression/csgtexttest/dim-all-expected.txt
deleted file mode 100644
index 6c127a8..0000000
--- a/tests/regression/csgtexttest/dim-all-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-group1(group2+group2+group2+group2+group2+group2+group2+group2)
diff --git a/tests/regression/dumptest/dim-all-expected.txt b/tests/regression/dumptest/dim-all-expected.txt
deleted file mode 100644
index 98a9bd9..0000000
--- a/tests/regression/dumptest/dim-all-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-	group();
-	group();
-	group();
-	group();
-	group();
-	group();
-	group();
-	group();
-
diff --git a/tests/regression/dumptest/dxf-export-expected.txt b/tests/regression/dumptest/dxf-export-expected.txt
deleted file mode 100644
index 93be68c..0000000
--- a/tests/regression/dumptest/dxf-export-expected.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-	circle($fn = 0, $fa = 12, $fs = 1, r = 5);
-	multmatrix([[1, 0, 0, 15], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-		square(size = [10, 10], center = true);
-	}
-	multmatrix([[1, 0, 0, 30], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-		polygon(points = [[-5, -5], [5, -5], [0, 5]], paths = [[0, 1, 2]], convexity = 1);
-	}
-	multmatrix([[1, 0, 0, 0], [0, 1, 0, -15], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-		difference() {
-			circle($fn = 0, $fa = 12, $fs = 1, r = 5);
-			multmatrix([[1, 0, 0, 0], [0, 1, 0, -6], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-				square(size = [12, 12], center = true);
-			}
-		}
-	}
-
diff --git a/tests/regression/dumptest/echo-tests-expected.txt b/tests/regression/dumptest/echo-tests-expected.txt
deleted file mode 100644
index 98a9bd9..0000000
--- a/tests/regression/dumptest/echo-tests-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-	group();
-	group();
-	group();
-	group();
-	group();
-	group();
-	group();
-	group();
-
diff --git a/tests/regression/dumptest/include test6-expected.txt b/tests/regression/dumptest/include test6-expected.txt
deleted file mode 100644
index 8b13789..0000000
--- a/tests/regression/dumptest/include test6-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/regression/dumptest/include-test-expected.txt b/tests/regression/dumptest/include-test-expected.txt
deleted file mode 100644
index 871e45d..0000000
--- a/tests/regression/dumptest/include-test-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-group() {
-	group() {
-		group() {
-			group();
-		}
-		group() {
-			group();
-		}
-		group() {
-			group();
-		}
-		group() {
-			group();
-		}
-		group() {
-			group();
-		}
-		sphere($fn = 0, $fa = 12, $fs = 1, r = 1);
-	}
-}
diff --git a/tests/regression/dumptest/include-test5-expected.txt b/tests/regression/dumptest/include-test5-expected.txt
deleted file mode 100644
index 8b13789..0000000
--- a/tests/regression/dumptest/include-test5-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/regression/dumptest/string-test-expected.txt b/tests/regression/dumptest/string-test-expected.txt
deleted file mode 100644
index b2915cb..0000000
--- a/tests/regression/dumptest/string-test-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-	group();
-
diff --git a/tests/regression/echotest/dim-all-expected.txt b/tests/regression/echotest/dim-all-expected.txt
new file mode 100644
index 0000000..702f026
--- /dev/null
+++ b/tests/regression/echotest/dim-all-expected.txt
@@ -0,0 +1,16 @@
+WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+ECHO: linearX = 51.44957554275265
+WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+ECHO: linearY = 29.13025467434841
+WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+ECHO: aligned = 60.00000000000001
+WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+ECHO: ordinateX = -49.17542445724735
+WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+ECHO: ordinateY = 30.86974532565159
+WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+ECHO: radius = 60
+WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+ECHO: diameter = 120
+WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+ECHO: arc = 59.03624346792648
diff --git a/tests/regression/echotest/echo-tests-expected.txt b/tests/regression/echotest/echo-tests-expected.txt
index cc548f6..ee9705f 100644
--- a/tests/regression/echotest/echo-tests-expected.txt
+++ b/tests/regression/echotest/echo-tests-expected.txt
@@ -6,3 +6,4 @@ ECHO: [1, "vecstr", 2.34, false]
 ECHO: [1 : 2 : 10]
 ECHO: vec = [1, 2, 3]
 ECHO: range = [0 : 1 : 2]
+ECHO: "string generated by str()"
diff --git a/tests/regression/echotest/len-tests-expected.txt b/tests/regression/echotest/len-tests-expected.txt
new file mode 100644
index 0000000..2a776c0
--- /dev/null
+++ b/tests/regression/echotest/len-tests-expected.txt
@@ -0,0 +1,7 @@
+ECHO: 4
+ECHO: 4
+ECHO: 0
+ECHO: 0
+ECHO: 2
+ECHO: 3
+ECHO: undef
diff --git a/tests/regression/echotest/string-test-expected.txt b/tests/regression/echotest/string-test-expected.txt
new file mode 100644
index 0000000..1969a74
--- /dev/null
+++ b/tests/regression/echotest/string-test-expected.txt
@@ -0,0 +1 @@
+ECHO: "The quick brown fox \tjumps \"over\" the lazy dog.
The quick brown fox.\nThe \\lazy\\ dog."
diff --git a/tests/regression/opencsgtest/hull3-tests-expected.png b/tests/regression/opencsgtest/hull3-tests-expected.png
new file mode 100644
index 0000000..50d838c
--- /dev/null
+++ b/tests/regression/opencsgtest/hull3-tests-expected.png
diff --git a/tests/regression/opencsgtest/import_stl-tests-expected.png b/tests/regression/opencsgtest/import_stl-tests-expected.png
new file mode 100644
index 0000000..e6fdbca
--- /dev/null
+++ b/tests/regression/opencsgtest/import_stl-tests-expected.png
diff --git a/tests/regression/opencsgtest/null-polygons-expected.png b/tests/regression/opencsgtest/null-polygons-expected.png
new file mode 100644
index 0000000..ff06c62
--- /dev/null
+++ b/tests/regression/opencsgtest/null-polygons-expected.png
diff --git a/tests/regression/opencsgtest/testcolornames-expected.png b/tests/regression/opencsgtest/testcolornames-expected.png
new file mode 100644
index 0000000..6fc6569
--- /dev/null
+++ b/tests/regression/opencsgtest/testcolornames-expected.png
diff --git a/tests/regression/throwntogethertest/hull3-tests-expected.png b/tests/regression/throwntogethertest/hull3-tests-expected.png
new file mode 100644
index 0000000..50d838c
--- /dev/null
+++ b/tests/regression/throwntogethertest/hull3-tests-expected.png
diff --git a/tests/regression/throwntogethertest/import_stl-tests-expected.png b/tests/regression/throwntogethertest/import_stl-tests-expected.png
new file mode 100644
index 0000000..e6fdbca
--- /dev/null
+++ b/tests/regression/throwntogethertest/import_stl-tests-expected.png
diff --git a/tests/regression/throwntogethertest/null-polygons-expected.png b/tests/regression/throwntogethertest/null-polygons-expected.png
new file mode 100644
index 0000000..ff06c62
--- /dev/null
+++ b/tests/regression/throwntogethertest/null-polygons-expected.png