--- a/tests/run-tests.py	Sun Jan 15 13:37:33 2012 +0100
+++ b/tests/run-tests.py	Mon Jan 23 16:21:12 2012 +0100
@@ -98,7 +98,7 @@
     'jobs': ('HGTEST_JOBS', 1),
     'timeout': ('HGTEST_TIMEOUT', 180),
     'port': ('HGTEST_PORT', 20059),
-    'shell': ('HGTEST_SHELL', '/bin/sh'),
+    'shell': ('HGTEST_SHELL', 'sh'),
 }
 
 def parselistfiles(files, listtype, warn=True):
@@ -200,6 +200,7 @@
         options.pure = True
 
     if options.with_hg:
+        options.with_hg = os.path.expanduser(options.with_hg)
         if not (os.path.isfile(options.with_hg) and
                 os.access(options.with_hg, os.X_OK)):
             parser.error('--with-hg must specify an executable hg script')
@@ -598,6 +599,8 @@
     f.close()
 
     script = []
+    if options.debug:
+        script.append('set -x\n')
     if os.getenv('MSYSTEM'):
         script.append('alias pwd="pwd -W"\n')
     for n, l in enumerate(t):