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

[Phabricator via lldb-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL284045: Use LLDB_SRC for relative paths (authored by 
cbieneman).

Changed prior to commit:
  https://reviews.llvm.org/D25489?vs=74295&id=74433#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D25489

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


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



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

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits