diff options
| author | Johnny Chen <johnny.chen@apple.com> | 2011-02-15 18:50:19 +0000 |
|---|---|---|
| committer | Johnny Chen <johnny.chen@apple.com> | 2011-02-15 18:50:19 +0000 |
| commit | ffb3b51ba8604434f19832184e87727478cd36bd (patch) | |
| tree | 382d0e195da6f0bf0d712cf88e22964df4dfb681 | |
| parent | 6e12e117d45472da871fe661627d12cf3635d2f8 (diff) | |
| download | bcm5719-llvm-ffb3b51ba8604434f19832184e87727478cd36bd.tar.gz bcm5719-llvm-ffb3b51ba8604434f19832184e87727478cd36bd.zip | |
Refactored the test driver to abstract out the Python sys.path specification for
different build configurations.
llvm-svn: 125584
| -rwxr-xr-x | lldb/test/dotest.py | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lldb/test/dotest.py b/lldb/test/dotest.py index 2536a0d3bec..d36a5fe3fdd 100755 --- a/lldb/test/dotest.py +++ b/lldb/test/dotest.py @@ -496,18 +496,19 @@ def setupSysPath(): return 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') + + xcode3_build_dir = ['build'] + xcode4_build_dir = ['build', 'lldb', 'Build', 'Products'] + dbg = ['Debug'] + rel = ['Release'] + bai = ['BuildAndIntegration'] + python_resource_dir = ['LLDB.framework', 'Resources', 'Python'] + dbgPath = os.path.join(base, *(xcode3_build_dir + dbg + python_resource_dir)) + dbgPath2 = os.path.join(base, *(xcode4_build_dir + dbg + python_resource_dir)) + relPath = os.path.join(base, *(xcode3_build_dir + rel + python_resource_dir)) + relPath2 = os.path.join(base, *(xcode4_build_dir + rel + python_resource_dir)) + 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 if os.path.isfile(os.path.join(dbgPath, 'lldb.py')): |
