Author: Jonas Devlieghere Date: 2021-04-19T12:28:22-07:00 New Revision: cc68799056da5c2159fa51425f998588ac650171
URL: https://github.com/llvm/llvm-project/commit/cc68799056da5c2159fa51425f998588ac650171 DIFF: https://github.com/llvm/llvm-project/commit/cc68799056da5c2159fa51425f998588ac650171.diff LOG: [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) Added: Modified: lldb/test/API/macosx/posix_spawn/TestLaunchProcessPosixSpawn.py Removed: ################################################################################ diff --git a/lldb/test/API/macosx/posix_spawn/TestLaunchProcessPosixSpawn.py b/lldb/test/API/macosx/posix_spawn/TestLaunchProcessPosixSpawn.py index fc26de705b6fd..1215570a1290f 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 @@ def test_haswell(self): 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') _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
