beanz created this revision.
beanz added reviewers: tfiala, zturner.
beanz added a subscriber: lldb-commits.
When running on Darwin, the test suite assumes a specific directory structure
for the build directory. This works for the Xcode project builds, but fails for
CMake builds regardless of whether or not you are generating the LLDB framework.
This patch allows the Darwin code path to fall back to the more generic code
path used by other platforms in the event that LLDB.h isn't where the test
suite expects it.
This allows API tests to run on Darwin when building with CMake with the
framework build enabled or disabled.
https://reviews.llvm.org/D25488
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
@@ -512,13 +512,15 @@
'Current',
'Headers',
'LLDB.h')
- else:
- header = os.path.join(
- os.environ["LLDB_SRC"],
- "include",
- "lldb",
- "API",
- "LLDB.h")
+ if os.path.exists(header):
+ return None
+
+ header = os.path.join(
+ os.environ["LLDB_SRC"],
+ "include",
+ "lldb",
+ "API",
+ "LLDB.h")
if not os.path.exists(header):
return "skip because LLDB.h header not found"
return None
Index: packages/Python/lldbsuite/test/decorators.py
===================================================================
--- packages/Python/lldbsuite/test/decorators.py
+++ packages/Python/lldbsuite/test/decorators.py
@@ -512,13 +512,15 @@
'Current',
'Headers',
'LLDB.h')
- else:
- header = os.path.join(
- os.environ["LLDB_SRC"],
- "include",
- "lldb",
- "API",
- "LLDB.h")
+ if os.path.exists(header):
+ return None
+
+ header = os.path.join(
+ os.environ["LLDB_SRC"],
+ "include",
+ "lldb",
+ "API",
+ "LLDB.h")
if not os.path.exists(header):
return "skip because LLDB.h header not found"
return None
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
