Show More
@@ -776,6 +776,7 b' def tsttest(test, wd, options, replaceme' | |||
|
776 | 776 | |
|
777 | 777 | # Merge the script output back into a unified test |
|
778 | 778 | |
|
779 | warnonly = True | |
|
779 | 780 | pos = -1 |
|
780 | 781 | postout = [] |
|
781 | 782 | for l in output: |
@@ -796,7 +797,7 b' def tsttest(test, wd, options, replaceme' | |||
|
796 | 797 | if isinstance(r, str): |
|
797 | 798 | if r == '+glob': |
|
798 | 799 | lout = el[:-1] + ' (glob)\n' |
|
799 |
r = |
|
|
800 | r = 0 # warn only | |
|
800 | 801 | elif r == '-glob': |
|
801 | 802 | log('\ninfo, unnecessary glob in %s (after line %d):' |
|
802 | 803 | ' %s (glob)\n' % (test, pos, el[:-1])) |
@@ -810,6 +811,8 b' def tsttest(test, wd, options, replaceme' | |||
|
810 | 811 | if needescape(lout): |
|
811 | 812 | lout = stringescape(lout.rstrip('\n')) + " (esc)\n" |
|
812 | 813 | postout.append(" " + lout) # let diff deal with it |
|
814 | if r != 0: # != warn only | |
|
815 | warnonly = False | |
|
813 | 816 | |
|
814 | 817 | if lcmd: |
|
815 | 818 | # add on last return code |
@@ -824,6 +827,8 b' def tsttest(test, wd, options, replaceme' | |||
|
824 | 827 | if pos in after: |
|
825 | 828 | postout += after.pop(pos) |
|
826 | 829 | |
|
830 | if warnonly and exitcode == 0: | |
|
831 | exitcode = False | |
|
827 | 832 | return exitcode, postout |
|
828 | 833 | |
|
829 | 834 | wifexited = getattr(os, "WIFEXITED", lambda x: False) |
General Comments 0
You need to be logged in to leave comments.
Login now