Index: lldb/trunk/test/tools/lldb-gdbserver/gdbremote_testcase.py
===================================================================
--- lldb/trunk/test/tools/lldb-gdbserver/gdbremote_testcase.py
+++ lldb/trunk/test/tools/lldb-gdbserver/gdbremote_testcase.py
@@ -137,7 +137,9 @@
         self.debug_monitor_exe = get_lldb_gdbserver_exe()
         if not self.debug_monitor_exe:
             self.skipTest("lldb_gdbserver exe not found")
-        self.debug_monitor_extra_args = " -c 'log enable -T -f process-{}.log lldb break process thread' -c 'log enable -T -f packets-{}.log gdb-remote packets'".format(self.id(), self.id(), self.id())
+        dname = os.path.join(os.environ["LLDB_TEST"],
+                             os.environ["LLDB_SESSION_DIRNAME"])
+        self.debug_monitor_extra_args = " -c 'log enable -T -f {}/process-{}.log lldb break process thread' -c 'log enable -T -f {}/packets-{}.log gdb-remote packets'".format(dname, self.id(), dname, self.id())
         if use_named_pipe:
             (self.named_pipe_path, self.named_pipe, self.named_pipe_fd) = self.create_named_pipe()