Refactored the test driver to abstract out the Python sys.path specification for

different build configurations.

llvm-svn: 125584
This commit is contained in:
Johnny Chen 2011-02-15 18:50:19 +00:00
parent 6e12e117d4
commit ffb3b51ba8
1 changed files with 13 additions and 12 deletions

View File

@ -496,18 +496,19 @@ def setupSysPath():
return return
base = os.path.abspath(os.path.join(scriptPath, os.pardir)) base = os.path.abspath(os.path.join(scriptPath, os.pardir))
dbgPath = os.path.join(base, 'build', 'Debug', 'LLDB.framework',
'Resources', 'Python') xcode3_build_dir = ['build']
dbgPath2 = os.path.join(base, 'build', 'lldb', 'Build', 'Products', xcode4_build_dir = ['build', 'lldb', 'Build', 'Products']
'Debug', 'LLDB.framework', 'Resources', 'Python') dbg = ['Debug']
relPath = os.path.join(base, 'build', 'Release', 'LLDB.framework', rel = ['Release']
'Resources', 'Python') bai = ['BuildAndIntegration']
relPath2 = os.path.join(base, 'build', 'lldb', 'Build', 'Products', python_resource_dir = ['LLDB.framework', 'Resources', 'Python']
'Release', 'LLDB.framework', 'Resources', 'Python') dbgPath = os.path.join(base, *(xcode3_build_dir + dbg + python_resource_dir))
baiPath = os.path.join(base, 'build', 'BuildAndIntegration', dbgPath2 = os.path.join(base, *(xcode4_build_dir + dbg + python_resource_dir))
'LLDB.framework', 'Resources', 'Python') relPath = os.path.join(base, *(xcode3_build_dir + rel + python_resource_dir))
baiPath2 = os.path.join(base, 'build', 'lldb', 'Build', 'Products', relPath2 = os.path.join(base, *(xcode4_build_dir + rel + python_resource_dir))
'BuildAndIntegration', 'LLDB.framework', 'Resources', 'Python') baiPath = os.path.join(base, *(xcode3_build_dir + bai + python_resource_dir))
baiPath2 = os.path.join(base, *(xcode4_build_dir + bai + python_resource_dir))
lldbPath = None lldbPath = None
if os.path.isfile(os.path.join(dbgPath, 'lldb.py')): if os.path.isfile(os.path.join(dbgPath, 'lldb.py')):