##// END OF EJS Templates
run-tests: don't drop optional lines after a missing unconditional line...
Matt Harbison -
r33659:1fa60232 default
parent child Browse files
Show More
@@ -1423,7 +1423,7 b' class TTest(Test):'
1423 # Don't append as optional line
1423 # Don't append as optional line
1424 continue
1424 continue
1425 else:
1425 else:
1426 break
1426 continue
1427 postout.append(b' ' + el)
1427 postout.append(b' ' + el)
1428
1428
1429 if lcmd:
1429 if lcmd:
@@ -177,6 +177,13 b' test diff colorisation'
177 > b.r (re) (true !)
177 > b.r (re) (true !)
178 > missing (?)
178 > missing (?)
179 > awol (true !)
179 > awol (true !)
180 >
181 > The "missing" line should stay, even though awol is dropped
182 > $ echo 'testing'
183 > test.ng (re) (true !)
184 > foo.ar (?)
185 > awol
186 > missing (?)
180 > EOF
187 > EOF
181 $ rt test-failure.t
188 $ rt test-failure.t
182
189
@@ -194,7 +201,9 b' test diff colorisation'
194 foobar*foo (glob) (false !)
201 foobar*foo (glob) (false !)
195 te*ting (glob) (true !)
202 te*ting (glob) (true !)
196
203
197 @@ -13,6 +11,4 @@
204 foo.ar (re) (false !)
205 missing (?)
206 @@ -13,13 +11,10 @@
198 $ echo 'testing'
207 $ echo 'testing'
199 test.ng (re) (true !)
208 test.ng (re) (true !)
200 foo.ar (re) (false !)
209 foo.ar (re) (false !)
@@ -202,6 +211,13 b' test diff colorisation'
202 missing (?)
211 missing (?)
203 - awol (true !)
212 - awol (true !)
204
213
214 The "missing" line should stay, even though awol is dropped
215 $ echo 'testing'
216 test.ng (re) (true !)
217 foo.ar (?)
218 - awol
219 missing (?)
220
205 ERROR: test-failure.t output changed
221 ERROR: test-failure.t output changed
206 !
222 !
207 Failed test-failure.t: output changed
223 Failed test-failure.t: output changed
General Comments 0
You need to be logged in to leave comments. Login now