From: Denis Laxalde <denis.laxalde@logilab.fr>
Date: Wed, 12 Mar 2014 15:54:03 +0100
Subject: "Repair" runtest command

---
 waftools/runtest.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/waftools/runtest.py b/waftools/runtest.py
index e399717..b90e884 100644
--- a/waftools/runtest.py
+++ b/waftools/runtest.py
@@ -34,16 +34,14 @@ def runtest(self):
         toolargs.append('--exectool=%s' % opts.exectool)
     dtmp = tempfile.mkdtemp(prefix='runtest_')
     Logs.info("destination of output files: %s" % dtmp)
-    versdir = osp.join(self.env['PREFIX'], 'share', 'aster')
+    versdir = osp.join(self.options.destdir, self.options.prefix.lstrip('/'), 'share', 'aster')
     status = 0
     if not opts.testname:
         raise Errors.WafError('no testcase name provided, use the -n option')
     for test in opts.testname:
         cmd = ['as_run', '--vers=%s' % versdir, '--test', test]
-        if self.variant == 'debug':
-            cmd.extend(['-g', '--nodebug_stderr'])
         cmd.extend(toolargs)
-        Logs.info("running %s in '%s'" % (test, self.variant))
+        Logs.info("running %s (%s)" % (test, ' '.join(cmd)))
         fname = osp.join(dtmp, osp.basename(test) + '.output')
         fobj = open(fname, 'wb')
         Logs.info("`- output in %s" % fname)
