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
This commit is contained in:
Johnny Chen 2010-09-15 18:11:19 +00:00
parent f7c67d9f46
commit 73982b94e3
1 changed files with 6 additions and 2 deletions

View File

@ -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)