diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2014-03-26 00:53:48 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2014-03-26 00:53:48 +0000 |
| commit | a4f983e258cbd901918f0b2ac45bb73b67d1b498 (patch) | |
| tree | d4e55dd995c4d91216bed69acdbfcba902f06c76 | |
| parent | ad386648b8def0e6f9eca426cf07682a9d302f32 (diff) | |
| download | bcm5719-llvm-a4f983e258cbd901918f0b2ac45bb73b67d1b498.tar.gz bcm5719-llvm-a4f983e258cbd901918f0b2ac45bb73b67d1b498.zip | |
[lit] Python 3.
llvm-svn: 204773
| -rw-r--r-- | lld/test/Unit/lit.site.cfg.in | 2 | ||||
| -rw-r--r-- | lld/test/lit.cfg | 7 | ||||
| -rw-r--r-- | lld/test/lit.site.cfg.in | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lld/test/Unit/lit.site.cfg.in b/lld/test/Unit/lit.site.cfg.in index e482e760d71..74c5eca9115 100644 --- a/lld/test/Unit/lit.site.cfg.in +++ b/lld/test/Unit/lit.site.cfg.in @@ -17,7 +17,7 @@ try: config.llvm_tools_dir = config.llvm_tools_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 -except KeyError,e: +except KeyError as e: key, = e.args lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key)) diff --git a/lld/test/lit.cfg b/lld/test/lit.cfg index b2f7170faa3..c66b6ac8299 100644 --- a/lld/test/lit.cfg +++ b/lld/test/lit.cfg @@ -4,6 +4,7 @@ import os import platform import re import subprocess +import locale import lit.formats import lit.util @@ -131,11 +132,11 @@ try: subprocess.Popen([os.path.join(llvm_tools_dir, 'llvm-config'), '--build-mode', '--assertion-mode'], stdout = subprocess.PIPE) -except OSError, why: - print "Could not find llvm-config in " + llvm_tools_dir +except OSError as why: + print("Could not find llvm-config in " + llvm_tools_dir) 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") if re.search(r'DEBUG', llvm_config_output_list[0]): diff --git a/lld/test/lit.site.cfg.in b/lld/test/lit.site.cfg.in index 8d70a4af331..0eeb889d1b2 100644 --- a/lld/test/lit.site.cfg.in +++ b/lld/test/lit.site.cfg.in @@ -14,7 +14,7 @@ config.python_executable = "@PYTHON_EXECUTABLE@" 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 as e: key, = e.args lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key)) |
