Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 13 Sep 2012 23:02:29 +0100
changeset 1132 13a3f6161af8
parent 1130 193e68a0c8d2 (current diff)
parent 1131 1938c2ebf517 (diff)
child 1134 183d7e3d7ce8
Merge with stable
--- a/tests/run-tests.py	Wed Sep 12 18:44:43 2012 +0100
+++ b/tests/run-tests.py	Thu Sep 13 23:02:29 2012 +0100
@@ -1211,6 +1211,10 @@
             # can't remove on solaris
             os.environ[k] = ''
             del os.environ[k]
+    if 'HG' in os.environ:
+        # can't remove on solaris
+        os.environ['HG'] = ''
+        del os.environ['HG']
 
     global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE
     TESTDIR = os.environ["TESTDIR"] = os.getcwd()