From ebe59a0e4d10f1757ff0bd4c1cc6fe8fc2c2ee67 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Tue, 23 Oct 2012 20:40:45 -0400 Subject: [PATCH] Added test for circular includes --- testdata/modulecache-tests/README.txt | 26 ++++++++++++------- .../circularincludefirst.scad | 1 + .../circularincludemain.scad | 1 + .../circularincludesecond.scad | 1 + 4 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 testdata/modulecache-tests/circularincludefirst.scad create mode 100644 testdata/modulecache-tests/circularincludemain.scad create mode 100644 testdata/modulecache-tests/circularincludesecond.scad diff --git a/testdata/modulecache-tests/README.txt b/testdata/modulecache-tests/README.txt index 463261c8..277cff87 100644 --- a/testdata/modulecache-tests/README.txt +++ b/testdata/modulecache-tests/README.txt @@ -5,13 +5,13 @@ Compile OpenSCAD in debug mode. This will give console output related to module /path/to/used.scad: 0x103612f70 Module cache size: 1 modules -Test1: +Test1: Basic cache ------ o Open use.scad o Compile twice (F5) - check that module reference is the same -Test2: +Test2: Dependency tracking of USE ------ o Open use.scad @@ -19,42 +19,42 @@ o Compile (F5) o touch used.scad o Compile (F5) - check that the module reference changed -Test3: +Test3: MCAD ------ o Open use-mcad.scad o Compile (F5) o Check that you get a rounded box -Test4: +Test4: USE Non-existing file ------ o Open usenonexsistingfile.scad o Compile (F5) o Verify that you get: WARNING: Can't open 'use' file 'nofile.scad'. -Test5: +Test5: Overload USEd module ------ o Open moduleoverload.scad o Compile (F5) o Verify that you get a sphere rather than a cylinder -Test6: +Test6: Recursive USE ------ o Open recursivemain.scad o Compile (F5) o Verify that OpenSCAD won't hang or crash -Test7: +Test7: Circular USE ------ o Open circularmain.scad o Compile (F5) o Verify that OpenSCAD won't hang or crash -Test8: +Test8: Dependency tracking of common file USEd by multiple modules ------ o Open multiplemain.scad @@ -64,7 +64,7 @@ o Edit multipleB.scad: + cube(2.5*F(), center=true); o Reload and Compile (F4) - verify that the cube got larger -Test9: +Test9: Dependency tracking of file included from module ------ o Open includefrommodule.scad @@ -72,4 +72,10 @@ o Compile (F5) - Verify that you get a circular disc o Edit radius.scad: Change RADIUS o Compile (F5) - Verify that the disc changed size -FIXME: Test circular include +Test9: Circular include +------ + +o Open circularincludemain.scad +o Compile (F5) +o Verify that OpenSCAD won't hang or crash + diff --git a/testdata/modulecache-tests/circularincludefirst.scad b/testdata/modulecache-tests/circularincludefirst.scad new file mode 100644 index 00000000..f94606a3 --- /dev/null +++ b/testdata/modulecache-tests/circularincludefirst.scad @@ -0,0 +1 @@ +include diff --git a/testdata/modulecache-tests/circularincludemain.scad b/testdata/modulecache-tests/circularincludemain.scad new file mode 100644 index 00000000..b9739560 --- /dev/null +++ b/testdata/modulecache-tests/circularincludemain.scad @@ -0,0 +1 @@ +include diff --git a/testdata/modulecache-tests/circularincludesecond.scad b/testdata/modulecache-tests/circularincludesecond.scad new file mode 100644 index 00000000..b9739560 --- /dev/null +++ b/testdata/modulecache-tests/circularincludesecond.scad @@ -0,0 +1 @@ +include