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.

llvm-svn: 113991

1 files changed, 6 insertions, 2 deletions

diff --git a/lldb/test/dotest.py b/lldb/test/dotest.py
index 9a2e4bd778f..86fb7373940 100755
--- a/lldb/test/dotest.py
+++ b/lldb/test/dotest.py
@@ -99,16 +99,20 @@ def setupSysPath():
                            '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)