Submitter | Simon Heimberg |
---|---|
Date | Jan. 16, 2014, 6:22 p.m. |
Message ID | <225b595f165732dd5c55.1389896522@lapsi.heimberg.home> |
Download | mbox | patch |
Permalink | /patch/3354/ |
State | Accepted |
Commit | 9e3eb009a4044fa1235a63031dbb084a1e81a7c1 |
Headers | show |
Comments
Patch
diff -r 9135400b83c5 -r 225b595f1657 tests/run-tests.py --- a/tests/run-tests.py Thu Jan 16 19:07:18 2014 +0100 +++ b/tests/run-tests.py Thu Jan 16 12:06:49 2014 +0100 @@ -634,9 +634,10 @@ el = el[:-7].decode('string-escape') + '\n' if el == l or os.name == 'nt' and el[:-1] + '\r\n' == l: return True - if (el.endswith(" (re)\n") and rematch(el[:-6], l) or - el.endswith(" (glob)\n") and globmatch(el[:-8], l)): - return True + if el.endswith(" (re)\n"): + return rematch(el[:-6], l) + if el.endswith(" (glob)\n"): + return globmatch(el[:-8], l) return False def tsttest(test, wd, options, replacements, env):