Mercurial > hg
changeset 12956:0406682c6905
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Nov 2010 17:29:23 -0600 |
parents | 85777aab7e08 (current diff) 158ca54a79cc (diff) |
children | 9f2ac318b92e |
files | |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/run-tests.py Mon Nov 08 17:16:29 2010 -0600 +++ b/tests/run-tests.py Mon Nov 08 17:29:23 2010 -0600 @@ -556,8 +556,9 @@ postout.append(" " + lout) elif (el and (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', lout) or - el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', lout)) or - el.endswith(" (esc)\n") and el.decode('string-escape') == l): + el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', lout) + or el.endswith(" (esc)\n") and + el.decode('string-escape') == l)): postout.append(" " + el) # fallback regex/glob/esc match else: if needescape(lout):