-

commit 0f28196441d72ecb9b593bddc7da866fcd3fe2bf
Author: chrysn <chrysn@fsfe.org>
Date:   Fri Jun 21 15:22:54 2013 +0200

    make more tests work

diff --git a/debian/changelog b/debian/changelog
index d81a2d4..7f66fc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ openscad (2013.06+dfsg-1) UNRELEASED; urgency=low
     of unavailable git information
   * Drop scripts directory for +dfsg repackaging
   * Explicitly set OpenSCAD version from upstream version
+  * Patch tests/test_cmdline_tool.py to use absolute paths (because openscad
+    and echotest have different behaviors in that respect)
 
  -- Christian M. Amsüss <chrysn@fsfe.org>  Fri, 08 Mar 2013 13:29:28 +0100
 
diff --git a/debian/rules b/debian/rules
index f633da8..4d3785e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,8 @@ override_dh_auto_build:
 
 	# fix absolute paths in ctest scripts
 	cd tests && perl -i.bak -npe 'use Cwd; my $$here = getcwd(); s/$$here/./g' *.cmake
+	# fix relative paths to plain binary names
+	cd tests && sed 's@\./\.\./openscad@openscad@' -i *.cmake
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
diff --git a/tests/test_cmdline_tool.py b/tests/test_cmdline_tool.py
index 470be1e..9b842aa 100755
--- a/tests/test_cmdline_tool.py
+++ b/tests/test_cmdline_tool.py
@@ -144,6 +144,8 @@ def compare_with_expected(resultfilename):
 def run_test(testname, cmd, args):
     cmdname = os.path.split(options.cmd)[1]
 
+    args = [os.path.abspath(x) if '/' in x and not x.startswith('/') else x for x in args]
+
     if options.generate: 
         if not os.path.exists(expecteddir): os.makedirs(expecteddir)
         outputname = expectedfilename