diff options
| author | Zachary Turner <zturner@google.com> | 2017-09-15 22:10:46 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2017-09-15 22:10:46 +0000 |
| commit | ce92db13ead9a24c767d60375545fa6ad6cb8ce0 (patch) | |
| tree | fb503ae2b3c9ce191091cdfd88ceb73ac4c9ff72 /compiler-rt/unittests | |
| parent | bcd78491ef22754d15ea4dddea2425e0e673baf9 (diff) | |
| download | bcm5719-llvm-ce92db13ead9a24c767d60375545fa6ad6cb8ce0.tar.gz bcm5719-llvm-ce92db13ead9a24c767d60375545fa6ad6cb8ce0.zip | |
Resubmit "[lit] Force site configs to run before source-tree configs"
This is a resubmission of r313270. It broke standalone builds of
compiler-rt because we were not correctly generating the llvm-lit
script in the standalone build directory.
The fixes incorporated here attempt to find llvm/utils/llvm-lit
from the source tree returned by llvm-config. If present, it
will generate llvm-lit into the output directory. Regardless,
the user can specify -DLLVM_EXTERNAL_LIT to point to a specific
lit.py on their file system. This supports the use case of
someone installing lit via a package manager. If it cannot find
a source tree, and -DLLVM_EXTERNAL_LIT is either unspecified or
invalid, then we print a warning that tests will not be able
to run.
Differential Revision: https://reviews.llvm.org/D37756
llvm-svn: 313407
Diffstat (limited to 'compiler-rt/unittests')
| -rw-r--r-- | compiler-rt/unittests/lit.common.unit.cfg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/unittests/lit.common.unit.cfg b/compiler-rt/unittests/lit.common.unit.cfg index b08c1fe1283..31206e913bf 100644 --- a/compiler-rt/unittests/lit.common.unit.cfg +++ b/compiler-rt/unittests/lit.common.unit.cfg @@ -16,7 +16,7 @@ config.test_format = lit.formats.GoogleTest(llvm_build_mode, "Test") config.suffixes = [] # Tweak PATH to include llvm tools dir. -llvm_tools_dir = getattr(config, 'llvm_tools_dir', None) +llvm_tools_dir = config.llvm_tools_dir if (not llvm_tools_dir) or (not os.path.exists(llvm_tools_dir)): lit_config.fatal("Invalid llvm_tools_dir config attribute: %r" % llvm_tools_dir) path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH'])) |
