summaryrefslogtreecommitdiffstats
path: root/llvm/utils/lit/tests/Inputs
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2013-08-14 22:21:01 +0000
committerDaniel Dunbar <daniel@zuster.org>2013-08-14 22:21:01 +0000
commit54d613b97fe84969f9540db61d90031c841d4e3a (patch)
treede9a45ad29305700b274973079e9e33531585f24 /llvm/utils/lit/tests/Inputs
parenta2626555f1e81410a83fc64ea915eae655c62efd (diff)
downloadbcm5719-llvm-54d613b97fe84969f9540db61d90031c841d4e3a.tar.gz
bcm5719-llvm-54d613b97fe84969f9540db61d90031c841d4e3a.zip
[lit] Ensure test output is converted to strings where possible.
- This cleans up the text output of failing tests when run under PY3. llvm-svn: 188416
Diffstat (limited to 'llvm/utils/lit/tests/Inputs')
-rw-r--r--llvm/utils/lit/tests/Inputs/shtest-format/external_shell/fail.txt2
-rw-r--r--llvm/utils/lit/tests/Inputs/shtest-format/external_shell/fail_with_bad_encoding.txt5
-rwxr-xr-xllvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.sh3
-rw-r--r--llvm/utils/lit/tests/Inputs/shtest-format/fail.txt1
4 files changed, 11 insertions, 0 deletions
diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/fail.txt b/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/fail.txt
index 1e74be5dbd4..069e37619e7 100644
--- a/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/fail.txt
+++ b/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/fail.txt
@@ -1,3 +1,5 @@
# Run a command that fails with error on stdout.
#
+# RUN: echo "line 1: failed test output on stdout"
+# RUN: echo "line 2: failed test output on stdout"
# RUN: cat "does-not-exist"
diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/fail_with_bad_encoding.txt b/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/fail_with_bad_encoding.txt
new file mode 100644
index 00000000000..f6157e66c97
--- /dev/null
+++ b/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/fail_with_bad_encoding.txt
@@ -0,0 +1,5 @@
+# Run a command that fails with error on stdout.
+#
+# RUN: %S/write-bad-encoding.sh
+# RUN: false
+
diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.sh b/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.sh
new file mode 100755
index 00000000000..6b622cb232e
--- /dev/null
+++ b/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "a line with bad encoding: Â."
diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/fail.txt b/llvm/utils/lit/tests/Inputs/shtest-format/fail.txt
index 49932c3006e..8c305eb416b 100644
--- a/llvm/utils/lit/tests/Inputs/shtest-format/fail.txt
+++ b/llvm/utils/lit/tests/Inputs/shtest-format/fail.txt
@@ -1 +1,2 @@
+# RUN: printf "line 1: failed test output on stdout\nline 2: failed test output on stdout"
# RUN: false
OpenPOWER on IntegriCloud