wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[lldb/test] Avoid globbing in log file handling code 

The glob expression for a test called "test" could match a log file for
a the test "test_foo". Instead of globbing, maintain an explicit list of
log files relevant to the current test.
This commit is contained in:
Pavel Labath 2020-07-14 13:08:52 +02:00
parent b539f01221
commit 3cdbacc464
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lldb/packages/Python/lldbsuite/test/lldbtest.py
View File

@ -576,6 +576,7 @@ class Base(unittest2.TestCase):
# confirm that the file is writeable # confirm that the file is writeable
host_log_path = "{}-host.log".format(log_basename) host_log_path = "{}-host.log".format(log_basename)
open(host_log_path, 'w').close() open(host_log_path, 'w').close()
self.log_files.append(host_log_path)
log_enable = "log enable -Tpn -f {} ".format(host_log_path) log_enable = "log enable -Tpn -f {} ".format(host_log_path)
for channel_with_categories in lldbtest_config.channels: for channel_with_categories in lldbtest_config.channels:
@ -602,6 +603,7 @@ class Base(unittest2.TestCase):
if lldb.remote_platform is None: if lldb.remote_platform is None:
server_log_path = "{}-server.log".format(log_basename) server_log_path = "{}-server.log".format(log_basename)
open(server_log_path, 'w').close() open(server_log_path, 'w').close()
self.log_files.append(server_log_path)
os.environ["LLDB_DEBUGSERVER_LOG_FILE"] = server_log_path os.environ["LLDB_DEBUGSERVER_LOG_FILE"] = server_log_path
# Communicate channels to lldb-server # Communicate channels to lldb-server
@ -623,12 +625,13 @@ class Base(unittest2.TestCase):
# Retrieve the server log (if any) from the remote system. It is assumed the server log # 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 # 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 # 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 # platform.
# fail.
if lldb.remote_platform: if lldb.remote_platform:
lldb.remote_platform.Get( server_log_path = self.getLogBasenameForCurrentTest() + "-server.log"
lldb.SBFileSpec("server.log"), lldb.SBFileSpec( if lldb.remote_platform.Get(
self.getLogBasenameForCurrentTest() + "-server.log")) lldb.SBFileSpec("server.log"),
lldb.SBFileSpec(server_log_path)).Success():
self.log_files.append(server_log_path)
def setPlatformWorkingDir(self): def setPlatformWorkingDir(self):
if not lldb.remote_platform or not configuration.lldb_platform_working_dir: if not lldb.remote_platform or not configuration.lldb_platform_working_dir:
@ -800,11 +803,12 @@ class Base(unittest2.TestCase):
# List of forked process PIDs # List of forked process PIDs
self.forkedProcessPids = [] self.forkedProcessPids = []
# Create a string buffer to record the session info, to be dumped into a # List of log files produced by the current test.
# test case specific file if test failure is encountered. self.log_files = []
self.log_basename = self.getLogBasenameForCurrentTest()
session_file = self.getLogBasenameForCurrentTest()+".log"
self.log_files.append(session_file)
session_file = "{}.log".format(self.log_basename)
# Python 3 doesn't support unbuffered I/O in text mode. Open buffered. # Python 3 doesn't support unbuffered I/O in text mode. Open buffered.
self.session = encoded_file.open(session_file, "utf-8", mode="w") self.session = encoded_file.open(session_file, "utf-8", mode="w")
@ -1218,14 +1222,13 @@ class Base(unittest2.TestCase):
del self.session del self.session
# process the log files # process the log files
log_files_for_this_test = glob.glob(self.log_basename + "*")
if prefix != 'Success' or lldbtest_config.log_success: if prefix != 'Success' or lldbtest_config.log_success:
# keep all log files, rename them to include prefix # keep all log files, rename them to include prefix
src_log_basename = self.getLogBasenameForCurrentTest(None)
dst_log_basename = self.getLogBasenameForCurrentTest(prefix) dst_log_basename = self.getLogBasenameForCurrentTest(prefix)
for src in log_files_for_this_test: for src in self.log_files:
if os.path.isfile(src): if os.path.isfile(src):
dst = src.replace(self.log_basename, dst_log_basename) dst = src.replace(src_log_basename, dst_log_basename)
if os.name == "nt" and os.path.isfile(dst): if os.name == "nt" and os.path.isfile(dst):
# On Windows, renaming a -> b will throw an exception if # On Windows, renaming a -> b will throw an exception if
# b exists. On non-Windows platforms it silently # b exists. On non-Windows platforms it silently
@ -1239,8 +1242,9 @@ class Base(unittest2.TestCase):
os.rename(src, dst) os.rename(src, dst)
else: else:
# success! (and we don't want log files) delete log files # success! (and we don't want log files) delete log files
for log_file in log_files_for_this_test: for log_file in self.log_files:
remove_file(log_file) if os.path.isfile(log_file):
remove_file(log_file)
# ==================================================== # ====================================================
# Config. methods supported through a plugin interface # Config. methods supported through a plugin interface