comparison tests/run-tests.py @ 25059:0e0f1068b878

run-tests: fix checking a line to see if it needs globbing
author Augie Fackler <augie@google.com>
date Tue, 14 Apr 2015 10:56:58 -0400
parents caa2043cc322
children 29e54fe22a3f
comparison
equal deleted inserted replaced
25058:caa2043cc322 25059:0e0f1068b878
825 825
826 # This script may want to drop globs from lines matching these patterns on 826 # This script may want to drop globs from lines matching these patterns on
827 # Windows, but check-code.py wants a glob on these lines unconditionally. Don't 827 # Windows, but check-code.py wants a glob on these lines unconditionally. Don't
828 # warn if that is the case for anything matching these lines. 828 # warn if that is the case for anything matching these lines.
829 checkcodeglobpats = [ 829 checkcodeglobpats = [
830 re.compile(r'^pushing to \$TESTTMP/.*[^)]$'), 830 re.compile(br'^pushing to \$TESTTMP/.*[^)]$'),
831 re.compile(r'^moving \S+/.*[^)]$'), 831 re.compile(br'^moving \S+/.*[^)]$'),
832 re.compile(r'^pulling from \$TESTTMP/.*[^)]$') 832 re.compile(br'^pulling from \$TESTTMP/.*[^)]$')
833 ] 833 ]
834 834
835 bchr = chr 835 bchr = chr
836 if sys.version_info[0] == 3: 836 if sys.version_info[0] == 3:
837 bchr = lambda x: bytes([x]) 837 bchr = lambda x: bytes([x])