diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/cgalpngtest.cc | 6 | ||||
| -rw-r--r-- | tests/cgaltest.cc | 7 | ||||
| -rw-r--r-- | tests/csgtermtest.cc | 6 | ||||
| -rw-r--r-- | tests/csgtestcore.cc | 6 | ||||
| -rw-r--r-- | tests/csgtexttest.cc | 6 | ||||
| -rw-r--r-- | tests/dumptest.cc | 7 | ||||
| -rw-r--r-- | tests/echotest.cc | 7 |
8 files changed, 16 insertions, 30 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7959ef5..fb007cc 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -167,6 +167,7 @@ set(CORE_SOURCES ../src/func.cc ../src/module.cc ../src/node.cc + ../src/builtin.cc ../src/context.cc ../src/csgterm.cc ../src/polyset.cc diff --git a/tests/cgalpngtest.cc b/tests/cgalpngtest.cc index 02ee35e..e9e1f7b 100644 --- a/tests/cgalpngtest.cc +++ b/tests/cgalpngtest.cc @@ -100,8 +100,7 @@ int main(int argc, char **argv) const char *filename = argv[1]; const char *outfile = argv[2]; - initialize_builtin_functions(); - initialize_builtin_modules(); + Builtins::instance()->initialize(); QApplication app(argc, argv, false); QDir original_path = QDir::current(); @@ -212,8 +211,7 @@ int main(int argc, char **argv) csgInfo.glview->paintGL(); csgInfo.glview->save(outfile); - destroy_builtin_functions(); - destroy_builtin_modules(); + Builtins::instance(true); return 0; } diff --git a/tests/cgaltest.cc b/tests/cgaltest.cc index 0cbd89a..0b433bf 100644 --- a/tests/cgaltest.cc +++ b/tests/cgaltest.cc @@ -84,8 +84,7 @@ int main(int argc, char **argv) const char *filename = argv[1]; - initialize_builtin_functions(); - initialize_builtin_modules(); + Builtins::instance()->initialize(); QApplication app(argc, argv, false); QDir original_path = QDir::current(); @@ -142,8 +141,8 @@ int main(int argc, char **argv) if (!N.empty()) { export_stl(&N, std::cout, NULL); } - destroy_builtin_functions(); - destroy_builtin_modules(); + + Builtins::instance(true); return 0; } diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc index 5268b28..c8fcc6b 100644 --- a/tests/csgtermtest.cc +++ b/tests/csgtermtest.cc @@ -69,8 +69,7 @@ int main(int argc, char **argv) int rc = 0; - initialize_builtin_functions(); - initialize_builtin_modules(); + Builtins::instance()->initialize(); QApplication app(argc, argv, false); QDir original_path = QDir::current(); @@ -145,8 +144,7 @@ int main(int argc, char **argv) } outfile.close(); - destroy_builtin_functions(); - destroy_builtin_modules(); + Builtins::instance(true); return rc; } diff --git a/tests/csgtestcore.cc b/tests/csgtestcore.cc index 57e397e..034084c 100644 --- a/tests/csgtestcore.cc +++ b/tests/csgtestcore.cc @@ -77,8 +77,7 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type) const char *filename = argv[1]; const char *outfilename = argv[2]; - initialize_builtin_functions(); - initialize_builtin_modules(); + Builtins::instance()->initialize(); QApplication app(argc, argv, false); @@ -217,8 +216,7 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type) csgInfo.glview->save(outfilename); - destroy_builtin_functions(); - destroy_builtin_modules(); + Builtins::instance(true); return 0; } diff --git a/tests/csgtexttest.cc b/tests/csgtexttest.cc index ca28e37..76f6eb1 100644 --- a/tests/csgtexttest.cc +++ b/tests/csgtexttest.cc @@ -72,8 +72,7 @@ int main(int argc, char **argv) int rc = 0; - initialize_builtin_functions(); - initialize_builtin_modules(); + Builtins::instance()->initialize(); QApplication app(argc, argv, false); QDir original_path = QDir::current(); @@ -130,8 +129,7 @@ int main(int argc, char **argv) outfile << csgcache[*root_node] << "\n"; outfile.close(); - destroy_builtin_functions(); - destroy_builtin_modules(); + Builtins::instance(true); return rc; } diff --git a/tests/dumptest.cc b/tests/dumptest.cc index d2fd9b1..8a83131 100644 --- a/tests/dumptest.cc +++ b/tests/dumptest.cc @@ -75,8 +75,7 @@ int main(int argc, char **argv) int rc = 0; - initialize_builtin_functions(); - initialize_builtin_modules(); + Builtins::instance()->initialize(); QApplication app(argc, argv, false); QDir original_path = QDir::current(); @@ -159,9 +158,7 @@ int main(int argc, char **argv) exit(1); } - - destroy_builtin_functions(); - destroy_builtin_modules(); + Builtins::instance(true); return rc; } diff --git a/tests/echotest.cc b/tests/echotest.cc index d1d1f9b..5ab9efa 100644 --- a/tests/echotest.cc +++ b/tests/echotest.cc @@ -76,8 +76,7 @@ int main(int argc, char **argv) } set_output_handler(&outfile_handler, &ofile); - initialize_builtin_functions(); - initialize_builtin_modules(); + Builtins::instance()->initialize(); QApplication app(argc, argv, false); QDir original_path = QDir::current(); @@ -121,9 +120,7 @@ int main(int argc, char **argv) AbstractNode::resetIndexCounter(); root_node = root_module->evaluate(&root_ctx, &root_inst); - destroy_builtin_functions(); - destroy_builtin_modules(); - + Builtins::instance(true); ofile.close(); return rc; } |