[Lldb-commits] [lldb] r258414 - Enable test log collection from remote debug servers
Pavel Labath via lldb-commits
lldb-commits at lists.llvm.org
Thu Jan 21 09:54:15 PST 2016
Author: labath
Date: Thu Jan 21 11:54:14 2016
New Revision: 258414
URL: http://llvm.org/viewvc/llvm-project?rev=258414&view=rev
Log:
Enable test log collection from remote debug servers
Summary:
We already have the ability to collect the server logs when doing local debugging. This enables
the collection of remote logs as well. This relies on specifying a relative path "server.log" for
LLDB_DEBUGSERVER_LOG_FILE when starting remote platform. Since we always set the platform working
directory to a fresh folder to avoid conflicts, the actual file path will always be different and
we can pick the logs up from there.
Reviewers: tfiala
Subscribers: lldb-commits
Differential Revision: http://reviews.llvm.org/D16322
Modified:
lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
Modified: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py?rev=258414&r1=258413&r2=258414&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py Thu Jan 21 11:54:14 2016
@@ -1345,7 +1345,7 @@ class Base(unittest2.TestCase):
else:
categories = "default"
- if channel == "gdb-remote":
+ if channel == "gdb-remote" and lldb.remote_platform is None:
# communicate gdb-remote categories to debugserver
os.environ["LLDB_DEBUGSERVER_LOG_FLAGS"] = categories
@@ -1354,12 +1354,15 @@ class Base(unittest2.TestCase):
raise Exception('log enable failed (check LLDB_LOG_OPTION env variable)')
# Communicate log path name to debugserver & lldb-server
- server_log_path = "{}-server.log".format(log_basename)
- open(server_log_path, 'w').close()
- os.environ["LLDB_DEBUGSERVER_LOG_FILE"] = server_log_path
+ # For remote debugging, these variables need to be set when starting the platform
+ # instance.
+ if lldb.remote_platform is None:
+ server_log_path = "{}-server.log".format(log_basename)
+ open(server_log_path, 'w').close()
+ os.environ["LLDB_DEBUGSERVER_LOG_FILE"] = server_log_path
- # Communicate channels to lldb-server
- os.environ["LLDB_SERVER_LOG_CHANNELS"] = ":".join(lldbtest_config.channels)
+ # Communicate channels to lldb-server
+ os.environ["LLDB_SERVER_LOG_CHANNELS"] = ":".join(lldbtest_config.channels)
if len(lldbtest_config.channels) == 0:
return
@@ -1373,6 +1376,15 @@ class Base(unittest2.TestCase):
if not self.res.Succeeded():
raise Exception('log disable failed (check LLDB_LOG_OPTION env variable)')
+ # Retrieve the server log (if any) from the remote system. It is assumed the server log
+ # is writing to the "server.log" file in the current test directory. This can be
+ # achieved by setting LLDB_DEBUGSERVER_LOG_FILE="server.log" when starting remote
+ # platform. If the remote logging is not enabled, then just let the Get() command silently
+ # fail.
+ if lldb.remote_platform:
+ lldb.remote_platform.Get(lldb.SBFileSpec("server.log"),
+ lldb.SBFileSpec(self.getLogBasenameForCurrentTest()+"-server.log"))
+
def setUp(self):
"""Fixture for unittest test case setup.
More information about the lldb-commits
mailing list