Ted pointed out that some of test tests that are enabling packet

logging when the testsuite is run with trace mode enabled are leaving
the logging enabled after the tests have finished.  That state
isn't cleared in a --no-multiprocess testsuite run.

llvm-svn: 360480

4 files changed, 17 insertions, 7 deletions

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 6e28d5b5405..0609f5c34ce 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
@@ -109,9 +109,7 @@ class TestArmRegisterDefinition(GDBRemoteTestBase):
 
         self.server.responder = MyResponder()
         if self.TraceOn():
-            interp = self.dbg.GetCommandInterpreter()
-            result = lldb.SBCommandReturnObject()
-            interp.HandleCommand("log enable gdb-remote packets", result)
+            self.runCmd("log enable gdb-remote packets")
         self.dbg.SetDefaultArchitecture("armv7em")
         target = self.dbg.CreateTargetWithFileAndArch(None, None)
 
@@ -128,3 +126,6 @@ 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 66a271e126d..eeeb9a5df0f 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
@@ -40,9 +40,7 @@ class TestNoWatchpointSupportInfo(GDBRemoteTestBase):
 
         self.server.responder = MyResponder()
         if self.TraceOn():
-            interp = self.dbg.GetCommandInterpreter()
-            result = lldb.SBCommandReturnObject()
-            interp.HandleCommand("log enable gdb-remote packets", result)
+            self.runCmd("log enable gdb-remote packets")
         self.dbg.SetDefaultArchitecture("x86_64")
         target = self.dbg.CreateTargetWithFileAndArch(None, None)
 
@@ -62,3 +60,7 @@ class TestNoWatchpointSupportInfo(GDBRemoteTestBase):
             err.GetDescription(strm)
             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 7b733e77e67..cfe0e9f8d4b 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
@@ -44,3 +44,6 @@ 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 57c5ff0aac2..b655c00c520 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
@@ -114,7 +114,8 @@ class TestTargetXMLArch(GDBRemoteTestBase):
         interp = self.dbg.GetCommandInterpreter()
         result = lldb.SBCommandReturnObject()
         if self.TraceOn():
-            interp.HandleCommand("log enable gdb-remote packets", result)
+            self.runCmd("log enable gdb-remote packets")
+
         target = self.dbg.CreateTarget('')
         self.assertEqual('', target.GetTriple())
         process = self.connect(target)
@@ -122,3 +123,6 @@ 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")