##// END OF EJS Templates
run-tests: prevent a (glob) declaration from reordering (?) lines...
Matt Harbison -
r31827:220d4bff default
parent child Browse files
Show More
@@ -1385,7 +1385,7 b' class TTest(Test):'
1385 # ignore '(glob)' added to l by 'replacements'
1385 # ignore '(glob)' added to l by 'replacements'
1386 if l.endswith(b" (glob)\n"):
1386 if l.endswith(b" (glob)\n"):
1387 l = l[:-8] + b"\n"
1387 l = l[:-8] + b"\n"
1388 return TTest.globmatch(el[:-8], l)
1388 return TTest.globmatch(el[:-8], l) or retry
1389 if os.altsep and l.replace(b'\\', b'/') == el:
1389 if os.altsep and l.replace(b'\\', b'/') == el:
1390 return b'+glob'
1390 return b'+glob'
1391 return retry
1391 return retry
@@ -55,7 +55,10 b' a succesful test'
55 > $ echo babar
55 > $ echo babar
56 > babar
56 > babar
57 > $ echo xyzzy
57 > $ echo xyzzy
58 > dont_print (?)
59 > nothing[42]line (re) (?)
58 > never*happens (glob) (?)
60 > never*happens (glob) (?)
61 > more_nothing (?)
59 > xyzzy
62 > xyzzy
60 > nor this (?)
63 > nor this (?)
61 > $ printf 'abc\ndef\nxyz\n'
64 > $ printf 'abc\ndef\nxyz\n'
@@ -326,14 +329,14 b' Running In Debug Mode'
326 *SALT* 2 0 (glob)
329 *SALT* 2 0 (glob)
327 + echo xyzzy
330 + echo xyzzy
328 xyzzy
331 xyzzy
329 + echo *SALT* 6 0 (glob)
332 + echo *SALT* 9 0 (glob)
330 *SALT* 6 0 (glob)
333 *SALT* 9 0 (glob)
331 + printf *abc\ndef\nxyz\n* (glob)
334 + printf *abc\ndef\nxyz\n* (glob)
332 abc
335 abc
333 def
336 def
334 xyz
337 xyz
335 + echo *SALT* 12 0 (glob)
338 + echo *SALT* 15 0 (glob)
336 *SALT* 12 0 (glob)
339 *SALT* 15 0 (glob)
337 .
340 .
338 # Ran 2 tests, 0 skipped, 0 warned, 0 failed.
341 # Ran 2 tests, 0 skipped, 0 warned, 0 failed.
339
342
General Comments 0
You need to be logged in to leave comments. Login now