This revision was automatically updated to reflect the committed changes. Closed by commit rG53b135eeb491: [lldb][NFC] Refactor TestSafeFuncCalls.py (authored by teemperor).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D75497/new/ https://reviews.llvm.org/D75497 Files: lldb/test/API/macosx/safe-to-func-call/TestSafeFuncCalls.py Index: lldb/test/API/macosx/safe-to-func-call/TestSafeFuncCalls.py =================================================================== --- lldb/test/API/macosx/safe-to-func-call/TestSafeFuncCalls.py +++ lldb/test/API/macosx/safe-to-func-call/TestSafeFuncCalls.py @@ -12,12 +12,6 @@ mydir = TestBase.compute_mydir(__file__) - def setUp(self): - # Call super's setUp(). - TestBase.setUp(self) - # Find the line numbers that we will step to in main: - self.main_source = "main.c" - @skipUnlessDarwin @add_test_categories(['pyapi']) def test_with_python_api(self): @@ -27,17 +21,18 @@ target = self.dbg.CreateTarget(exe) self.assertTrue(target, VALID_TARGET) - self.main_source_spec = lldb.SBFileSpec(self.main_source) + self.main_source_spec = lldb.SBFileSpec("main.c") break1 = target.BreakpointCreateByName("stopper", 'a.out') self.assertTrue(break1, VALID_BREAKPOINT) process = target.LaunchSimple( None, None, self.get_process_working_directory()) self.assertTrue(process, PROCESS_IS_VALID) threads = lldbutil.get_threads_stopped_at_breakpoint(process, break1) - if len(threads) != 1: - self.fail("Failed to stop at breakpoint 1.") + self.assertEqual(len(threads), 1, "Failed to stop at breakpoint 1.") - self.check_number_of_threads(process) + self.assertEqual( + process.GetNumThreads(), 2, + "Check that the process has two threads when sitting at the stopper() breakpoint") main_thread = lldb.SBThread() select_thread = lldb.SBThread() @@ -52,19 +47,8 @@ main_thread.IsValid() and select_thread.IsValid(), "Got both expected threads") - self.safe_to_call_func_on_main_thread(main_thread) - self.safe_to_call_func_on_select_thread(select_thread) - - def check_number_of_threads(self, process): - self.assertTrue( - process.GetNumThreads() == 2, - "Check that the process has two threads when sitting at the stopper() breakpoint") - - def safe_to_call_func_on_main_thread(self, main_thread): self.assertTrue(main_thread.SafeToCallFunctions(), "It is safe to call functions on the main thread") - - def safe_to_call_func_on_select_thread(self, select_thread): self.assertTrue( select_thread.SafeToCallFunctions() == False, "It is not safe to call functions on the select thread")
Index: lldb/test/API/macosx/safe-to-func-call/TestSafeFuncCalls.py =================================================================== --- lldb/test/API/macosx/safe-to-func-call/TestSafeFuncCalls.py +++ lldb/test/API/macosx/safe-to-func-call/TestSafeFuncCalls.py @@ -12,12 +12,6 @@ mydir = TestBase.compute_mydir(__file__) - def setUp(self): - # Call super's setUp(). - TestBase.setUp(self) - # Find the line numbers that we will step to in main: - self.main_source = "main.c" - @skipUnlessDarwin @add_test_categories(['pyapi']) def test_with_python_api(self): @@ -27,17 +21,18 @@ target = self.dbg.CreateTarget(exe) self.assertTrue(target, VALID_TARGET) - self.main_source_spec = lldb.SBFileSpec(self.main_source) + self.main_source_spec = lldb.SBFileSpec("main.c") break1 = target.BreakpointCreateByName("stopper", 'a.out') self.assertTrue(break1, VALID_BREAKPOINT) process = target.LaunchSimple( None, None, self.get_process_working_directory()) self.assertTrue(process, PROCESS_IS_VALID) threads = lldbutil.get_threads_stopped_at_breakpoint(process, break1) - if len(threads) != 1: - self.fail("Failed to stop at breakpoint 1.") + self.assertEqual(len(threads), 1, "Failed to stop at breakpoint 1.") - self.check_number_of_threads(process) + self.assertEqual( + process.GetNumThreads(), 2, + "Check that the process has two threads when sitting at the stopper() breakpoint") main_thread = lldb.SBThread() select_thread = lldb.SBThread() @@ -52,19 +47,8 @@ main_thread.IsValid() and select_thread.IsValid(), "Got both expected threads") - self.safe_to_call_func_on_main_thread(main_thread) - self.safe_to_call_func_on_select_thread(select_thread) - - def check_number_of_threads(self, process): - self.assertTrue( - process.GetNumThreads() == 2, - "Check that the process has two threads when sitting at the stopper() breakpoint") - - def safe_to_call_func_on_main_thread(self, main_thread): self.assertTrue(main_thread.SafeToCallFunctions(), "It is safe to call functions on the main thread") - - def safe_to_call_func_on_select_thread(self, select_thread): self.assertTrue( select_thread.SafeToCallFunctions() == False, "It is not safe to call functions on the select thread")
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits