From abcb1215c964a60ffe1788a382e7d476832defe6 Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Fri, 10 May 2019 23:22:15 +0000 Subject: Change the disabling of packet logging to be in TearDownHook lambdas. llvm-svn: 360482 --- .../functionalities/gdb_remote_client/TestArmRegisterDefinition.py | 6 +++--- .../gdb_remote_client/TestNoWatchpointSupportInfo.py | 5 ++--- .../lldbsuite/test/functionalities/gdb_remote_client/TestStopPCs.py | 5 ++--- .../test/functionalities/gdb_remote_client/TestTargetXMLArch.py | 5 ++--- 4 files changed, 9 insertions(+), 12 deletions(-) (limited to 'lldb/packages/Python/lldbsuite/test') diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestArmRegisterDefinition.py b/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestArmRegisterDefinition.py index 0609f5c34ce..28424f0f362 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestArmRegisterDefinition.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestArmRegisterDefinition.py @@ -110,6 +110,9 @@ class TestArmRegisterDefinition(GDBRemoteTestBase): self.server.responder = MyResponder() if self.TraceOn(): self.runCmd("log enable gdb-remote packets") + self.addTearDownHook( + lambda: self.runCmd("log disable gdb-remote packets")) + self.dbg.SetDefaultArchitecture("armv7em") target = self.dbg.CreateTargetWithFileAndArch(None, None) @@ -126,6 +129,3 @@ class TestArmRegisterDefinition(GDBRemoteTestBase): pc_valobj = process.GetThreadAtIndex(0).GetFrameAtIndex(0).FindRegister("pc") self.assertEqual(pc_valobj.GetValueAsUnsigned(), 0x0800d22e) - - if self.TraceOn(): - self.runCmd("log disable gdb-remote packets") diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py b/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py index eeeb9a5df0f..a9ae29d97ec 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py @@ -41,6 +41,8 @@ class TestNoWatchpointSupportInfo(GDBRemoteTestBase): self.server.responder = MyResponder() if self.TraceOn(): self.runCmd("log enable gdb-remote packets") + self.addTearDownHook( + lambda: self.runCmd("log disable gdb-remote packets")) self.dbg.SetDefaultArchitecture("x86_64") target = self.dbg.CreateTargetWithFileAndArch(None, None) @@ -61,6 +63,3 @@ class TestNoWatchpointSupportInfo(GDBRemoteTestBase): print("watchpoint failed: %s" % strm.GetData()) self.assertTrue(wp.IsValid()) - if self.TraceOn(): - self.runCmd("log disable gdb-remote packets") - diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestStopPCs.py b/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestStopPCs.py index cfe0e9f8d4b..0112e0d7927 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestStopPCs.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestStopPCs.py @@ -35,6 +35,8 @@ class TestStopPCs(GDBRemoteTestBase): target = self.dbg.CreateTarget('') if self.TraceOn(): self.runCmd("log enable gdb-remote packets") + self.addTearDownHook( + lambda: self.runCmd("log disable gdb-remote packets")) process = self.connect(target) self.assertEqual(process.GetNumThreads(), 2) @@ -44,6 +46,3 @@ class TestStopPCs(GDBRemoteTestBase): self.assertEqual(th1.GetThreadID(), 0x2ff0d) self.assertEqual(th0.GetFrameAtIndex(0).GetPC(), 0x10001bc00) self.assertEqual(th1.GetFrameAtIndex(0).GetPC(), 0x10002bc00) - - if self.TraceOn(): - self.runCmd("log disable gdb-remote packets") diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestTargetXMLArch.py b/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestTargetXMLArch.py index b655c00c520..9ea7cc8a4c7 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestTargetXMLArch.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestTargetXMLArch.py @@ -115,6 +115,8 @@ class TestTargetXMLArch(GDBRemoteTestBase): result = lldb.SBCommandReturnObject() if self.TraceOn(): self.runCmd("log enable gdb-remote packets") + self.addTearDownHook( + lambda: self.runCmd("log disable gdb-remote packets")) target = self.dbg.CreateTarget('') self.assertEqual('', target.GetTriple()) @@ -123,6 +125,3 @@ class TestTargetXMLArch(GDBRemoteTestBase): interp.HandleCommand("target list", result) print(result.GetOutput()) self.assertTrue(target.GetTriple().startswith('x86_64-unknown-unknown')) - - if self.TraceOn(): - self.runCmd("log disable gdb-remote packets") -- cgit v1.2.3