Merge remote branch 'upstream/master'

1 files changed, 4 insertions, 20 deletions

diff --git a/tests/csgtexttest.cc b/tests/csgtexttest.cc
index afa5bbe..ca28e37 100644
--- a/tests/csgtexttest.cc
+++ b/tests/csgtexttest.cc
@@ -24,10 +24,10 @@
  *
  */
 
+#include "tests-common.h"
 #include "CSGTextRenderer.h"
 #include "CSGTextCache.h"
 #include "openscad.h"
-#include "handle_dep.h"
 #include "node.h"
 #include "module.h"
 #include "context.h"
@@ -106,28 +106,12 @@ int main(int argc, char **argv)
 	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();