[Lldb-commits] [lldb] r113991 - /lldb/trunk/test/dotest.py

[Johnny Chen]

Author: johnny
Date: Wed Sep 15 13:11:19 2010
New Revision: 113991

URL: http://llvm.org/viewvc/llvm-project?rev=113991&view=rev
Log:
Also added BuildAndIntegration to the directories to search for an existing
lldb.py module.  The priorities to search for are Debug, Release, then
BuildAndIntegration.  You can always override this with a valid PYTHONPATH
environment variable before running the test driver.

For example:

$ PYTHONPATH=/Find/My/LLDB/Module/Here ./dotest.py -v .

Python runtime will try to locate the lldb.py module from
/Find/My/LLDB/Module/Here first before trying the Debug, Release, and then
BuildAndIntegration directories.

Modified:
    lldb/trunk/test/dotest.py

Modified: lldb/trunk/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dotest.py?rev=113991&r1=113990&r2=113991&view=diff
==============================================================================
--- lldb/trunk/test/dotest.py (original)
+++ lldb/trunk/test/dotest.py Wed Sep 15 13:11:19 2010
@@ -99,16 +99,20 @@
                            'Resources', 'Python')
     relPath = os.path.join(base, 'build', 'Release', 'LLDB.framework',
                            'Resources', 'Python')
+    baiPath = os.path.join(base, 'build', '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(relPath, 'lldb.py')):
         lldbPath = relPath
+    elif os.path.isfile(os.path.join(baiPath, 'lldb.py')):
+        lldbPath = baiPath
 
     if not lldbPath:
-        print 'This script requires lldb.py to be in either ' + dbgPath,
-        print ' or' + relPath
+        print 'This script requires lldb.py to be in either ' + dbgPath + ',',
+        print relPath + ', or ' + baiPath
         sys.exit(-1)
 
     sys.path.append(lldbPath)