# HG changeset patch # User Matt Harbison # Date 1512951708 18000 # Node ID 0432e54f4dbe2590a7d6d81ae69f349490fb6fa8 # Parent b963750b125f6e342a0e2148535b7c7d0bc50e3b run-tests: stop automatically adding a (glob) for bundle backup lines This is the first step to dropping the existing globs for '\' matches, now that it is handled automatically. Instead of just dropping it, this pattern is now used to convert to '/' paths, to reduce the amount of manual cleanup required when creating tests on Windows. diff -r b963750b125f -r 0432e54f4dbe tests/run-tests.py --- a/tests/run-tests.py Thu Dec 07 17:18:29 2017 +0800 +++ b/tests/run-tests.py Sun Dec 10 19:21:48 2017 -0500 @@ -973,7 +973,7 @@ self._portmap(1), self._portmap(2), (br'(?m)^(saved backup bundle to .*\.hg)( \(glob\))?$', - br'\1 (glob)'), + br'\1'.replace(br'\\', br'/')), (br'([^0-9])%s' % re.escape(self._localip()), br'\1$LOCALIP'), (br'\bHG_TXNID=TXN:[a-f0-9]{40}\b', br'HG_TXNID=TXN:$ID$'), ] diff -r b963750b125f -r 0432e54f4dbe tests/test-run-tests.t --- a/tests/test-run-tests.t Thu Dec 07 17:18:29 2017 +0800 +++ b/tests/test-run-tests.t Sun Dec 10 19:21:48 2017 -0500 @@ -706,7 +706,7 @@ $ echo " $ echo 'saved backup bundle to \$TESTTMP/foo.hg'" >> test-failure.t $ echo " saved backup bundle to \$TESTTMP/foo.hg" >> test-failure.t $ echo " $ echo 'saved backup bundle to \$TESTTMP/foo.hg'" >> test-failure.t - $ echo " saved backup bundle to \$TESTTMP/foo.hg (glob)" >> test-failure.t + $ echo " saved backup bundle to \$TESTTMP\\foo.hg" >> test-failure.t $ echo " $ echo 'saved backup bundle to \$TESTTMP/foo.hg'" >> test-failure.t $ echo " saved backup bundle to \$TESTTMP/*.hg (glob)" >> test-failure.t $ echo 'y' | rt -i 2>&1 @@ -720,15 +720,14 @@ This is a noop statement so that this test is still more bytes than success. pad pad pad pad............................................................ - @@ -9,7 +9,7 @@ - pad pad pad pad............................................................ - pad pad pad pad............................................................ + @@ -11,6 +11,6 @@ + $ echo 'saved backup bundle to $TESTTMP/foo.hg' + saved backup bundle to $TESTTMP/foo.hg $ echo 'saved backup bundle to $TESTTMP/foo.hg' - - saved backup bundle to $TESTTMP/foo.hg - + saved backup bundle to $TESTTMP/foo.hg* (glob) + - saved backup bundle to $TESTTMP\foo.hg + + saved backup bundle to $TESTTMP/foo.hg $ echo 'saved backup bundle to $TESTTMP/foo.hg' - saved backup bundle to $TESTTMP/foo.hg* (glob) - $ echo 'saved backup bundle to $TESTTMP/foo.hg' + saved backup bundle to $TESTTMP/*.hg (glob) Accept this change? [n] .. # Ran 2 tests, 0 skipped, 0 failed. @@ -744,9 +743,9 @@ pad pad pad pad............................................................ pad pad pad pad............................................................ $ echo 'saved backup bundle to $TESTTMP/foo.hg' - saved backup bundle to $TESTTMP/foo.hg (glob)< + saved backup bundle to $TESTTMP/foo.hg $ echo 'saved backup bundle to $TESTTMP/foo.hg' - saved backup bundle to $TESTTMP/foo.hg (glob)< + saved backup bundle to $TESTTMP/foo.hg $ echo 'saved backup bundle to $TESTTMP/foo.hg' saved backup bundle to $TESTTMP/*.hg (glob)<