From a6b5624372a652b18633704e7a5732e292f2f61b Mon Sep 17 00:00:00 2001 From: Med Ismail Bennani Date: Thu, 27 Jan 2022 01:04:38 +0100 Subject: Revert "[lldb/test] Try to fix TestSBModule failure" This reverts commit 326516448c839d8f9cc515b20a34d0f3a6ee2374. --- .../scripted_process/TestScriptedProcess.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py') diff --git a/lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py b/lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py index 3a9c74bb73c6..0c215f082c5d 100644 --- a/lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py +++ b/lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py @@ -19,8 +19,6 @@ class ScriptedProcesTestCase(TestBase): def tearDown(self): TestBase.tearDown(self) - if "SKIP_SCRIPTED_PROCESS_LAUNCH" in os.environ: - del os.environ["SKIP_SCRIPTED_PROCESS_LAUNCH"] def test_python_plugin_package(self): """Test that the lldb python module has a `plugins.scripted_process` @@ -55,6 +53,10 @@ class ScriptedProcesTestCase(TestBase): self.assertTrue(os.path.isfile(log_file)) os.environ['SKIP_SCRIPTED_PROCESS_LAUNCH'] = '1' + def cleanup(): + del os.environ["SKIP_SCRIPTED_PROCESS_LAUNCH"] + self.addTearDownHook(cleanup) + scripted_process_example_relpath = 'invalid_scripted_process.py' self.runCmd("command script import " + os.path.join(self.getSourceDir(), scripted_process_example_relpath)) @@ -87,6 +89,10 @@ class ScriptedProcesTestCase(TestBase): self.assertTrue(target, VALID_TARGET) os.environ['SKIP_SCRIPTED_PROCESS_LAUNCH'] = '1' + def cleanup(): + del os.environ["SKIP_SCRIPTED_PROCESS_LAUNCH"] + self.addTearDownHook(cleanup) + scripted_process_example_relpath = 'dummy_scripted_process.py' self.runCmd("command script import " + os.path.join(self.getSourceDir(), scripted_process_example_relpath)) @@ -154,6 +160,10 @@ class ScriptedProcesTestCase(TestBase): self.assertTrue(error.Success(), "Reloading main module at offset 0 failed.") os.environ['SKIP_SCRIPTED_PROCESS_LAUNCH'] = '1' + def cleanup(): + del os.environ["SKIP_SCRIPTED_PROCESS_LAUNCH"] + self.addTearDownHook(cleanup) + scripted_process_example_relpath = 'stack_core_scripted_process.py' self.runCmd("command script import " + os.path.join(self.getSourceDir(), scripted_process_example_relpath)) -- cgit v1.2.3