diff options
| author | Joel E. Denny <jdenny.ornl@gmail.com> | 2018-05-31 03:40:37 +0000 |
|---|---|---|
| committer | Joel E. Denny <jdenny.ornl@gmail.com> | 2018-05-31 03:40:37 +0000 |
| commit | fc01dd281df1c2283b0f5aa42a3ffb6efa05bd9a (patch) | |
| tree | 772c5e35cca80433eab77a2174981ea3e5180056 /llvm/utils/lit/tests | |
| parent | 5952576de596a39c7a4110684a2fa74157276585 (diff) | |
| download | bcm5719-llvm-fc01dd281df1c2283b0f5aa42a3ffb6efa05bd9a.tar.gz bcm5719-llvm-fc01dd281df1c2283b0f5aa42a3ffb6efa05bd9a.zip | |
[lit] Terminate ": RUN at line N" with ";" not "&&"
This fixes projects/compiler-rt/test/fuzzer/sigusr.test, which was
broken by r333614. The trouble was that "&&" changes the command for
which "$!" gives the pid.
llvm-svn: 333620
Diffstat (limited to 'llvm/utils/lit/tests')
| -rw-r--r-- | llvm/utils/lit/tests/shtest-run-at-line.py | 26 | ||||
| -rw-r--r-- | llvm/utils/lit/tests/shtest-shell.py | 2 | ||||
| -rw-r--r-- | llvm/utils/lit/tests/unit/TestRunner.py | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/llvm/utils/lit/tests/shtest-run-at-line.py b/llvm/utils/lit/tests/shtest-run-at-line.py index adb7af81812..0aeed20f5c3 100644 --- a/llvm/utils/lit/tests/shtest-run-at-line.py +++ b/llvm/utils/lit/tests/shtest-run-at-line.py @@ -16,9 +16,9 @@ # CHECK-LABEL: FAIL: shtest-run-at-line :: external-shell/basic.txt # CHECK: Script: -# CHECK: [[pdbg0]]RUN: at line 4[[pdbg1]] && true -# CHECK-NEXT: [[pdbg0]]RUN: at line 5[[pdbg1]] && false -# CHECK-NEXT: [[pdbg0]]RUN: at line 6[[pdbg1]] && true +# CHECK: [[pdbg0]]RUN: at line 4[[pdbg1]]; true +# CHECK-NEXT: [[pdbg0]]RUN: at line 5[[pdbg1]]; false +# CHECK-NEXT: [[pdbg0]]RUN: at line 6[[pdbg1]]; true # CHECK: RUN: at line 4 # CHECK: RUN: at line 5 @@ -27,9 +27,9 @@ # CHECK-LABEL: FAIL: shtest-run-at-line :: external-shell/line-continuation.txt # CHECK: Script: -# CHECK: [[pdbg0]]RUN: at line 4[[pdbg1]] && echo 'foo bar' | FileCheck -# CHECK-NEXT: [[pdbg0]]RUN: at line 6[[pdbg1]] && echo 'foo baz' | FileCheck -# CHECK-NEXT: [[pdbg0]]RUN: at line 9[[pdbg1]] && echo 'foo bar' | FileCheck +# CHECK: [[pdbg0]]RUN: at line 4[[pdbg1]]; echo 'foo bar' | FileCheck +# CHECK-NEXT: [[pdbg0]]RUN: at line 6[[pdbg1]]; echo 'foo baz' | FileCheck +# CHECK-NEXT: [[pdbg0]]RUN: at line 9[[pdbg1]]; echo 'foo bar' | FileCheck # CHECK: RUN: at line 4 # CHECK: RUN: at line 6 @@ -39,9 +39,9 @@ # CHECK-LABEL: FAIL: shtest-run-at-line :: internal-shell/basic.txt # CHECK: Script: -# CHECK: : 'RUN: at line 1' && true -# CHECK-NEXT: : 'RUN: at line 2' && false -# CHECK-NEXT: : 'RUN: at line 3' && true +# CHECK: : 'RUN: at line 1'; true +# CHECK-NEXT: : 'RUN: at line 2'; false +# CHECK-NEXT: : 'RUN: at line 3'; true # CHECK: Command Output (stdout) # CHECK: $ ":" "RUN: at line 1" @@ -53,10 +53,10 @@ # CHECK-LABEL: FAIL: shtest-run-at-line :: internal-shell/line-continuation.txt # CHECK: Script: -# CHECK: : 'RUN: at line 1' && : first line continued to second line -# CHECK-NEXT: : 'RUN: at line 3' && echo 'foo bar' | FileCheck -# CHECK-NEXT: : 'RUN: at line 5' && echo 'foo baz' | FileCheck -# CHECK-NEXT: : 'RUN: at line 8' && echo 'foo bar' | FileCheck +# CHECK: : 'RUN: at line 1'; : first line continued to second line +# CHECK-NEXT: : 'RUN: at line 3'; echo 'foo bar' | FileCheck +# CHECK-NEXT: : 'RUN: at line 5'; echo 'foo baz' | FileCheck +# CHECK-NEXT: : 'RUN: at line 8'; echo 'foo bar' | FileCheck # CHECK: Command Output (stdout) # CHECK: $ ":" "RUN: at line 1" diff --git a/llvm/utils/lit/tests/shtest-shell.py b/llvm/utils/lit/tests/shtest-shell.py index 016d1f6f108..ed0bdf35fe1 100644 --- a/llvm/utils/lit/tests/shtest-shell.py +++ b/llvm/utils/lit/tests/shtest-shell.py @@ -161,7 +161,7 @@ # # CHECK: FAIL: shtest-shell :: error-1.txt # CHECK: *** TEST 'shtest-shell :: error-1.txt' FAILED *** -# CHECK: shell parser error on: ': \'RUN: at line 3\' && echo "missing quote' +# CHECK: shell parser error on: ': \'RUN: at line 3\'; echo "missing quote' # CHECK: *** # CHECK: FAIL: shtest-shell :: error-2.txt diff --git a/llvm/utils/lit/tests/unit/TestRunner.py b/llvm/utils/lit/tests/unit/TestRunner.py index 4ade359790c..89209d80f55 100644 --- a/llvm/utils/lit/tests/unit/TestRunner.py +++ b/llvm/utils/lit/tests/unit/TestRunner.py @@ -99,8 +99,8 @@ class TestIntegratedTestKeywordParser(unittest.TestCase): cmd_parser = self.get_parser(parsers, 'MY_RUN:') value = cmd_parser.getValue() self.assertEqual(len(value), 2) # there are only two run lines - self.assertEqual(value[0].strip(), "%dbg(MY_RUN: at line 4) && baz") - self.assertEqual(value[1].strip(), "%dbg(MY_RUN: at line 7) && foo bar") + self.assertEqual(value[0].strip(), "%dbg(MY_RUN: at line 4) baz") + self.assertEqual(value[1].strip(), "%dbg(MY_RUN: at line 7) foo bar") def test_custom(self): parsers = self.make_parsers() |
