diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -1385,7 +1385,7 @@ class TTest(Test): # ignore '(glob)' added to l by 'replacements' if l.endswith(b" (glob)\n"): l = l[:-8] + b"\n" - return TTest.globmatch(el[:-8], l) + return TTest.globmatch(el[:-8], l) or retry if os.altsep and l.replace(b'\\', b'/') == el: return b'+glob' return retry diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t --- a/tests/test-run-tests.t +++ b/tests/test-run-tests.t @@ -55,7 +55,10 @@ a succesful test > $ echo babar > babar > $ echo xyzzy + > dont_print (?) + > nothing[42]line (re) (?) > never*happens (glob) (?) + > more_nothing (?) > xyzzy > nor this (?) > $ printf 'abc\ndef\nxyz\n' @@ -326,14 +329,14 @@ Running In Debug Mode *SALT* 2 0 (glob) + echo xyzzy xyzzy - + echo *SALT* 6 0 (glob) - *SALT* 6 0 (glob) + + echo *SALT* 9 0 (glob) + *SALT* 9 0 (glob) + printf *abc\ndef\nxyz\n* (glob) abc def xyz - + echo *SALT* 12 0 (glob) - *SALT* 12 0 (glob) + + echo *SALT* 15 0 (glob) + *SALT* 15 0 (glob) . # Ran 2 tests, 0 skipped, 0 warned, 0 failed.