merge

Merge remote branch 'upstream/visitor' into visitortests

Conflicts:
	src/export.cc
	src/openscad.cc
	src/polyset.cc
	src/transform.cc
	tests/CMakeLists.txt
	tests/FindGLEW.cmake
	tests/csgtermtest.cc

1 files changed, 40 insertions, 0 deletions

diff --git a/testdata/scad/features/include-tests.scad b/testdata/scad/features/include-tests.scad
new file mode 100644
index 0000000..36c04ca
--- /dev/null
+++ b/testdata/scad/features/include-tests.scad
@@ -0,0 +1,40 @@
+//Test that the entire path is pushed onto the stack upto the last '/' 
+include <sub1/sub2/sub3/sub4/include-test2.scad>
+
+//Test that a non existent path/file doesn't screw things up
+include <non/existent/path/non-file>
+
+//Test with empty path 
+include <include-test5.scad>
+
+//Test without preceeding space
+include<include-test5.scad>
+
+//Test with other strange character that is allowed
+include>>>>><include-test5.scad>
+
+//Test that filenames with spaces work
+include <include test6.scad>
+
+//Test with empty file
+include<test/>
+
+//Test with empty path and file
+include </>
+
+//Test with empty
+include <>
+
+module test1()
+{
+	test2();
+	translate([2,0,0]) test3();
+	translate([2,-2,0]) test4();
+	translate([-2,0,0]) test5();
+	translate([-2,-2,0]) test6();
+
+	//Just to give a top level object
+	translate([0,-2,0]) sphere(0.7, $fn=16);
+}
+
+test1();