diff options
| author | Joel E. Denny <jdenny.ornl@gmail.com> | 2019-10-10 19:25:24 +0000 |
|---|---|---|
| committer | Joel E. Denny <jdenny.ornl@gmail.com> | 2019-10-10 19:25:24 +0000 |
| commit | 3e0b23d1542325b06bfaa906d0179c13f704aa66 (patch) | |
| tree | a3ed70926ea320b59195bfb5ae167c090c5fe9c1 /llvm/utils/lit/tests/shtest-shell.py | |
| parent | bdbeccb387e0dbc941a251bdf655cbe99e0d585e (diff) | |
| download | bcm5719-llvm-3e0b23d1542325b06bfaa906d0179c13f704aa66.tar.gz bcm5719-llvm-3e0b23d1542325b06bfaa906d0179c13f704aa66.zip | |
Revert r374389: "[lit] Clean up internal diff's encoding handling"
This breaks a Windows bot.
llvm-svn: 374427
Diffstat (limited to 'llvm/utils/lit/tests/shtest-shell.py')
| -rw-r--r-- | llvm/utils/lit/tests/shtest-shell.py | 54 |
1 files changed, 1 insertions, 53 deletions
diff --git a/llvm/utils/lit/tests/shtest-shell.py b/llvm/utils/lit/tests/shtest-shell.py index 6d9b1aa459c..3978e4470a9 100644 --- a/llvm/utils/lit/tests/shtest-shell.py +++ b/llvm/utils/lit/tests/shtest-shell.py @@ -34,58 +34,6 @@ # CHECK: error: command failed with exit status: 127 # CHECK: *** - -# CHECK: FAIL: shtest-shell :: diff-encodings.txt -# CHECK: *** TEST 'shtest-shell :: diff-encodings.txt' FAILED *** - -# CHECK: $ "diff" "-u" "diff-in.bin" "diff-in.bin" -# CHECK-NOT: error - -# CHECK: $ "diff" "-u" "diff-in.utf16" "diff-in.bin" -# CHECK: # command output: -# CHECK-NEXT: --- -# CHECK-NEXT: +++ -# CHECK-NEXT: @@ -# CHECK-NEXT: {{^ .f.o.o.$}} -# CHECK-NEXT: {{^-.b.a.r.$}} -# CHECK-NEXT: {{^\+.b.a.r..}} -# CHECK-NEXT: {{^ .b.a.z.$}} -# CHECK: error: command failed with exit status: 1 -# CHECK: $ "true" - -# CHECK: $ "diff" "-u" "diff-in.utf8" "diff-in.bin" -# CHECK: # command output: -# CHECK-NEXT: --- -# CHECK-NEXT: +++ -# CHECK-NEXT: @@ -# CHECK-NEXT: -foo -# CHECK-NEXT: -bar -# CHECK-NEXT: -baz -# CHECK-NEXT: {{^\+.f.o.o.$}} -# CHECK-NEXT: {{^\+.b.a.r..}} -# CHECK-NEXT: {{^\+.b.a.z.$}} -# CHECK: error: command failed with exit status: 1 -# CHECK: $ "true" - -# CHECK: $ "diff" "-u" "diff-in.bin" "diff-in.utf8" -# CHECK: # command output: -# CHECK-NEXT: --- -# CHECK-NEXT: +++ -# CHECK-NEXT: @@ -# CHECK-NEXT: {{^\-.f.o.o.$}} -# CHECK-NEXT: {{^\-.b.a.r..}} -# CHECK-NEXT: {{^\-.b.a.z.$}} -# CHECK-NEXT: +foo -# CHECK-NEXT: +bar -# CHECK-NEXT: +baz -# CHECK: error: command failed with exit status: 1 -# CHECK: $ "true" - -# CHECK: $ "false" - -# CHECK: *** - - # CHECK: FAIL: shtest-shell :: diff-error-1.txt # CHECK: *** TEST 'shtest-shell :: diff-error-1.txt' FAILED *** # CHECK: $ "diff" "-B" "temp1.txt" "temp2.txt" @@ -297,4 +245,4 @@ # CHECK: PASS: shtest-shell :: sequencing-0.txt # CHECK: XFAIL: shtest-shell :: sequencing-1.txt # CHECK: PASS: shtest-shell :: valid-shell.txt -# CHECK: Failing Tests (28) +# CHECK: Failing Tests (27) |
