summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python/lldbsuite/test/lldbtest.py
diff options
context:
space:
mode:
authorPavel Labath <pavel@labath.sk>2019-08-14 08:11:20 +0000
committerPavel Labath <pavel@labath.sk>2019-08-14 08:11:20 +0000
commit72ef113d40ef57d9dd4cf7ba6819e2048df99fc6 (patch)
tree2f9a8ca0bdf41f0e1f550713d67aced265fc8616 /lldb/packages/Python/lldbsuite/test/lldbtest.py
parent1427226fe8c363b454a06ead02b041b1f658fe8f (diff)
downloadbcm5719-llvm-72ef113d40ef57d9dd4cf7ba6819e2048df99fc6.tar.gz
bcm5719-llvm-72ef113d40ef57d9dd4cf7ba6819e2048df99fc6.zip
[API] Have SBCommandReturnObject::GetOutput/Error return "" instead of nullptr
Summary: It seems this was an unintended side-effect of D26698. AFAICT, these functions did return an empty string before that patch, and the patch contained code which attempted to ensure that, but those efforts were negated by ConstString::AsCString, which by default returns a nullptr even for empty strings. This patch: - fixes the GetOutput/Error methods to really return empty strings - adds and explicit test for that - removes a workaround in lldbtest.py, which was masking this problem from our other tests Reviewers: jingham, clayborg Subscribers: zturner, lldb-commits Differential Revision: https://reviews.llvm.org/D65739 llvm-svn: 368806
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/lldbtest.py')
-rw-r--r--lldb/packages/Python/lldbsuite/test/lldbtest.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index adbd0ec369b..dd4651c9eff 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -2318,8 +2318,6 @@ FileCheck output:
with recording(self, trace) as sbuf:
print("looking at:", output, file=sbuf)
- if output is None:
- output = ""
# The heading says either "Expecting" or "Not expecting".
heading = "Expecting" if matching else "Not expecting"
OpenPOWER on IntegriCloud