|
238 | 238 | # CHECK-NOT: error |
239 | 239 |
|
240 | 240 | # CHECK: diff -u {{.*}}.foo {{.*}}.bar | FileCheck {{.*}} && false || true |
241 | | -# CHECK-NEXT: # executed command: diff -u {{.*}}.foo {{.*}}.bar |
| 241 | +# CHECK-NEXT: # executed command: diff -u {{.+}}.foo{{.+}} {{.+}}.bar{{.+}} |
242 | 242 | # CHECK-NEXT: # note: command had no output on stdout or stderr |
243 | 243 | # CHECK-NEXT: # error: command failed with exit status: 1 |
244 | 244 | # CHECK-NEXT: # executed command: FileCheck |
|
253 | 253 | # CHECK-NOT: error |
254 | 254 |
|
255 | 255 | # CHECK: cat {{.*}}.bar | diff -u {{.*}}.foo - && false || true |
256 | | -# CHECK-NEXT: # executed command: cat {{.*}}.bar |
257 | | -# CHECK-NEXT: # executed command: diff -u {{.*}}.foo - |
| 256 | +# CHECK-NEXT: # executed command: cat {{.+}}.bar{{.+}} |
| 257 | +# CHECK-NEXT: # executed command: diff -u {{.+}}.foo{{.+}} - |
258 | 258 | # CHECK-NEXT: # .---command stdout{{-*}} |
259 | 259 | # CHECK: # | @@ |
260 | 260 | # CHECK-NEXT: # | -foo |
|
264 | 264 | # CHECK-NEXT: # executed command: true |
265 | 265 |
|
266 | 266 | # CHECK: cat {{.*}}.bar | diff -u - {{.*}}.foo && false || true |
267 | | -# CHECK-NEXT: # executed command: cat {{.*}}.bar |
268 | | -# CHECK-NEXT: # executed command: diff -u - {{.*}}.foo |
| 267 | +# CHECK-NEXT: # executed command: cat {{.+}}.bar{{.+}} |
| 268 | +# CHECK-NEXT: # executed command: diff -u - {{.+}}.foo{{.+}} |
269 | 269 | # CHECK-NEXT: # .---command stdout{{-*}} |
270 | 270 | # CHECK: # | @@ |
271 | 271 | # CHECK-NEXT: # | -bar |
|
279 | 279 | # CHECK-NOT: error |
280 | 280 |
|
281 | 281 | # CHECK: cat {{.*}}.bar | diff -u {{.*}}.foo - | FileCheck {{.*}} |
282 | | -# CHECK-NEXT: # executed command: cat {{.*}}.bar |
283 | | -# CHECK-NEXT: # executed command: diff -u {{.*}}.foo - |
| 282 | +# CHECK-NEXT: # executed command: cat {{.+}}.bar{{.+}} |
| 283 | +# CHECK-NEXT: # executed command: diff -u {{.+}}.foo{{.+}} - |
284 | 284 | # CHECK-NEXT: note: command had no output on stdout or stderr |
285 | 285 | # CHECK-NEXT: error: command failed with exit status: 1 |
286 | 286 | # CHECK-NEXT: # executed command: FileCheck |
|
427 | 427 | # CHECK: *** TEST 'shtest-shell :: diff-unified.txt' FAILED *** |
428 | 428 |
|
429 | 429 | # CHECK: diff -u {{.*}}.foo {{.*}}.bar && false || true |
430 | | -# CHECK-NEXT: # executed command: diff -u {{.*}}.foo {{.*}}.bar |
| 430 | +# CHECK-NEXT: # executed command: diff -u {{.+}}.foo{{.+}} {{.+}}.bar{{.+}} |
431 | 431 | # CHECK-NEXT: # .---command stdout{{-*}} |
432 | 432 | # CHECK: # | @@ {{.*}} @@ |
433 | 433 | # CHECK-NEXT: # | 3 |
|
443 | 443 | # CHECK-NEXT: # executed command: true |
444 | 444 |
|
445 | 445 | # CHECK: diff -U 2 {{.*}}.foo {{.*}}.bar && false || true |
446 | | -# CHECK-NEXT: # executed command: diff -U 2 {{.*}}.foo {{.*}}.bar |
| 446 | +# CHECK-NEXT: # executed command: diff -U 2 {{.+}}.foo{{.+}} {{.+}}.bar{{.+}} |
447 | 447 | # CHECK-NEXT: # .---command stdout{{-*}} |
448 | 448 | # CHECK: # | @@ {{.*}} @@ |
449 | 449 | # CHECK-NEXT: # | 4 |
|
457 | 457 | # CHECK-NEXT: # executed command: true |
458 | 458 |
|
459 | 459 | # CHECK: diff -U4 {{.*}}.foo {{.*}}.bar && false || true |
460 | | -# CHECK-NEXT: # executed command: diff -U4 {{.*}}.foo {{.*}}.bar |
| 460 | +# CHECK-NEXT: # executed command: diff -U4 {{.+}}.foo{{.+}} {{.+}}.bar{{.+}} |
461 | 461 | # CHECK-NEXT: # .---command stdout{{-*}} |
462 | 462 | # CHECK: # | @@ {{.*}} @@ |
463 | 463 | # CHECK-NEXT: # | 2 |
|
0 commit comments