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

[lit] Python 3. 

llvm-svn: 204773
This commit is contained in:
Michael J. Spencer 2014-03-26 00:53:48 +00:00
parent ad386648b8
commit a4f983e258
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/test/Unit/lit.site.cfg.in
View File

@ -17,7 +17,7 @@ try:
config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
config.llvm_build_mode = config.llvm_build_mode % lit_config.params config.llvm_build_mode = config.llvm_build_mode % lit_config.params
except KeyError,e: except KeyError as e:
key, = e.args key, = e.args
lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key)) lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))

7
lld/test/lit.cfg
View File

@ -4,6 +4,7 @@ import os
import platform import platform
import re import re
import subprocess import subprocess
import locale
import lit.formats import lit.formats
import lit.util import lit.util
@ -131,11 +132,11 @@ try:
subprocess.Popen([os.path.join(llvm_tools_dir, 'llvm-config'), subprocess.Popen([os.path.join(llvm_tools_dir, 'llvm-config'),
'--build-mode', '--assertion-mode'], '--build-mode', '--assertion-mode'],
stdout = subprocess.PIPE) stdout = subprocess.PIPE)
except OSError, why: except OSError as why:
print "Could not find llvm-config in " + llvm_tools_dir print("Could not find llvm-config in " + llvm_tools_dir)
exit(42) exit(42)
llvm_config_output = llvm_config_cmd.stdout.read() llvm_config_output = llvm_config_cmd.stdout.read().decode(locale.getdefaultlocale()[1])
llvm_config_output_list = llvm_config_output.split("\n") llvm_config_output_list = llvm_config_output.split("\n")
if re.search(r'DEBUG', llvm_config_output_list[0]): if re.search(r'DEBUG', llvm_config_output_list[0]):

2
lld/test/lit.site.cfg.in
View File

@ -14,7 +14,7 @@ config.python_executable = "@PYTHON_EXECUTABLE@"
try: try:
config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
except KeyError,e: except KeyError as e:
key, = e.args key, = e.args
lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key)) lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))