[Lldb-commits] [PATCH] D25489: Use LLDB_SRC for relative paths

[Chris Bieneman via lldb-commits]

beanz created this revision.
beanz added reviewers: tfiala, zturner.
beanz added a subscriber: lldb-commits.

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.


https://reviews.llvm.org/D25489

Files:
  packages/Python/lldbsuite/test/decorators.py


Index: packages/Python/lldbsuite/test/decorators.py
===================================================================
--- packages/Python/lldbsuite/test/decorators.py
+++ packages/Python/lldbsuite/test/decorators.py
@@ -647,14 +647,22 @@
     """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)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D25489.74295.patch
Type: text/x-patch
Size: 1023 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20161011/fb990074/attachment-0001.bin>