##// END OF EJS Templates
run-tests: teach _processoutput to handle multiple lines of churn...
timeless -
r28569:1ad0ddf8 default
parent child Browse files
Show More
@@ -1108,10 +1108,14 b' class TTest(Test):'
1108 lout += b' (no-eol)\n'
1108 lout += b' (no-eol)\n'
1109
1109
1110 # Find the expected output at the current position.
1110 # Find the expected output at the current position.
1111 el = None
1111 els = [None]
1112 if expected.get(pos, None):
1112 if expected.get(pos, None):
1113 el = expected[pos].pop(0)
1113 els = expected[pos]
1114 if True:
1114
1115 i = 0
1116 while i < len(els):
1117 el = els[i]
1118
1115 r = TTest.linematch(el, lout)
1119 r = TTest.linematch(el, lout)
1116 if isinstance(r, str):
1120 if isinstance(r, str):
1117 if r == '+glob':
1121 if r == '+glob':
@@ -1122,11 +1126,19 b' class TTest(Test):'
1122 r = '' # Warn only this line.
1126 r = '' # Warn only this line.
1123 elif r == "retry":
1127 elif r == "retry":
1124 postout.append(b' ' + el)
1128 postout.append(b' ' + el)
1125 continue
1129 els.pop(i)
1130 break
1126 else:
1131 else:
1127 log('\ninfo, unknown linematch result: %r\n' % r)
1132 log('\ninfo, unknown linematch result: %r\n' % r)
1128 r = False
1133 r = False
1134 if r:
1135 els.pop(i)
1136 break
1137 i += 1
1138
1129 if r:
1139 if r:
1140 if r == "retry":
1141 continue
1130 postout.append(b' ' + el)
1142 postout.append(b' ' + el)
1131 else:
1143 else:
1132 if self.NEEDESCAPE(lout):
1144 if self.NEEDESCAPE(lout):
General Comments 0
You need to be logged in to leave comments. Login now