tests/run-tests.py
changeset 23728 31d3f973d079
parent 23388 42ed0780ec4b
child 23859 661b246bf1c4
--- a/tests/run-tests.py	Mon Jan 05 15:00:02 2015 -0800
+++ b/tests/run-tests.py	Thu Nov 27 02:04:30 2014 +0100
@@ -627,6 +627,8 @@
             (r':%s\b' % self._startport, ':$HGPORT'),
             (r':%s\b' % (self._startport + 1), ':$HGPORT1'),
             (r':%s\b' % (self._startport + 2), ':$HGPORT2'),
+            (r'(?m)^(saved backup bundle to .*\.hg)( \(glob\))?$',
+             r'\1 (glob)'),
             ]
 
         if os.name == 'nt':
@@ -1025,6 +1027,9 @@
             if el.endswith(" (re)\n"):
                 return TTest.rematch(el[:-6], l)
             if el.endswith(" (glob)\n"):
+                # ignore '(glob)' added to l by 'replacements'
+                if l.endswith(" (glob)\n"):
+                    l = l[:-8] + "\n"
                 return TTest.globmatch(el[:-8], l)
             if os.altsep and l.replace('\\', '/') == el:
                 return '+glob'