diff options
Diffstat (limited to 'llvm/utils/lit')
| -rw-r--r-- | llvm/utils/lit/tests/lit.cfg | 11 | ||||
| -rw-r--r-- | llvm/utils/lit/tests/shtest-run-at-line.py | 14 |
2 files changed, 7 insertions, 18 deletions
diff --git a/llvm/utils/lit/tests/lit.cfg b/llvm/utils/lit/tests/lit.cfg index 677ff22e401..75d1b5eac85 100644 --- a/llvm/utils/lit/tests/lit.cfg +++ b/llvm/utils/lit/tests/lit.cfg @@ -71,14 +71,3 @@ for attribute in ('llvm_tools_dir', 'lit_tools_dir'): if directory: path = os.path.pathsep.join((directory, path)) config.environment['PATH'] = path - -# These substitutions are needed only in tests where the external shell is used -# and could be either bash or windows cmd.exe. Substitutions are expected to -# be expanded in double quotes. -isWin32CMDEXE = lit_config.isWindows and not lit_config.getBashPath() -if isWin32CMDEXE: - config.substitutions.append(('%{pdbg0}', "echo '")) - config.substitutions.append(('%{pdbg1}', "' > nul &&")) -else: - config.substitutions.append(('%{pdbg0}', ": '")) - 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 9a704134e8b..cd0e08137ee 100644 --- a/llvm/utils/lit/tests/shtest-run-at-line.py +++ b/llvm/utils/lit/tests/shtest-run-at-line.py @@ -2,7 +2,7 @@ # (-v is actually sufficient in the case of the internal shell.) # # RUN: not %{lit} -j 1 -vv %{inputs}/shtest-run-at-line > %t.out -# RUN: FileCheck --input-file %t.out -Dpdbg0="%{pdbg0}" -Dpdbg1="%{pdbg1}" %s +# RUN: FileCheck --input-file %t.out %s # # END. @@ -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: RUN: at line 4{{.*}} true +# CHECK-NEXT: RUN: at line 5{{.*}} false +# CHECK-NEXT: RUN: at line 6{{.*}} 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: RUN: at line 4{{.*}} echo 'foo bar' | FileCheck +# CHECK-NEXT: RUN: at line 6{{.*}} echo 'foo baz' | FileCheck +# CHECK-NEXT: RUN: at line 9{{.*}} echo 'foo bar' | FileCheck # CHECK: RUN: at line 4 # CHECK: RUN: at line 6 |
