# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1364049810 0
# Node ID 757cf8d4724bdefb796fc6582267c43fc890812d
# Parent  09f857c44abeb8a194d226c66d8d1778919944ce# Parent  cefcbbc5502c4533e2d4efc23a92e6301db09617
Merge with stable

diff -r 09f857c44abe -r 757cf8d4724b tests/run-tests.py
--- 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()