Cleanup work required to get the ASAN tests to run in the new test suite infrastructure; the tests are now xfailed on Darwin pending investigation
llvm-svn: 253604
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index eed40c9..2301616 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -1225,7 +1225,8 @@
def wrapper(*args, **kwargs):
from unittest2 import case
import os.path
- compilerRtPath = os.path.join(os.path.dirname(__file__), "..", "..", "..", "projects", "compiler-rt")
+ compilerRtPath = os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "llvm","projects","compiler-rt")
+ print(compilerRtPath)
if not os.path.exists(compilerRtPath):
self = args[0]
self.skipTest("skip if compiler-rt not found")
@@ -2195,7 +2196,7 @@
"llvm-build/Release/x86_64/Release/bin/clang",
"llvm-build/Debug/x86_64/Debug/bin/clang",
]
- lldb_root_path = os.path.join(os.path.dirname(__file__), "..")
+ lldb_root_path = os.path.join(os.path.dirname(__file__), "..", "..", "..", "..")
for p in paths_to_try:
path = os.path.join(lldb_root_path, p)
if os.path.exists(path):