1 files changed, 6 insertions, 9 deletions
diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc
index e793c4a..f4a88e0 100644
--- a/tests/csgtermtest.cc
+++ b/tests/csgtermtest.cc
@@ -31,14 +31,13 @@
 #include "parsersettings.h"
 #include "node.h"
 #include "module.h"
-#include "context.h"
+#include "modcontext.h"
 #include "value.h"
 #include "export.h"
 #include "builtin.h"
 #include "Tree.h"
 #include "csgterm.h"
 
-#include <QCoreApplication>
 #ifndef _MSC_VER
 #include <getopt.h>
 #endif
@@ -53,7 +52,6 @@ namespace fs = boost::filesystem;
 
 std::string commandline_commands;
 std::string currentdir;
-QString examplesdir;
 
 using std::cout;
 
@@ -71,19 +69,18 @@ int main(int argc, char **argv)
 
 	Builtins::instance()->initialize();
 
-	QCoreApplication app(argc, argv);
 	fs::path original_path = fs::current_path();
 
 	currentdir = boosty::stringy( fs::current_path() );
 
-	parser_init(QCoreApplication::instance()->applicationDirPath().toStdString());
-	add_librarydir(boosty::stringy(fs::path(QCoreApplication::instance()->applicationDirPath().toStdString()) / "../libraries"));
+	parser_init(boosty::stringy(fs::path(argv[0]).branch_path()));
+	add_librarydir(boosty::stringy(fs::path(argv[0]).branch_path() / "../libraries"));
 
-	Context root_ctx;
-	register_builtin(root_ctx);
+	ModuleContext root_ctx;
+	root_ctx.registerBuiltin();
 
 	AbstractModule *root_module;
-	ModuleInstantiation root_inst;
+	ModuleInstantiation root_inst("group");
 	const AbstractNode *root_node;
 
 	root_module = parsefile(filename);