Merge pull request #476 from openscad/testfixes

Testfixes

9 files changed, 91 insertions, 6 deletions

diff --git a/tests/regression/cgalpngtest/resize-2d-tests-expected.png b/tests/regression/cgalpngtest/resize-2d-tests-expected.png
index 44e9598..e764ac3 100644
--- a/tests/regression/cgalpngtest/resize-2d-tests-expected.png
+++ b/tests/regression/cgalpngtest/resize-2d-tests-expected.png
diff --git a/tests/regression/cgalpngtest/resize-tests-expected.png b/tests/regression/cgalpngtest/resize-tests-expected.png
index 8f994bf..6a5bb32 100644
--- a/tests/regression/cgalpngtest/resize-tests-expected.png
+++ b/tests/regression/cgalpngtest/resize-tests-expected.png
diff --git a/tests/regression/dumptest/resize-2d-tests-expected.csg b/tests/regression/dumptest/resize-2d-tests-expected.csg
index 5f8d8b5..5cd9a2e 100644
--- a/tests/regression/dumptest/resize-2d-tests-expected.csg
+++ b/tests/regression/dumptest/resize-2d-tests-expected.csg
@@ -173,4 +173,54 @@ group() {
 			}
 		}
 	}
+	color([0, 0, 1, 1]) {
+		multmatrix([[1, 0, 0, -16], [0, 1, 0, -16], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			resize(newsize = [10,8,0], auto = [0,1,0]) {
+				multmatrix([[0.5, 0, 0, 0], [0, 100, 0, 0], [0, 0, 20, 0], [0, 0, 0, 1]]) {
+					group() {
+						difference() {
+							square(size = [5, 5], center = false);
+							multmatrix([[1, 0, 0, 1], [0, 1, 0, 1], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+								square(size = [1, 1], center = false);
+							}
+							multmatrix([[1, 0, 0, 3], [0, 1, 0, 3], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+								circle($fn = 10, $fa = 12, $fs = 2, r = 1);
+							}
+						}
+					}
+				}
+			}
+		}
+		multmatrix([[1, 0, 0, 0], [0, 1, 0, -16], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			resize(newsize = [8,10,15], auto = [1,1,1]) {
+				multmatrix([[1000, 0, 0, 0], [0, 0.5, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+					group() {
+						difference() {
+							square(size = [5, 5], center = false);
+							multmatrix([[1, 0, 0, 1], [0, 1, 0, 1], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+								square(size = [1, 1], center = false);
+							}
+							multmatrix([[1, 0, 0, 2], [0, 1, 0, 2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+								square(size = [1, 1], center = false);
+							}
+						}
+					}
+				}
+			}
+		}
+		multmatrix([[1, 0, 0, 16], [0, 1, 0, -16], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			resize(newsize = [10,8,15], auto = [0,0,0]) {
+				multmatrix([[200, 0, 0, 0], [0, 200, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+					group() {
+						difference() {
+							square(size = [5, 5], center = false);
+							multmatrix([[1, 0, 0, 0], [0, 1, 0, 2.5], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+								square(size = [5, 1], center = false);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
diff --git a/tests/regression/dumptest/resize-tests-expected.csg b/tests/regression/dumptest/resize-tests-expected.csg
index 1e7888a..98fef74 100644
--- a/tests/regression/dumptest/resize-tests-expected.csg
+++ b/tests/regression/dumptest/resize-tests-expected.csg
@@ -237,35 +237,67 @@ group() {
 				}
 			}
 		}
-		multmatrix([[1, 0, 0, 10], [0, 1, 0, 10], [0, 0, 1, -10], [0, 0, 0, 1]]) {
+		multmatrix([[1, 0, 0, 20], [0, 1, 0, 0], [0, 0, 1, -10], [0, 0, 0, 1]]) {
 			resize(newsize = [-5,0,0], auto = [0,0,0]) {
 				cube(size = [1, 1, 1], center = false);
 			}
 		}
-		multmatrix([[1, 0, 0, 10], [0, 1, 0, 20], [0, 0, 1, -10], [0, 0, 0, 1]]) {
+		multmatrix([[1, 0, 0, 30], [0, 1, 0, 0], [0, 0, 1, -10], [0, 0, 0, 1]]) {
 			resize(newsize = [-5,0,0], auto = [0,0,0]) {
 				cube(size = [1, 1, 1], center = false);
 			}
 		}
-		multmatrix([[1, 0, 0, 10], [0, 1, 0, 30], [0, 0, 1, -10], [0, 0, 0, 1]]) {
+		multmatrix([[1, 0, 0, 40], [0, 1, 0, 0], [0, 0, 1, -10], [0, 0, 0, 1]]) {
 			resize(newsize = [0,0,0], auto = [0,0,0]) {
 				cube(size = [1, 1, 1], center = false);
 			}
 		}
-		multmatrix([[1, 0, 0, 10], [0, 1, 0, 40], [0, 0, 1, -10], [0, 0, 0, 1]]) {
+		multmatrix([[1, 0, 0, 50], [0, 1, 0, 0], [0, 0, 1, -10], [0, 0, 0, 1]]) {
 			resize(newsize = [0,0,0], auto = [0,0,0]) {
 				cube(size = [1, 1, 1], center = false);
 			}
 		}
-		multmatrix([[1, 0, 0, 10], [0, 1, 0, 50], [0, 0, 1, -10], [0, 0, 0, 1]]) {
+		multmatrix([[1, 0, 0, 60], [0, 1, 0, 0], [0, 0, 1, -10], [0, 0, 0, 1]]) {
 			resize(newsize = [0.5,0,7], auto = [0,0,0]) {
 				cube(size = [0.5, 1, 1000], center = false);
 			}
 		}
-		multmatrix([[1, 0, 0, 10], [0, 1, 0, 60], [0, 0, 1, -10], [0, 0, 0, 1]]) {
+		multmatrix([[1, 0, 0, 70], [0, 1, 0, 0], [0, 0, 1, -10], [0, 0, 0, 1]]) {
 			resize(newsize = [0,0,0.5], auto = [0,0,0]) {
 				cube(size = [6, 6, 1e+10], center = false);
 			}
 		}
 	}
+	color([0, 1, 0, 1]) {
+		multmatrix([[1, 0, 0, 20], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			resize(newsize = [5,0,0], auto = [1,1,0]) {
+				cube(size = [9, 9, 9], center = false);
+			}
+		}
+		multmatrix([[1, 0, 0, 30], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			resize(newsize = [6,0,0], auto = [1,1,1]) {
+				cube(size = [9, 9, 9], center = false);
+			}
+		}
+		multmatrix([[1, 0, 0, 40], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			resize(newsize = [6,0,0], auto = [1,0,1]) {
+				cube(size = [9, 9, 9], center = false);
+			}
+		}
+		multmatrix([[1, 0, 0, 50], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			resize(newsize = [5,0,20], auto = [0,1,1]) {
+				cube(size = [9, 9, 9], center = false);
+			}
+		}
+		multmatrix([[1, 0, 0, 60], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			resize(newsize = [0,0,7], auto = [0,0,1]) {
+				cube(size = [9, 9, 9], center = false);
+			}
+		}
+		multmatrix([[1, 0, 0, 70], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			resize(newsize = [6,0,0], auto = [1,1,0]) {
+				cube(size = [9, 9, 9], center = false);
+			}
+		}
+	}
 }
diff --git a/tests/regression/echotest/rands-expected.txt b/tests/regression/echotest/rands-expected.txt
new file mode 100644
index 0000000..36ac6cd
--- /dev/null
+++ b/tests/regression/echotest/rands-expected.txt
@@ -0,0 +1,3 @@
+WARNING: Ignoring unknown variable 'v'.
+ECHO: "i hope rands() did not crash"
+ECHO: [1, 1, 1, 1]
diff --git a/tests/regression/opencsgtest/resize-2d-tests-expected.png b/tests/regression/opencsgtest/resize-2d-tests-expected.png
index d3bda96..83a1ca7 100644
--- a/tests/regression/opencsgtest/resize-2d-tests-expected.png
+++ b/tests/regression/opencsgtest/resize-2d-tests-expected.png
diff --git a/tests/regression/opencsgtest/resize-tests-expected.png b/tests/regression/opencsgtest/resize-tests-expected.png
index 0334ba6..669835d 100644
--- a/tests/regression/opencsgtest/resize-tests-expected.png
+++ b/tests/regression/opencsgtest/resize-tests-expected.png
diff --git a/tests/regression/throwntogethertest/resize-2d-tests-expected.png b/tests/regression/throwntogethertest/resize-2d-tests-expected.png
index 4737cf7..6c55fa9 100644
--- a/tests/regression/throwntogethertest/resize-2d-tests-expected.png
+++ b/tests/regression/throwntogethertest/resize-2d-tests-expected.png
diff --git a/tests/regression/throwntogethertest/resize-tests-expected.png b/tests/regression/throwntogethertest/resize-tests-expected.png
index 7445c1c..669835d 100644
--- a/tests/regression/throwntogethertest/resize-tests-expected.png
+++ b/tests/regression/throwntogethertest/resize-tests-expected.png