From cc68799056da5c2159fa51425f998588ac650171 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Mon, 19 Apr 2021 12:24:58 -0700 Subject: [PATCH] [lldb] Stop unsetting LLDB_DEBUGSERVER_PATH from TestLaunchProcessPosixSpawn We no longer need this after Pavel's change to automatically find debug servers to test. (3ca7b2d) --- .../macosx/posix_spawn/TestLaunchProcessPosixSpawn.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/lldb/test/API/macosx/posix_spawn/TestLaunchProcessPosixSpawn.py b/lldb/test/API/macosx/posix_spawn/TestLaunchProcessPosixSpawn.py index fc26de7..1215570 100644 --- a/lldb/test/API/macosx/posix_spawn/TestLaunchProcessPosixSpawn.py +++ b/lldb/test/API/macosx/posix_spawn/TestLaunchProcessPosixSpawn.py @@ -17,17 +17,6 @@ def apple_silicon(): return "Apple M" in features.decode('utf-8') -@contextlib.contextmanager -def remove_from_env(var): - old_environ = os.environ.copy() - del os.environ[var] - try: - yield - finally: - os.environ.clear() - os.environ.update(old_environ) - - class TestLaunchProcessPosixSpawn(TestBase): NO_DEBUG_INFO_TESTCASE = True mydir = TestBase.compute_mydir(__file__) @@ -67,9 +56,5 @@ class TestLaunchProcessPosixSpawn(TestBase): def test_apple_silicon(self): self.build() exe = self.getBuildArtifact("fat.out") - - # We need to remove LLDB_DEBUGSERVER_PATH from the environment if it's - # set so that the Rosetta debugserver is picked for x86_64. - with remove_from_env('LLDB_DEBUGSERVER_PATH'): - self.run_arch(exe, 'x86_64') - self.run_arch(exe, 'arm64') + self.run_arch(exe, 'x86_64') + self.run_arch(exe, 'arm64') -- 2.7.4