diff options
| author | Greg Bedwell <greg_bedwell@sn.scee.net> | 2017-11-29 18:05:26 +0000 |
|---|---|---|
| committer | Greg Bedwell <greg_bedwell@sn.scee.net> | 2017-11-29 18:05:26 +0000 |
| commit | e081e350cb3e161f233bec2a35cb599b802d198c (patch) | |
| tree | 0725ae954f6897054024102fcf3c15ff68024d02 /utils | |
| parent | 1a6089359775da4feb08110868173fcf47032208 (diff) | |
Make check-lit tests respect LLVM_LIT_TOOLS_DIR
Differential Revision: https://reviews.llvm.org/D40520
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319329 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/lit/tests/lit.cfg | 11 | ||||
| -rw-r--r-- | utils/lit/tests/lit.site.cfg.in | 1 | ||||
| -rw-r--r-- | utils/lit/tests/shtest-format.py | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/utils/lit/tests/lit.cfg b/utils/lit/tests/lit.cfg index dffaec6584b..75d1b5eac85 100644 --- a/utils/lit/tests/lit.cfg +++ b/utils/lit/tests/lit.cfg @@ -64,7 +64,10 @@ except ImportError: if sys.platform.startswith('win') or sys.platform.startswith('cygwin'): config.available_features.add('windows') -# Add llvm tools directory if this config is being loaded indirectly -if getattr(config, 'llvm_tools_dir', None) is not None: - path = os.path.pathsep.join((config.llvm_tools_dir, config.environment['PATH'])) - config.environment['PATH'] = path +# Add llvm and lit tools directories if this config is being loaded indirectly. +path = config.environment['PATH'] +for attribute in ('llvm_tools_dir', 'lit_tools_dir'): + directory = getattr(config, attribute, None) + if directory: + path = os.path.pathsep.join((directory, path)) +config.environment['PATH'] = path diff --git a/utils/lit/tests/lit.site.cfg.in b/utils/lit/tests/lit.site.cfg.in index 374db49fa1e..693364c7c97 100644 --- a/utils/lit/tests/lit.site.cfg.in +++ b/utils/lit/tests/lit.site.cfg.in @@ -2,6 +2,7 @@ import sys +config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" config.llvm_src_root = "@LLVM_SOURCE_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" diff --git a/utils/lit/tests/shtest-format.py b/utils/lit/tests/shtest-format.py index 37e3e1c1262..94d74e3a920 100644 --- a/utils/lit/tests/shtest-format.py +++ b/utils/lit/tests/shtest-format.py @@ -16,7 +16,7 @@ # CHECK-NEXT: line 2: failed test output on stdout # CHECK: Command Output (stderr): # CHECK-NEXT: -- -# CHECK-NEXT: cat: does-not-exist: No such file or directory +# CHECK-NEXT: cat{{(\.exe)?}}: does-not-exist: No such file or directory # CHECK: -- # CHECK: FAIL: shtest-format :: external_shell/fail_with_bad_encoding.txt |