Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sat, 23 Mar 2013 14:43:30 +0000
changeset 1220 757cf8d4724b
parent 1217 09f857c44abe (current diff)
parent 1219 cefcbbc5502c (diff)
child 1223 45a6eace22bf
Merge with stable
--- a/tests/run-tests.py	Thu Feb 14 11:33:19 2013 +0000
+++ b/tests/run-tests.py	Sat Mar 23 14:43:30 2013 +0000
@@ -1244,8 +1244,7 @@
         checktools()
 
         if len(args) == 0:
-            args = os.listdir(".")
-        args.sort()
+            args = sorted(os.listdir("."))
 
     tests = args
 
@@ -1277,6 +1276,9 @@
         # can't remove on solaris
         os.environ['HG'] = ''
         del os.environ['HG']
+    if 'HGPROF' in os.environ:
+        os.environ['HGPROF'] = ''
+        del os.environ['HGPROF']
 
     global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE
     TESTDIR = os.environ["TESTDIR"] = os.getcwd()