diff options
| author | Hubert Tong <hubert.reinterpretcast@gmail.com> | 2019-05-01 15:47:16 +0000 |
|---|---|---|
| committer | Hubert Tong <hubert.reinterpretcast@gmail.com> | 2019-05-01 15:47:16 +0000 |
| commit | 66a9642f5672ed2e22efd722f662def6169f2b11 (patch) | |
| tree | b574b394917ceed3ed4adbc9cfd7583eb34d8396 | |
| parent | 02d055a269823ebb4b00119db0c4d656cc3f8894 (diff) | |
| download | bcm5719-llvm-66a9642f5672ed2e22efd722f662def6169f2b11.tar.gz bcm5719-llvm-66a9642f5672ed2e22efd722f662def6169f2b11.zip | |
[lit][tests][AIX] Update expected form of diagnostic messages; use `not` to normalize non-zero exit values
Summary:
Various tests in the `lit` testing suite expect specific return codes
and forms of diagnostic message from utility programs. As per
POSIX.1-2017 XCU Section 1.4, Utility Description Defaults, "[the]
format of diagnostic messages for most utilities is unspecified".
The STDERR subsections of the `cat` and `wc` utilities merely indicate
that "[the] standard error shall be used only for diagnostic messages".
The corresponding EXIT STATUS subsections merely indicate, with regard
to errors, an exit value of >0.
The affected tests are updated to accept the applicable diagnostic
message as produced by the utilities on AIX. The exit value is
normalized using `not` as necessary.
Reviewers: xingxue, sfertile, jasonliu
Reviewed By: xingxue
Subscribers: delcypher, jsji, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D60553
llvm-svn: 359690
| -rw-r--r-- | llvm/utils/lit/tests/Inputs/shtest-output-printing/basic.txt | 2 | ||||
| -rw-r--r-- | llvm/utils/lit/tests/shtest-format.py | 2 | ||||
| -rw-r--r-- | llvm/utils/lit/tests/shtest-output-printing.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/llvm/utils/lit/tests/Inputs/shtest-output-printing/basic.txt b/llvm/utils/lit/tests/Inputs/shtest-output-printing/basic.txt index 4899c7e63db..fb3a3e00078 100644 --- a/llvm/utils/lit/tests/Inputs/shtest-output-printing/basic.txt +++ b/llvm/utils/lit/tests/Inputs/shtest-output-printing/basic.txt @@ -1,3 +1,3 @@ # RUN: true # RUN: echo hi -# RUN: wc missing-file &> %t.out +# RUN: not not wc missing-file &> %t.out diff --git a/llvm/utils/lit/tests/shtest-format.py b/llvm/utils/lit/tests/shtest-format.py index 8c318697195..0031ccf711b 100644 --- a/llvm/utils/lit/tests/shtest-format.py +++ b/llvm/utils/lit/tests/shtest-format.py @@ -18,7 +18,7 @@ # CHECK-NEXT: line 2: failed test output on stdout # CHECK: Command Output (stderr): # CHECK-NEXT: -- -# CHECK-NEXT: cat{{(\.exe)?}}: does-not-exist: No such file or directory +# CHECK-NEXT: cat{{(\.exe)?}}: {{cannot open does-not-exist|does-not-exist: No such file or directory}} # CHECK: -- # CHECK: FAIL: shtest-format :: external_shell/fail_with_bad_encoding.txt diff --git a/llvm/utils/lit/tests/shtest-output-printing.py b/llvm/utils/lit/tests/shtest-output-printing.py index 2344ef20036..80304258fd9 100644 --- a/llvm/utils/lit/tests/shtest-output-printing.py +++ b/llvm/utils/lit/tests/shtest-output-printing.py @@ -24,8 +24,8 @@ # CHECK-NEXT: hi # # CHECK: $ ":" "RUN: at line 3" -# CHECK-NEXT: $ "wc" "missing-file" +# CHECK-NEXT: $ "not" "not" "wc" "missing-file" # CHECK-NEXT: # redirected output from '{{.*(/|\\\\)}}basic.txt.tmp.out': -# CHECK-NEXT: missing-file{{.*}} No such file or directory +# CHECK-NEXT: {{cannot open missing-file|missing-file.* No such file or directory}} # CHECK: note: command had no output on stdout or stderr # CHECK-NEXT: error: command failed with exit status: 1 |
