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