summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/source/Core/Debugger.cpp2
-rw-r--r--lldb/test/settings/TestSettings.py3
2 files changed, 1 insertions, 4 deletions
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
index 767b528aa42..eb46c238538 100644
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -1311,7 +1311,7 @@ DebuggerInstanceSettings::ValidTermWidthValue (const char *value, Error err)
char *end = NULL;
const uint32_t width = ::strtoul (value, &end, 0);
- if (end && end == '\0')
+ if (end && end[0] == '\0')
{
if (width >= 10 || width <= 1024)
valid = true;
diff --git a/lldb/test/settings/TestSettings.py b/lldb/test/settings/TestSettings.py
index 733b0af34e5..04e4ad0d288 100644
--- a/lldb/test/settings/TestSettings.py
+++ b/lldb/test/settings/TestSettings.py
@@ -30,9 +30,6 @@ class SettingsCommandTestCase(TestBase):
self.expect("settings show",
substrs = ["prompt (string) = 'lldb2'"])
- @unittest2.expectedFailure
- # rdar://problem/8449849
- # settings test case failure (probably after r114252)
def test_set_term_width(self):
"""Test that 'set term-width' actually changes the term-width."""
OpenPOWER on IntegriCloud