diff options
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/lldbutil.py | 9 | ||||
| -rw-r--r-- | lldb/test/API/lit.cfg.py | 6 |
2 files changed, 14 insertions, 1 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lldbutil.py b/lldb/packages/Python/lldbsuite/test/lldbutil.py index 9deaed5cf50..006362a4479 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbutil.py +++ b/lldb/packages/Python/lldbsuite/test/lldbutil.py @@ -19,6 +19,7 @@ import six # LLDB modules import lldb +from . import lldbtest_config # =================================================== @@ -758,6 +759,12 @@ def run_to_breakpoint_make_target(test, exe_name = "a.out", in_cwd = True): # Create the target target = test.dbg.CreateTarget(exe) test.assertTrue(target, "Target: %s is not valid."%(exe_name)) + + # Set environment variables for the inferior. + if lldbtest_config.inferior_env: + test.runCmd('settings set target.env-vars {}'.format( + lldbtest_config.inferior_env)) + return target def run_to_breakpoint_do_run(test, target, bkpt, launch_info = None, @@ -765,7 +772,7 @@ def run_to_breakpoint_do_run(test, target, bkpt, launch_info = None, # Launch the process, and do not stop at the entry point. if not launch_info: - launch_info = lldb.SBLaunchInfo(None) + launch_info = target.GetLaunchInfo() launch_info.SetWorkingDirectory(test.get_process_working_directory()) if extra_images and lldb.remote_platform: diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py index aca13b9c64f..631a8a4a33b 100644 --- a/lldb/test/API/lit.cfg.py +++ b/lldb/test/API/lit.cfg.py @@ -87,6 +87,12 @@ dotest_cmd.extend(config.dotest_args_str.split(';')) if config.llvm_libs_dir: dotest_cmd += ['--env', 'LLVM_LIBS_DIR=' + config.llvm_libs_dir] +# Forward ASan-specific environment variables to tests, as a test may load an +# ASan-ified dylib. +for env_var in ('ASAN_OPTIONS', 'DYLD_INSERT_LIBRARIES'): + if env_var in config.environment: + dotest_cmd += ['--inferior-env', env_var + '=' + config.environment[env_var]] + if config.lldb_build_directory: dotest_cmd += ['--build-dir', config.lldb_build_directory] |
