summaryrefslogtreecommitdiffstats
path: root/lldb/test/API
diff options
context:
space:
mode:
authorJonas Devlieghere <jonas@devlieghere.com>2019-11-05 10:12:05 -0800
committerJonas Devlieghere <jonas@devlieghere.com>2019-11-05 10:13:01 -0800
commita9970036d43b4fb8622d7179603722b539756457 (patch)
tree1f354651e4dccb62db0862bc74e9fdaf351d2825 /lldb/test/API
parent15140e4bacf94fbc509e5a139909aefcd1cc3363 (diff)
downloadbcm5719-llvm-a9970036d43b4fb8622d7179603722b539756457.tar.gz
bcm5719-llvm-a9970036d43b4fb8622d7179603722b539756457.zip
[lldb] Fix Python 3 incompatibility in API/lit.cfg.py
This code path is only taken on the sanitized bot, where it caused a TypeError: "Can't mix strings and bytes in path components".
Diffstat (limited to 'lldb/test/API')
-rw-r--r--lldb/test/API/lit.cfg.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py
index f29d9047e24..06125a1aaed 100644
--- a/lldb/test/API/lit.cfg.py
+++ b/lldb/test/API/lit.cfg.py
@@ -27,7 +27,8 @@ if 'Address' in config.llvm_use_sanitizer:
if 'Darwin' in config.host_os and 'x86' in config.host_triple:
import subprocess
resource_dir = subprocess.check_output(
- [config.cmake_cxx_compiler, '-print-resource-dir']).strip()
+ [config.cmake_cxx_compiler,
+ '-print-resource-dir']).decode('utf-8').strip()
runtime = os.path.join(resource_dir, 'lib', 'darwin',
'libclang_rt.asan_osx_dynamic.dylib')
config.environment['DYLD_INSERT_LIBRARIES'] = runtime
@@ -66,9 +67,9 @@ for cachedir in [config.clang_module_cache, config.lldb_module_cache]:
# lit complains if the value is set but it is not supported.
supported, errormsg = lit_config.maxIndividualTestTimeIsSupported
if supported:
- lit_config.maxIndividualTestTime = 600
+ lit_config.maxIndividualTestTime = 600
else:
- lit_config.warning("Could not set a default per-test timeout. " + errormsg)
+ lit_config.warning("Could not set a default per-test timeout. " + errormsg)
# Build dotest command.
dotest_cmd = [config.dotest_path]
OpenPOWER on IntegriCloud