equal
deleted
inserted
replaced
632 if el: |
632 if el: |
633 if el.endswith(" (esc)\n"): |
633 if el.endswith(" (esc)\n"): |
634 el = el[:-7].decode('string-escape') + '\n' |
634 el = el[:-7].decode('string-escape') + '\n' |
635 if el == l or os.name == 'nt' and el[:-1] + '\r\n' == l: |
635 if el == l or os.name == 'nt' and el[:-1] + '\r\n' == l: |
636 return True |
636 return True |
637 if (el.endswith(" (re)\n") and rematch(el[:-6], l) or |
637 if el.endswith(" (re)\n"): |
638 el.endswith(" (glob)\n") and globmatch(el[:-8], l)): |
638 return rematch(el[:-6], l) |
639 return True |
639 if el.endswith(" (glob)\n"): |
|
640 return globmatch(el[:-8], l) |
640 return False |
641 return False |
641 |
642 |
642 def tsttest(test, wd, options, replacements, env): |
643 def tsttest(test, wd, options, replacements, env): |
643 # We generate a shell script which outputs unique markers to line |
644 # We generate a shell script which outputs unique markers to line |
644 # up script results with our source. These markers include input |
645 # up script results with our source. These markers include input |