Merge branch 'master' of github.com:openscad/openscad into cmake_workaround

Conflicts:
	tests/virtualfb.sh

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/test_cmdline_tool.py b/tests/test_cmdline_tool.py
index f29acc0..889c429 100755
--- a/tests/test_cmdline_tool.py
+++ b/tests/test_cmdline_tool.py
@@ -101,7 +101,7 @@ def compare_png(resultfilename):
     msg += '\n expected image: ' + expectedfilename + '\n'
     print >> sys.stderr, msg
     if not resultfilename:
-        print >> sys.stderr, "Error: OpenSCAD did not generate an image to test"
+        print >> sys.stderr, "Error: OpenSCAD error during test image generation"
         return False
     print >> sys.stderr, ' actual image: ', resultfilename