diff --git a/lldb/source/Host/common/Host.cpp b/lldb/source/Host/common/Host.cpp --- a/lldb/source/Host/common/Host.cpp +++ b/lldb/source/Host/common/Host.cpp @@ -501,6 +501,8 @@ launch_info.SetArguments(args, first_arg_is_executable); } + launch_info.GetEnvironment() = Host::GetEnvironment(); + if (working_dir) launch_info.SetWorkingDirectory(working_dir); llvm::SmallString<64> output_file_path; diff --git a/lldb/test/API/python_api/sbplatform/Makefile b/lldb/test/API/python_api/sbplatform/Makefile new file mode 100644 --- /dev/null +++ b/lldb/test/API/python_api/sbplatform/Makefile @@ -0,0 +1,3 @@ +CXX_SOURCES := main.cpp + +include Makefile.rules diff --git a/lldb/test/API/python_api/sbplatform/TestSBPlatform.py b/lldb/test/API/python_api/sbplatform/TestSBPlatform.py new file mode 100644 --- /dev/null +++ b/lldb/test/API/python_api/sbplatform/TestSBPlatform.py @@ -0,0 +1,22 @@ +"""Test the SBPlatform APIs.""" + +from lldbsuite.test.decorators import * +from lldbsuite.test.lldbtest import * + +class SBPlatformAPICase(TestBase): + + mydir = TestBase.compute_mydir(__file__) + NO_DEBUG_INFO_TESTCASE = True + + @add_test_categories(['pyapi']) + def test_run(self): + self.build() + plat = lldb.SBPlatform.GetHostPlatform() + + os.environ["MY_TEST_ENV_VAR"]="SBPlatformAPICase.test_run" + def cleanup(): + del os.environ["MY_TEST_ENV_VAR"] + self.addTearDownHook(cleanup) + cmd = lldb.SBPlatformShellCommand(self.getBuildArtifact("a.out")) + self.assertTrue(plat.Run(cmd).Success()) + self.assertIn("MY_TEST_ENV_VAR=SBPlatformAPICase.test_run", cmd.GetOutput()) diff --git a/lldb/test/API/python_api/sbplatform/main.cpp b/lldb/test/API/python_api/sbplatform/main.cpp new file mode 100644 --- /dev/null +++ b/lldb/test/API/python_api/sbplatform/main.cpp @@ -0,0 +1,8 @@ +#include +#include + +int main() { + printf("MY_TEST_ENV_VAR=%s\n", getenv("MY_TEST_ENV_VAR")); + + return 0; +}