From 21327e79d9cb99127bc5af0413da1d37d61c8466 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Mon, 10 Feb 2020 16:17:01 -0800 Subject: [PATCH] [test] Fix LLDB Python Path and re-enable linux-fatal-backtrace.swift --- test/Runtime/linux-fatal-backtrace.swift | 1 - test/lit.cfg | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/Runtime/linux-fatal-backtrace.swift b/test/Runtime/linux-fatal-backtrace.swift index 92467a7b93c2f..7e84dc9719a62 100644 --- a/test/Runtime/linux-fatal-backtrace.swift +++ b/test/Runtime/linux-fatal-backtrace.swift @@ -4,7 +4,6 @@ // REQUIRES: executable_test // REQUIRES: OS=linux-gnu // REQUIRES: lldb -// REQUIRES: rdar59328972 // XFAIL: CPU=s390x // NOTE: not.py is used above instead of "not --crash" because %target-run diff --git a/test/lit.cfg b/test/lit.cfg index 7a820ec9f89b1..be06f74b79367 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -126,6 +126,10 @@ def get_simulator_command(run_os, run_cpu, sdk_path): else: lit_config.fatal("Unknown simulator OS %r" % run_os) +def get_lldb_python_path(lldb_build_root): + lldb_path = os.path.join(lldb_build_root, 'bin', 'lldb') + return subprocess.check_output([lldb_path, "-P"]).rstrip() + assert darwin_sdk_build_version_cmp("11A1", "12A1") < 0 assert darwin_sdk_build_version_cmp("12A1", "11A1") > 0 @@ -1780,10 +1784,8 @@ config.substitutions.append(('%import-libdispatch', getattr(config, 'import_libd if config.lldb_build_root != "": config.available_features.add('lldb') - # Note: using the same approach to locating the lib dir as in - # finishSwigPythonLLDB.py in the lldb repo - python_lib_dir = get_python_lib(True, False, config.lldb_build_root) - config.substitutions.append(('%lldb-python-path', python_lib_dir)) + lldb_python_path = get_lldb_python_path(config.lldb_build_root) + config.substitutions.append(('%lldb-python-path', lldb_python_path)) # Disable randomized hash seeding by default. Tests need to manually opt in to # random seeds by unsetting the SWIFT_DETERMINISTIC_HASHING environment