# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1288703061 -3600
# Node ID 65ec857290ab3c8ef221751d846b5ea5fa9b83af
# Parent  211c681fd63453fbc8c947761a8cd5e6ac39d4cc# Parent  fb1e8925292de52fee34af5cd89e1c82cad711d1
Merge with stable

diff -r 211c681fd634 -r 65ec857290ab tests/run-tests.py
--- a/tests/run-tests.py	Wed Oct 27 11:15:31 2010 +0100
+++ b/tests/run-tests.py	Tue Nov 02 14:04:21 2010 +0100
@@ -604,7 +604,7 @@
             raise
 
     for s, r in replacements:
-        output = output.replace(s, r)
+        output = re.sub(s, r, output)
     return ret, splitnewlines(output)
 
 def runone(options, test, skips, fails):
@@ -677,10 +677,10 @@
         signal.alarm(options.timeout)
 
     ret, out = runner(testpath, options, [
-        (testtmp, '$TESTTMP'),
-        (':%s' % options.port, ':$HGPORT'),
-        (':%s' % (options.port + 1), ':$HGPORT1'),
-        (':%s' % (options.port + 2), ':$HGPORT2'),
+        (re.escape(testtmp), '$TESTTMP'),
+        (r':%s\b' % options.port, ':$HGPORT'),
+        (r':%s\b' % (options.port + 1), ':$HGPORT1'),
+        (r':%s\b' % (options.port + 2), ':$HGPORT2'),
         ])
     vlog("# Ret was:", ret)