diff options
| -rw-r--r-- | llvm/utils/lit/tests/lit.cfg | 4 | ||||
| -rw-r--r-- | llvm/utils/lit/tests/shtest-run-at-line.py | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/llvm/utils/lit/tests/lit.cfg b/llvm/utils/lit/tests/lit.cfg index a5ccc2c067e..677ff22e401 100644 --- a/llvm/utils/lit/tests/lit.cfg +++ b/llvm/utils/lit/tests/lit.cfg @@ -78,7 +78,7 @@ config.environment['PATH'] = path isWin32CMDEXE = lit_config.isWindows and not lit_config.getBashPath() if isWin32CMDEXE: config.substitutions.append(('%{pdbg0}', "echo '")) - config.substitutions.append(('%{pdbg1}', "' > nul")) + config.substitutions.append(('%{pdbg1}', "' > nul &&")) else: config.substitutions.append(('%{pdbg0}', ": '")) - config.substitutions.append(('%{pdbg1}', "'")) + config.substitutions.append(('%{pdbg1}', "';")) diff --git a/llvm/utils/lit/tests/shtest-run-at-line.py b/llvm/utils/lit/tests/shtest-run-at-line.py index 0aeed20f5c3..9a704134e8b 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 |
