Re-enable packet logging for GdbRemote/LldbServer tests

[vharron]

Summary

Creates logs in session dir

[vharron]

Only enable lldb-server logs when --channel is set

test/lldbtest.py

def setUp(self):
         # List of spawned subproces.Popen objects
         self.subprocesses = []
 
         # List of forked process PIDs
         self.forkedProcessPids = []
 
         # Create a string buffer to record the session info, to be dumped into a
         # test case specific file if test failure is encountered.
-        log_basename = self.getLogBasenameForCurrentTest()
+        self.log_basename = self.getLogBasenameForCurrentTest()
 
-        session_file = "{}.log".format(log_basename)
+        session_file = "{}.log".format(self.log_basename)
         unbuffered = 0 # 0 is the constant for unbuffered
-        self.session = open(log_basename, "w", unbuffered)
+        self.session = open(session_file, "w", unbuffered)
 
         # Optimistically set __errored__, __failed__, __expected__ to False
         # initially.  If the test errored/failed, the session info
         # (self.session) is then dumped into a session specific file for
         # diagnosis.
         self.__errored__    = False
         self.__failed__     = False
         self.__expected__   = False
def dumpSessionInfo(self):
         print >> self.session, "To rerun this test, issue the following command from the 'test' directory:\n"
         print >> self.session, "./dotest.py %s -v %s %s" % (self.getRunOptions(),
                                                  ('+b' if benchmarks else '-t'),
                                                  self.getRerunArgs())
         self.session.close()
         del self.session
 
         # process the log files
-        src_log_basename = self.getLogBasenameForCurrentTest()
-        log_files_for_this_test = glob.glob(src_log_basename + "*")
+        log_files_for_this_test = glob.glob(self.log_basename + "*")
 
         if prefix != 'Success' or lldbtest_config.log_success:
             # keep all log files, rename them to include prefix
             dst_log_basename = self.getLogBasenameForCurrentTest(prefix)
             for src in log_files_for_this_test:
-                dst = src.replace(src_log_basename, dst_log_basename)
+                dst = src.replace(self.log_basename, dst_log_basename)
                 os.rename(src, dst)
         else:
             # success!  (and we don't want log files) delete log files
             for log_file in log_files_for_this_test:
                 os.unlink(log_file)
 
     # ====================================================
     # Config. methods supported through a plugin interface

test/tools/lldb-server/gdbremote_testcase.py

def init_llgs_test(self, use_named_pipe=True):
             # Remove if it's there.
             self.debug_monitor_exe = re.sub(r' \(deleted\)$', '', shell_command.GetOutput().strip())
         else:
             self.debug_monitor_exe = get_lldb_server_exe()
             if not self.debug_monitor_exe:
                 self.skipTest("lldb-server exe not found")
 
         self.debug_monitor_extra_args = ["gdbserver"]
+
+        if len(lldbtest_config.channels) > 0:
+            self.debug_monitor_extra_args.append("--log-file={}-server.log".format(self.log_basename))
+            self.debug_monitor_extra_args.append("--log-channels={}".format(":".join(lldbtest_config.channels)))
+
         if use_named_pipe:
             (self.named_pipe_path, self.named_pipe, self.named_pipe_fd) = self.create_named_pipe()
 
     def init_debugserver_test(self, use_named_pipe=True):
         self.debug_monitor_exe = get_debugserver_exe()
         if not self.debug_monitor_exe:
             self.skipTest("debugserver exe not found")
-        self.debug_monitor_extra_args = ["--log-file=/tmp/packets-{}.log".format(self._testMethodName), "--log-flags=0x800000"]
+        self.debug_monitor_extra_args = ["--log-file={}-server.log".format(self.log_basename), "--log-flags=0x800000"]
         if use_named_pipe:
             (self.named_pipe_path, self.named_pipe, self.named_pipe_fd) = self.create_named_pipe()
         # The debugserver stub has a race on handling the 'k' command, so it sends an X09 right away, then sends the real X notification
         # when the process truly dies.
         self.stub_sends_two_stop_notifications_on_kill = True
 
     def forward_adb_port(self, source, target, direction, device):
         adb = [ 'adb' ] + ([ '-s', device ] if device else []) + [ direction ]