replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make the lit configuration Python 3 compatible 

by using the same techniques as LLVM's lit configuration.

llvm-svn: 243154
This commit is contained in:
Michael Kruse 2015-07-24 20:33:22 +00:00
parent e896939e54
commit 1bbe346cef
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
polly/test/lit.cfg
View File

@ -103,12 +103,13 @@ if config.test_exec_root is None:
import subprocess
try:
opt_cmd = subprocess.Popen([os.path.join(llvm_tools_dir, 'opt'), '-version'],
stdout = subprocess.PIPE)
except OSError, why:
print "Could not find opt in " + llvm_tools_dir
stdout = subprocess.PIPE,
env=config.environment)
except OSError:
print("Could not find opt in " + llvm_tools_dir)
exit(42)
if re.search(r'with assertions', opt_cmd.stdout.read()):
if re.search(r'with assertions', opt_cmd.stdout.read().decode('ascii')):
config.available_features.add('asserts')
opt_cmd.wait()
@ -116,11 +117,12 @@ try:
llvm_config_cmd = subprocess.Popen([os.path.join(llvm_tools_dir,
'llvm-config'),
'--targets-built'],
stdout = subprocess.PIPE)
except OSError, why:
print "Could not find llvm-config in " + llvm_tools_dir
stdout = subprocess.PIPE,
env=config.environment)
except OSError:
print("Could not find llvm-config in " + llvm_tools_dir)
exit(42)
if re.search(r'NVPTX', llvm_config_cmd.stdout.read()):
if re.search(r'NVPTX', llvm_config_cmd.stdout.read().decode('ascii')):
config.available_features.add('nvptx-registered-target')
llvm_config_cmd.wait()

3
polly/test/lit.site.cfg.in
View File

@ -21,7 +21,8 @@ if (re.match(r'^x86_64*', '@TARGET_TRIPLE@') == None) :
try:
config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
except KeyError,e:
except KeyError:
e = sys.exc_info()[1]
key, = e.args
lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))