commit 5d51a769949a59e5cabf2a09a955d333d11dafa4
author Chris Bieneman <beanz@apple.com> Mon Oct 31 22:06:52 2016 +0000
committer Chris Bieneman <beanz@apple.com> Mon Oct 31 22:06:52 2016 +0000
tree 8369b2e2d1045ad294314697fc033b5b5e6b03ef
parent 01fd221a294a967a7e5927a63393406b2c567e64

[Test-Suite] Speculative fix for darwin bots

When building with Xcode it looks like some of the logic in my test changes went haywire. This should fix it.

llvm-svn: 285646

lldb/packages/Python/lldbsuite/test/dotest.py

diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index 262590c..6b6b257 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -688,8 +688,8 @@
             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 not configuration.lldbFrameworkPath and os.path.exists(os.path.join(lldbLibDir, "LLDB.framework")):
+        configuration.lldbFrameworkPath = os.path.join(lldbLibDir, "LLDB.framework")
     if configuration.lldbFrameworkPath:
         lldbtest_config.lldbFrameworkPath = configuration.lldbFrameworkPath
         candidatePath = os.path.join(