# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1350232242 -7200
# Node ID feb29f7d0066d26a45db802835c057c8b46feacb
# Parent  a3d0e19724c39ab09477df60ff9d05351a25ec99
run-tests: make it possible to combine (esc) with (glob) and (re)

This makes it possible to combine the annotations ... if done in the right
order.

[ original upstream message ]

diff -r a3d0e19724c3 -r feb29f7d0066 tests/run-tests.py
--- a/tests/run-tests.py	Mon Oct 15 02:33:12 2012 +0200
+++ b/tests/run-tests.py	Sun Oct 14 18:30:42 2012 +0200
@@ -526,14 +526,14 @@
 def linematch(el, l):
     if el == l: # perfect match (fast)
         return True
-    if (el and
-        (el.endswith(" (re)\n") and rematch(el[:-6], l) or
-         el.endswith(" (glob)\n") and globmatch(el[:-8], l) or
-         el.endswith(" (esc)\n") and
-             (el[:-7].decode('string-escape') + '\n' == l or
-              os.name == 'nt' and
-              el[:-7].decode('string-escape') + '\n' == l))):
-        return True
+    if el:
+        if el.endswith(" (esc)\n"):
+            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
     return False
 
 def tsttest(test, wd, options, replacements):