From c7f83aa3e35baf8a517c40a367ec247a7061b225 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Tue, 2 Apr 2013 20:51:20 -0700
Subject: remove redundant code, root_node and absolute_root_node


diff --git a/src/openscad.cc b/src/openscad.cc
index f7cc48e..878c207 100644
--- a/src/openscad.cc
+++ b/src/openscad.cc
@@ -357,11 +357,10 @@ int main(int argc, char **argv)
 
 		AbstractNode::resetIndexCounter();
 		absolute_root_node = root_module->evaluate(&root_ctx, &root_inst);
-		root_node = root_module->evaluate(&root_ctx, &root_inst);
 
 		// Do we have an explicit root node (! modifier)?
 		if (!(root_node = find_root_tag(absolute_root_node)))
-	    root_node = absolute_root_node;
+			root_node = absolute_root_node;
 
 		tree.setRoot(root_node);
 
-- 
cgit v0.10.1


From 7b5cd11cdc923921cfae5b40fca5850fbd92de40 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Fri, 5 Apr 2013 00:11:48 -0400
Subject: bugfix: If the test driver returned an error, it was ignored by the
 test script


diff --git a/tests/test_cmdline_tool.py b/tests/test_cmdline_tool.py
index eb01abd..470be1e 100755
--- a/tests/test_cmdline_tool.py
+++ b/tests/test_cmdline_tool.py
@@ -256,5 +256,6 @@ if __name__ == '__main__':
     verification = verify_test(options.testname, options.cmd)
 
     resultfile = run_test(options.testname, options.cmd, args[1:])
-
+    if not resultfile: exit(1)
+    
     if not verification or not compare_with_expected(resultfile): exit(1)
-- 
cgit v0.10.1