diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-10-31 04:48:10 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-10-31 04:48:10 +0000 |
| commit | bd6d69987c36d947746d061421b3eb99cf86a6bb (patch) | |
| tree | 7091350159b85bcb16e525415a11ab46982bad46 /lldb/packages/Python/lldbsuite/test/dotest.py | |
| parent | 93ffabd28dfa8800317478f07d2987634e9e6e1e (diff) | |
| download | llvm-bd6d69987c36d947746d061421b3eb99cf86a6bb.zip llvm-bd6d69987c36d947746d061421b3eb99cf86a6bb.tar.gz llvm-bd6d69987c36d947746d061421b3eb99cf86a6bb.tar.bz2 | |
[Test Suite] Properly respect --framework option
Summary:
dotest.py has a framework option that is not respected. This patch makes the framework path properly configurable via the --framework option.
This patch also adds a function to the lldbtest.Base class named "hasDarwinFramework" which allows us to not rely on the host platform to determine if a framework is present. If running on Darwin, and not building a framework, this will follow the *nix code paths which are appropriate for Darwin.
Reviewers: tfiala
Subscribers: lldb-commits, mgorny
Differential Revision: https://reviews.llvm.org/D25886
llvm-svn: 285541
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/dotest.py')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dotest.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 20dca86..262590c 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -688,7 +688,10 @@ def setupSysPath(): configuration.skipCategories.append("lldb-mi") lldbPythonDir = None # The directory that contains 'lldb/__init__.py' + if os.path.exists(os.path.join(lldbLibDir, "LLDB.framework")): + configuration.lldbFrameworkPath = lldbLibDir if configuration.lldbFrameworkPath: + lldbtest_config.lldbFrameworkPath = configuration.lldbFrameworkPath candidatePath = os.path.join( configuration.lldbFrameworkPath, 'Resources', 'Python') if os.path.isfile(os.path.join(candidatePath, 'lldb/__init__.py')): |