diff options
| author | Joel E. Denny <jdenny.ornl@gmail.com> | 2019-10-12 18:51:51 +0000 |
|---|---|---|
| committer | Joel E. Denny <jdenny.ornl@gmail.com> | 2019-10-12 18:51:51 +0000 |
| commit | 57046e8fd9b9dd91358b92862d0591c6ac717750 (patch) | |
| tree | ffc376faa32812935b5688927b81b888ec13ce58 /llvm/utils/lit/tests/shtest-shell.py | |
| parent | 9abfa5817116d04439773586b8dcd41a8540baba (diff) | |
| download | bcm5719-llvm-57046e8fd9b9dd91358b92862d0591c6ac717750.tar.gz bcm5719-llvm-57046e8fd9b9dd91358b92862d0591c6ac717750.zip | |
Revert r374652: "[lit] Fix internal diff's --strip-trailing-cr and use it"
This series of patches still breaks a Windows bot.
llvm-svn: 374679
Diffstat (limited to 'llvm/utils/lit/tests/shtest-shell.py')
| -rw-r--r-- | llvm/utils/lit/tests/shtest-shell.py | 57 |
1 files changed, 2 insertions, 55 deletions
diff --git a/llvm/utils/lit/tests/shtest-shell.py b/llvm/utils/lit/tests/shtest-shell.py index adbe4dc56a1..c7e05d6bc42 100644 --- a/llvm/utils/lit/tests/shtest-shell.py +++ b/llvm/utils/lit/tests/shtest-shell.py @@ -4,7 +4,7 @@ # FIXME: Temporarily dump test output so we can debug failing tests on # buildbots. # RUN: cat %t.out -# RUN: FileCheck --dump-input=fail --color -vv --input-file %t.out %s +# RUN: FileCheck --input-file %t.out %s # # END. @@ -332,59 +332,6 @@ # CHECK: PASS: shtest-shell :: diff-r.txt -# CHECK: FAIL: shtest-shell :: diff-strip-trailing-cr.txt - -# CHECK: *** TEST 'shtest-shell :: diff-strip-trailing-cr.txt' FAILED *** - -# CHECK: $ "diff" "-u" "diff-in.dos" "diff-in.unix" -# CHECK: # command output: -# CHECK: @@ -# CHECK-NEXT: -In this file, the -# CHECK-NEXT: -sequence "\r\n" -# CHECK-NEXT: -terminates lines. -# CHECK-NEXT: +In this file, the -# CHECK-NEXT: +sequence "\n" -# CHECK-NEXT: +terminates lines. -# CHECK: error: command failed with exit status: 1 -# CHECK: $ "true" - -# CHECK: $ "diff" "-u" "diff-in.unix" "diff-in.dos" -# CHECK: # command output: -# CHECK: @@ -# CHECK-NEXT: -In this file, the -# CHECK-NEXT: -sequence "\n" -# CHECK-NEXT: -terminates lines. -# CHECK-NEXT: +In this file, the -# CHECK-NEXT: +sequence "\r\n" -# CHECK-NEXT: +terminates lines. -# CHECK: error: command failed with exit status: 1 -# CHECK: $ "true" - -# CHECK: $ "diff" "-u" "--strip-trailing-cr" "diff-in.dos" "diff-in.unix" -# CHECK: # command output: -# CHECK: @@ -# CHECK-NEXT: In this file, the -# CHECK-NEXT: -sequence "\r\n" -# CHECK-NEXT: +sequence "\n" -# CHECK-NEXT: terminates lines. -# CHECK: error: command failed with exit status: 1 -# CHECK: $ "true" - -# CHECK: $ "diff" "-u" "--strip-trailing-cr" "diff-in.unix" "diff-in.dos" -# CHECK: # command output: -# CHECK: @@ -# CHECK-NEXT: In this file, the -# CHECK-NEXT: -sequence "\n" -# CHECK-NEXT: +sequence "\r\n" -# CHECK-NEXT: terminates lines. -# CHECK: error: command failed with exit status: 1 -# CHECK: $ "true" - -# CHECK: $ "false" - -# CHECK: *** - - # CHECK: FAIL: shtest-shell :: diff-unified.txt # CHECK: *** TEST 'shtest-shell :: diff-unified.txt' FAILED *** @@ -539,4 +486,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 (32) +# CHECK: Failing Tests (31) |
