Merge branch 'master' into no-testprograms

Conflicts:
	tests/CMakeLists.txt
	tests/regression/csgtermtest/assign-expected.term
	tests/regression/csgtermtest/child-expected.term
	tests/regression/csgtermtest/circle-expected.term
	tests/regression/csgtermtest/color-expected.term
	tests/regression/csgtermtest/cube-expected.term
	tests/regression/csgtermtest/cylinder-expected.term
	tests/regression/csgtermtest/difference-expected.term
	tests/regression/csgtermtest/dxf_linear_extrude-expected.term
	tests/regression/csgtermtest/dxf_rotate_extrude-expected.term
	tests/regression/csgtermtest/echo-expected.term
	tests/regression/csgtermtest/for-expected.term
	tests/regression/csgtermtest/glide-expected.term
	tests/regression/csgtermtest/group-expected.term
	tests/regression/csgtermtest/hull-expected.term
	tests/regression/csgtermtest/if-expected.term
	tests/regression/csgtermtest/import-expected.term
	tests/regression/csgtermtest/import_dxf-expected.term
	tests/regression/csgtermtest/import_off-expected.term
	tests/regression/csgtermtest/import_stl-expected.term
	tests/regression/csgtermtest/intersection-expected.term
	tests/regression/csgtermtest/intersection_for-expected.term
	tests/regression/csgtermtest/linear_extrude-expected.term
	tests/regression/csgtermtest/minkowski-expected.term
	tests/regression/csgtermtest/mirror-expected.term
	tests/regression/csgtermtest/multmatrix-expected.term
	tests/regression/csgtermtest/polygon-expected.term
	tests/regression/csgtermtest/polyhedron-expected.term
	tests/regression/csgtermtest/projection-expected.term
	tests/regression/csgtermtest/render-expected.term
	tests/regression/csgtermtest/rotate-expected.term
	tests/regression/csgtermtest/rotate_extrude-expected.term
	tests/regression/csgtermtest/scale-expected.term
	tests/regression/csgtermtest/sphere-expected.term
	tests/regression/csgtermtest/square-expected.term
	tests/regression/csgtermtest/subdiv-expected.term
	tests/regression/csgtermtest/surface-expected.term
	tests/regression/csgtermtest/translate-expected.term
	tests/regression/csgtermtest/union-expected.term
	tests/regression/dumptest/circle-expected.csg
	tests/regression/dumptest/color-expected.csg
	tests/regression/dumptest/cube-expected.csg
	tests/regression/dumptest/cylinder-expected.csg
	tests/regression/dumptest/difference-expected.csg
	tests/regression/dumptest/dxf_linear_extrude-expected.csg
	tests/regression/dumptest/dxf_rotate_extrude-expected.csg
	tests/regression/dumptest/glide-expected.csg
	tests/regression/dumptest/import-expected.csg
	tests/regression/dumptest/import_dxf-expected.csg
	tests/regression/dumptest/import_off-expected.csg
	tests/regression/dumptest/import_stl-expected.csg
	tests/regression/dumptest/intersection-expected.csg
	tests/regression/dumptest/intersection_for-expected.csg
	tests/regression/dumptest/linear_extrude-expected.csg
	tests/regression/dumptest/minkowski-expected.csg
	tests/regression/dumptest/mirror-expected.csg
	tests/regression/dumptest/multmatrix-expected.csg
	tests/regression/dumptest/polygon-expected.csg
	tests/regression/dumptest/polyhedron-expected.csg
	tests/regression/dumptest/projection-expected.csg
	tests/regression/dumptest/render-expected.csg
	tests/regression/dumptest/rotate-expected.csg
	tests/regression/dumptest/rotate_extrude-expected.csg
	tests/regression/dumptest/scale-expected.csg
	tests/regression/dumptest/sphere-expected.csg
	tests/regression/dumptest/square-expected.csg
	tests/regression/dumptest/subdiv-expected.csg
	tests/regression/dumptest/surface-expected.csg
	tests/regression/dumptest/translate-expected.csg

1 files changed, 39 insertions, 0 deletions

diff --git a/testdata/scad/misc/allmodules.scad b/testdata/scad/misc/allmodules.scad
new file mode 100644
index 0000000..2e38d8f
--- /dev/null
+++ b/testdata/scad/misc/allmodules.scad
@@ -0,0 +1,39 @@
+minkowski();
+glide();
+subdiv();
+hull();
+resize();
+child();
+echo();
+assign();
+for();
+intersection_for();
+if(false) { cube(); } else { sphere(); }
+union();
+difference();
+intersection();
+dxf_linear_extrude();
+linear_extrude();
+dxf_rotate_extrude();
+rotate_extrude();
+import();
+import_stl();
+import_off();
+import_dxf();
+group();
+cube();
+sphere();
+cylinder();
+polyhedron();
+square();
+circle();
+polygon();
+projection();
+render();
+surface();
+scale();
+rotate();
+mirror();
+translate();
+multmatrix();
+color();