[Lldb-commits] [lldb] r285646 - [Test-Suite] Speculative fix for darwin bots

[Chris Bieneman via lldb-commits]

Author: cbieneman
Date: Mon Oct 31 17:06:52 2016
New Revision: 285646

URL: http://llvm.org/viewvc/llvm-project?rev=285646&view=rev
Log:
[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.

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/dotest.py

Modified: lldb/trunk/packages/Python/lldbsuite/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dotest.py?rev=285646&r1=285645&r2=285646&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Mon Oct 31 17:06:52 2016
@@ -688,8 +688,8 @@ 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 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(