diff options
| author | Joel E. Denny <jdenny.ornl@gmail.com> | 2019-10-12 11:57:20 +0000 |
|---|---|---|
| committer | Joel E. Denny <jdenny.ornl@gmail.com> | 2019-10-12 11:57:20 +0000 |
| commit | e4f11a31927e7ca67ff54897de37ef75e31e05ff (patch) | |
| tree | 1644b79a420a36d2729c671bf2d2a12b393b209e /llvm/utils/lit/tests/Inputs | |
| parent | daf42dc36dc2e1092dc6a14a4bb0bce307de58ba (diff) | |
| download | bcm5719-llvm-e4f11a31927e7ca67ff54897de37ef75e31e05ff.tar.gz bcm5719-llvm-e4f11a31927e7ca67ff54897de37ef75e31e05ff.zip | |
Reland r374389: [lit] Clean up internal diff's encoding handling
To avoid breaking some tests, D66574, D68664, D67643, and D68668
landed together. However, D68664 introduced an issue now addressed by
D68839, with which these are now all relanding.
Differential Revision: https://reviews.llvm.org/D68664
llvm-svn: 374649
Diffstat (limited to 'llvm/utils/lit/tests/Inputs')
| -rw-r--r-- | llvm/utils/lit/tests/Inputs/shtest-shell/diff-encodings.txt | 9 | ||||
| -rw-r--r-- | llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.bin | bin | 0 -> 26 bytes | |||
| -rw-r--r-- | llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.utf16 | bin | 0 -> 24 bytes | |||
| -rw-r--r-- | llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.utf8 | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/llvm/utils/lit/tests/Inputs/shtest-shell/diff-encodings.txt b/llvm/utils/lit/tests/Inputs/shtest-shell/diff-encodings.txt new file mode 100644 index 00000000000..d8b9718a099 --- /dev/null +++ b/llvm/utils/lit/tests/Inputs/shtest-shell/diff-encodings.txt @@ -0,0 +1,9 @@ +# Check that diff falls back to binary mode if it cannot decode a file. + +# RUN: diff -u diff-in.bin diff-in.bin +# RUN: diff -u diff-in.utf16 diff-in.bin && false || true +# RUN: diff -u diff-in.utf8 diff-in.bin && false || true +# RUN: diff -u diff-in.bin diff-in.utf8 && false || true + +# Fail so lit will print output. +# RUN: false diff --git a/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.bin b/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.bin Binary files differnew file mode 100644 index 00000000000..06b800b707c --- /dev/null +++ b/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.bin diff --git a/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.utf16 b/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.utf16 Binary files differnew file mode 100644 index 00000000000..d7d9feefa7d --- /dev/null +++ b/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.utf16 diff --git a/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.utf8 b/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.utf8 new file mode 100644 index 00000000000..86e041dad66 --- /dev/null +++ b/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.utf8 @@ -0,0 +1,3 @@ +foo +bar +baz |
