diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-10-12 20:24:42 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-10-12 20:24:42 +0000 |
| commit | 47df0196b834ecd1d94acf6057b783a4b5553fc2 (patch) | |
| tree | 5be83d1154dd4abd5b151f71ff921f8d0ebc7cfe /lldb/packages/Python/lldbsuite/test | |
| parent | 6cac34fd41e8c961811d09c21063c10f442b2ad5 (diff) | |
| download | bcm5719-llvm-47df0196b834ecd1d94acf6057b783a4b5553fc2.tar.gz bcm5719-llvm-47df0196b834ecd1d94acf6057b783a4b5553fc2.zip | |
Use LLDB_SRC for relative paths
Summary:
Going from LLDB_SRC instead of the file path is safer when looking for compiler-rt. Also need to add support for looking inside the LLVM runtimes subdirectory.
Eventually we should just get CMake to provide these paths during configuration.
Reviewers: tfiala, zturner
Subscribers: lldb-commits
Differential Revision: https://reviews.llvm.org/D25489
llvm-svn: 284045
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/decorators.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/decorators.py b/lldb/packages/Python/lldbsuite/test/decorators.py index 805c707a3f8..16937359639 100644 --- a/lldb/packages/Python/lldbsuite/test/decorators.py +++ b/lldb/packages/Python/lldbsuite/test/decorators.py @@ -649,14 +649,22 @@ def skipUnlessCompilerRt(func): """Decorate the item to skip tests if testing remotely.""" def is_compiler_rt_missing(): compilerRtPath = os.path.join( - os.path.dirname(__file__), - "..", + os.environ["LLDB_SRC"], "..", "..", "..", "llvm", "projects", "compiler-rt") + if not os.path.exists(compilerRtPath): + compilerRtPath = os.path.join( + os.environ["LLDB_SRC"], + "..", + "..", + "..", + "llvm", + "runtimes", + "compiler-rt") return "compiler-rt not found" if not os.path.exists( compilerRtPath) else None return skipTestIfFn(is_compiler_rt_missing)(func) |
