https://github.com/kastiglione created
https://github.com/llvm/llvm-project/pull/110150
None
>From fb0c5eefa9d3f3500a4767a727a0c39f2dff01d2 Mon Sep 17 00:00:00 2001
From: Dave Lee <davelee....@gmail.com>
Date: Wed, 25 Sep 2024 15:07:34 -0700
Subject: [PATCH] [lldb] Fix minor runCmd error message formatting
---
lldb/packages/Python/lldbsuite/test/lldbtest.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py
b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index c6b7ce84109c09..8884ef5933ada8 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -172,9 +172,9 @@
WATCHPOINT_CREATED = "Watchpoint created successfully"
-def CMD_MSG(str):
+def CMD_MSG(command):
"""A generic "Command '%s' did not return successfully" message
generator."""
- return "Command '%s' did not return successfully" % str
+ return f"Command '{command}' did not return successfully"
def COMPLETION_MSG(str_before, str_after, completions):
@@ -990,16 +990,14 @@ def runCmd(self, cmd, msg=None, check=True, trace=False,
inHistory=False):
print("Command '" + cmd + "' failed!", file=sbuf)
if check:
+ if not msg:
+ msg = CMD_MSG(cmd)
output = ""
if self.res.GetOutput():
output += "\nCommand output:\n" + self.res.GetOutput()
if self.res.GetError():
output += "\nError output:\n" + self.res.GetError()
- if msg:
- msg += output
- if cmd:
- cmd += output
- self.assertTrue(self.res.Succeeded(), msg if (msg) else
CMD_MSG(cmd))
+ self.assertTrue(self.res.Succeeded(), msg + output)
def HideStdout(self):
"""Hide output to stdout from the user.
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
