1 files changed, 6 insertions, 4 deletions
diff --git a/cscript b/cscript
index 519e0d806..28be96c75 100644
--- a/cscript
+++ b/cscript
@@ -452,9 +452,11 @@ def make_manual(target):
 def test(target, test):
     if target.platform != 'windows':
         target.set('LC_ALL', 'C')
-        cmd = 'run/tests '
-        if target.debug:
-            cmd += '--backtrace '
+        base = 'run/tests '
         if test is not None:
-            cmd += '--run_test=%s' % test
+            base += '--run_test=%s' % test
+        if target.debug:
+            cmd = 'gdb -batch -ex "run" -ex "bt" "%s" 2>&1 | grep -v ^"No stack."' % base
+        else:
+            cmd = base
         target.command(cmd)