[Lldb-commits] [lldb] r125520 - /lldb/branches/apple/calcite/lldb/test/dotest.py

[Greg Clayton]

Author: gclayton
Date: Mon Feb 14 15:08:22 2011
New Revision: 125520

URL: http://llvm.org/viewvc/llvm-project?rev=125520&view=rev
Log:
Added support for build directories from Xcode 4 xcworkspaces.


Modified:
    lldb/branches/apple/calcite/lldb/test/dotest.py

Modified: lldb/branches/apple/calcite/lldb/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/apple/calcite/lldb/test/dotest.py?rev=125520&r1=125519&r2=125520&view=diff
==============================================================================
--- lldb/branches/apple/calcite/lldb/test/dotest.py (original)
+++ lldb/branches/apple/calcite/lldb/test/dotest.py Mon Feb 14 15:08:22 2011
@@ -498,18 +498,30 @@
     base = os.path.abspath(os.path.join(scriptPath, os.pardir))
     dbgPath = os.path.join(base, 'build', 'Debug', 'LLDB.framework',
                            'Resources', 'Python')
+    dbgPath2 = os.path.join(base, 'build', 'lldb', 'Build', 'Products', 
+                            'Debug', 'LLDB.framework', 'Resources', 'Python')
     relPath = os.path.join(base, 'build', 'Release', 'LLDB.framework',
                            'Resources', 'Python')
+    relPath2 = os.path.join(base, 'build', 'lldb', 'Build', 'Products', 
+                            'Release', 'LLDB.framework', 'Resources', 'Python')
     baiPath = os.path.join(base, 'build', 'BuildAndIntegration',
                            'LLDB.framework', 'Resources', 'Python')
+    baiPath2 = os.path.join(base, 'build', 'lldb', 'Build', 'Products', 
+                           'BuildAndIntegration', 'LLDB.framework', 'Resources', 'Python')
 
     lldbPath = None
     if os.path.isfile(os.path.join(dbgPath, 'lldb.py')):
         lldbPath = dbgPath
+    elif os.path.isfile(os.path.join(dbgPath2, 'lldb.py')):
+        lldbPath = dbgPath2
     elif os.path.isfile(os.path.join(relPath, 'lldb.py')):
         lldbPath = relPath
+    elif os.path.isfile(os.path.join(relPath2, 'lldb.py')):
+        lldbPath = relPath2
     elif os.path.isfile(os.path.join(baiPath, 'lldb.py')):
         lldbPath = baiPath
+    elif os.path.isfile(os.path.join(baiPath2, 'lldb.py')):
+        lldbPath = baiPath2
 
     if not lldbPath:
         print 'This script requires lldb.py to be in either ' + dbgPath + ',',