# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1269252532 -3600
# Node ID 53313405b54d25f0f30ae64f9df3d33a239cb559
# Parent  440786f7f18bfbdc6de5eb313bc71f9426c93011# Parent  92ff2d0b751a2469112d9b572a72e85845f27137
merge with mpm

diff -r 440786f7f18b -r 53313405b54d tests/run-tests.py
--- a/tests/run-tests.py	Mon Mar 22 11:08:42 2010 +0100
+++ b/tests/run-tests.py	Mon Mar 22 11:08:52 2010 +0100
@@ -842,6 +842,7 @@
     os.environ["EMAIL"] = "Foo Bar <foo.bar@example.com>"
     os.environ['CDPATH'] = ''
     os.environ['COLUMNS'] = '80'
+    os.environ['GREP_OPTIONS'] = ''
     os.environ['http_proxy'] = ''
 
     global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE