# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1271362574 -7200
# Node ID e61c92cf8a085bda53e50c7d396ea597f308c77e
# Parent  1b9ed0c8a189e44e98762297b3b018c62f2d7877# Parent  5df6643c39e9e9327f05eec9a9a2678315d95139
Merge with stable

diff -r 1b9ed0c8a189 -r e61c92cf8a08 tests/run-tests.py
--- a/tests/run-tests.py	Wed Apr 14 15:23:22 2010 +0200
+++ b/tests/run-tests.py	Thu Apr 15 22:16:14 2010 +0200
@@ -855,6 +855,8 @@
     # unset env related to hooks
     for k in os.environ.keys():
         if k.startswith('HG_'):
+            # can't remove on solaris
+            os.environ[k] = ''
             del os.environ[k]
 
     global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE