diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/.gitignore | 1 | ||||
| -rw-r--r-- | tests/cgalpngtest.cc | 3 | ||||
| -rw-r--r-- | tests/csgtermtest.cc | 4 | ||||
| -rw-r--r-- | tests/csgtestcore.cc | 3 | ||||
| -rw-r--r-- | tests/csgtexttest.cc | 3 | ||||
| -rw-r--r-- | tests/dumptest.cc | 6 | ||||
| -rw-r--r-- | tests/echotest.cc | 3 | ||||
| -rw-r--r-- | tests/regression/dumptest/background-modifier-expected.txt | 2 | ||||
| -rw-r--r-- | tests/regression/dumptest/example009-expected.txt | 4 | ||||
| -rw-r--r-- | tests/regression/dumptest/example017-expected.txt | 2 | ||||
| -rw-r--r-- | tests/regression/dumptest/highlight-and-background-modifier-expected.txt | 4 |
11 files changed, 29 insertions, 6 deletions
diff --git a/tests/.gitignore b/tests/.gitignore index e525181..ba02d4c 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,3 +1,4 @@ +/*.dSYM /*.a /*-output /*.scad diff --git a/tests/cgalpngtest.cc b/tests/cgalpngtest.cc index eabea86..7aa4b25 100644 --- a/tests/cgalpngtest.cc +++ b/tests/cgalpngtest.cc @@ -199,6 +199,9 @@ int main(int argc, char **argv) csgInfo.glview->paintGL(); csgInfo.glview->save(outfile); + delete root_node; + delete root_module; + Builtins::instance(true); return 0; diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc index 8f2d76e..2383126 100644 --- a/tests/csgtermtest.cc +++ b/tests/csgtermtest.cc @@ -143,6 +143,10 @@ int main(int argc, char **argv) } outfile.close(); + if (root_term) root_term->unlink(); + delete root_node; + delete root_module; + Builtins::instance(true); return rc; diff --git a/tests/csgtestcore.cc b/tests/csgtestcore.cc index 418738d..354c197 100644 --- a/tests/csgtestcore.cc +++ b/tests/csgtestcore.cc @@ -395,6 +395,9 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type) csgInfo.glview->save(outfilename); + delete root_node; + delete root_module; + Builtins::instance(true); return 0; diff --git a/tests/csgtexttest.cc b/tests/csgtexttest.cc index 76f6eb1..d7f94f1 100644 --- a/tests/csgtexttest.cc +++ b/tests/csgtexttest.cc @@ -129,6 +129,9 @@ int main(int argc, char **argv) outfile << csgcache[*root_node] << "\n"; outfile.close(); + delete root_node; + delete root_module; + Builtins::instance(true); return rc; diff --git a/tests/dumptest.cc b/tests/dumptest.cc index 4071669..22dd96c 100644 --- a/tests/dumptest.cc +++ b/tests/dumptest.cc @@ -139,6 +139,9 @@ int main(int argc, char **argv) outfile << dumpstdstr << "\n"; outfile.close(); + delete root_node; + delete root_module; + root_module = parsefile(outfilename); if (!root_module) { fprintf(stderr, "Error: Unable to read back dumped file\n"); @@ -159,6 +162,9 @@ int main(int argc, char **argv) exit(1); } + delete root_node; + delete root_module; + Builtins::instance(true); return rc; diff --git a/tests/echotest.cc b/tests/echotest.cc index 2f7ae4c..afa3d03 100644 --- a/tests/echotest.cc +++ b/tests/echotest.cc @@ -124,6 +124,9 @@ int main(int argc, char **argv) AbstractNode::resetIndexCounter(); root_node = root_module->evaluate(&root_ctx, &root_inst); + delete root_node; + delete root_module; + Builtins::instance(true); ofile.close(); return rc; diff --git a/tests/regression/dumptest/background-modifier-expected.txt b/tests/regression/dumptest/background-modifier-expected.txt index ca75e52..b52612f 100644 --- a/tests/regression/dumptest/background-modifier-expected.txt +++ b/tests/regression/dumptest/background-modifier-expected.txt @@ -1,5 +1,5 @@ difference() { sphere($fn = 0, $fa = 12, $fs = 1, r = 10); - cylinder($fn = 0, $fa = 12, $fs = 1, h = 30, r1 = 6, r2 = 6, center = true); + %cylinder($fn = 0, $fa = 12, $fs = 1, h = 30, r1 = 6, r2 = 6, center = true); } diff --git a/tests/regression/dumptest/example009-expected.txt b/tests/regression/dumptest/example009-expected.txt index df05fe2..47ada91 100644 --- a/tests/regression/dumptest/example009-expected.txt +++ b/tests/regression/dumptest/example009-expected.txt @@ -1,7 +1,7 @@ - linear_extrude(height = 22, center = true, convexity = 10, $fn = 0, $fa = 12, $fs = 1) { + %linear_extrude(height = 22, center = true, convexity = 10, $fn = 0, $fa = 12, $fs = 1) { import(file = "example009.dxf", layer = "body", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1); } - group() { + %group() { multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 12], [0, 0, 0, 1]]) { linear_extrude(height = 2, center = true, convexity = 10, $fn = 0, $fa = 12, $fs = 1) { import(file = "example009.dxf", layer = "plate", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1); diff --git a/tests/regression/dumptest/example017-expected.txt b/tests/regression/dumptest/example017-expected.txt index 42ef321..3f4ded6 100644 --- a/tests/regression/dumptest/example017-expected.txt +++ b/tests/regression/dumptest/example017-expected.txt @@ -187,7 +187,7 @@ } } } - multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 12], [0, 0, 0, 1]]) { + %multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 12], [0, 0, 0, 1]]) { group() { rotate_extrude(convexity = 2, $fn = 0, $fa = 12, $fs = 1) { square(size = [25, 68], center = false); diff --git a/tests/regression/dumptest/highlight-and-background-modifier-expected.txt b/tests/regression/dumptest/highlight-and-background-modifier-expected.txt index 16f7b2a..8f13dcd 100644 --- a/tests/regression/dumptest/highlight-and-background-modifier-expected.txt +++ b/tests/regression/dumptest/highlight-and-background-modifier-expected.txt @@ -1,11 +1,11 @@ difference() { sphere($fn = 0, $fa = 12, $fs = 1, r = 10); - cylinder($fn = 0, $fa = 12, $fs = 1, h = 30, r1 = 6, r2 = 6, center = true); + %cylinder($fn = 0, $fa = 12, $fs = 1, h = 30, r1 = 6, r2 = 6, center = true); } multmatrix([[1, 0, 0, 13], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { difference() { sphere($fn = 0, $fa = 12, $fs = 1, r = 10); - cylinder($fn = 0, $fa = 12, $fs = 1, h = 30, r1 = 6, r2 = 6, center = true); + %cylinder($fn = 0, $fa = 12, $fs = 1, h = 30, r1 = 6, r2 = 6, center = true); } } |