1 files changed, 7 insertions, 40 deletions

diff --git a/tests/echotest.cc b/tests/echotest.cc
index 046f883..5ab9efa 100644
--- a/tests/echotest.cc
+++ b/tests/echotest.cc
@@ -24,8 +24,8 @@
  *
  */
 
+#include "tests-common.h"
 #include "openscad.h"
-#include "handle_dep.h"
 #include "node.h"
 #include "module.h"
 #include "context.h"
@@ -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();
@@ -104,56 +103,24 @@ int main(int argc, char **argv)
 	}
 
 	Context root_ctx;
-	root_ctx.functions_p = &builtin_functions;
-	root_ctx.modules_p = &builtin_modules;
-	root_ctx.set_variable("$fn", Value(0.0));
-	root_ctx.set_variable("$fs", Value(1.0));
-	root_ctx.set_variable("$fa", Value(12.0));
-	root_ctx.set_variable("$t", Value(0.0));
-
-	Value zero3;
-	zero3.type = Value::VECTOR;
-	zero3.append(new Value(0.0));
-	zero3.append(new Value(0.0));
-	zero3.append(new Value(0.0));
-	root_ctx.set_variable("$vpt", zero3);
-	root_ctx.set_variable("$vpr", zero3);
-
+	register_builtin(root_ctx);
 
 	AbstractModule *root_module;
 	ModuleInstantiation root_inst;
 	AbstractNode *root_node;
 
-	QFileInfo fileInfo(filename);
-	handle_dep(filename);
-	FILE *fp = fopen(filename, "rt");
-	if (!fp) {
-		fprintf(stderr, "Can't open input file `%s'!\n", filename);
+	root_module = parsefile(filename);
+	if (!root_module) {
 		exit(1);
-	} else {
-		std::stringstream text;
-		char buffer[513];
-		int ret;
-		while ((ret = fread(buffer, 1, 512, fp)) > 0) {
-			buffer[ret] = 0;
-			text << buffer;
-		}
-		fclose(fp);
-		text << commandline_commands;
-		root_module = parse(text.str().c_str(), fileInfo.absolutePath().toLocal8Bit(), false);
-		if (!root_module) {
-			exit(1);
-		}
 	}
 
+	QFileInfo fileInfo(filename);
 	QDir::setCurrent(fileInfo.absolutePath());
 
 	AbstractNode::resetIndexCounter();
 	root_node = root_module->evaluate(&root_ctx, &root_inst);
 
-	destroy_builtin_functions();
-	destroy_builtin_modules();
-
+	Builtins::instance(true);
 	ofile.close();
 	return rc;
 }