maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make it possible to run dotest on Linux without any parameters 

dotest will select clang-3.5 by default and fall back on clang/gcc
dotest will look for the lldb executable in the typical cmake
output locations:
{lldb}/../../../build/bin (next to llvm directory)
{lldb}/../../../build/host/bin (next to llvm directory)
{lldb}/../build/bin (next to lldb directory)
{lldb}/../build/host/bin (next to lldb directory)

llvm-svn: 237632
This commit is contained in:
Vince Harron 2015-05-18 23:07:18 +00:00
parent 7d9e79249d
commit 0c6160156a
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lldb/test/dotest.py
View File

@ -523,7 +523,12 @@ def parseOptionsAndInitTestdirs():
if platform_system == 'Darwin' and args.apple_sdk: if platform_system == 'Darwin' and args.apple_sdk:
compilers = [commands.getoutput('xcrun -sdk "%s" -find clang 2> /dev/null' % (args.apple_sdk))] compilers = [commands.getoutput('xcrun -sdk "%s" -find clang 2> /dev/null' % (args.apple_sdk))]
else: else:
compilers = ['clang'] # 'clang' on ubuntu 14.04 is 3.4 so we try clang-3.5 first
candidateCompilers = ['clang-3.5', 'clang', 'gcc']
for candidate in candidateCompilers:
if which(candidate):
compilers = [candidate]
break
if args.channels: if args.channels:
lldbtest_config.channels = args.channels lldbtest_config.channels = args.channels
@ -845,13 +850,18 @@ def getOutputPaths(lldbRootDirectory):
result = [] result = []
if sys.platform == 'darwin': if sys.platform == 'darwin':
result.extend(getXcodeOutputPaths(lldbRootDirectory)) result.append(getXcodeOutputPaths(lldbRootDirectory))
# cmake builds? look for build or build/host folder next to llvm directory # cmake builds? look for build or build/host folder next to llvm directory
# lldb is located in llvm/tools/lldb # lldb is located in llvm/tools/lldb so we need to go up three levels
llvmParentDir = os.path.abspath(os.path.join(lldbRootDirectory, os.pardir, os.pardir, os.pardir)) llvmParentDir = os.path.abspath(os.path.join(lldbRootDirectory, os.pardir, os.pardir, os.pardir))
result.extend(os.path.join(llvmParentDir, 'build', 'bin')) result.append(os.path.join(llvmParentDir, 'build', 'bin'))
result.extend(os.path.join(llvmParentDir, 'build', 'host', 'bin')) result.append(os.path.join(llvmParentDir, 'build', 'host', 'bin'))
# some cmake developers keep their build directory beside their lldb directory
lldbParentDir = os.path.abspath(os.path.join(lldbRootDirectory, os.pardir))
result.append(os.path.join(lldbParentDir, 'build', 'bin'))
result.append(os.path.join(lldbParentDir, 'build', 'host', 'bin'))
return result return result