Thanks, sorry about that<br><div class="gmail_quote"><div dir="ltr">On Tue, Aug 30, 2016 at 4:25 AM Pavel Labath via lldb-commits <<a href="mailto:lldb-commits@lists.llvm.org">lldb-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: labath<br>
Date: Tue Aug 30 06:17:00 2016<br>
New Revision: 280074<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=280074&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=280074&view=rev</a><br>
Log:<br>
Fix fallout from the GetNameColonValue() refactor (r280000)<br>
<br>
This fixes the linux test suite.<br>
<br>
Modified:<br>
    lldb/trunk/source/Interpreter/Args.cpp<br>
    lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp<br>
<br>
Modified: lldb/trunk/source/Interpreter/Args.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/Args.cpp?rev=280074&r1=280073&r2=280074&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/Args.cpp?rev=280074&r1=280073&r2=280074&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/source/Interpreter/Args.cpp (original)<br>
+++ lldb/trunk/source/Interpreter/Args.cpp Tue Aug 30 06:17:00 2016<br>
@@ -848,6 +848,7 @@ Args::StringToBoolean (const char *s, bo<br>
 bool<br>
 Args::StringToBoolean(llvm::StringRef ref, bool fail_value, bool *success_ptr)<br>
 {<br>
+    ref = ref.trim();<br>
     if (ref.equals_lower("false") ||<br>
         ref.equals_lower("off") ||<br>
         ref.equals_lower("no") ||<br>
@@ -1125,14 +1126,14 @@ Args::StringToGenericRegister(llvm::Stri<br>
                           .Case("fp", LLDB_REGNUM_GENERIC_FP)<br>
                           .Cases("ra", "lr", LLDB_REGNUM_GENERIC_RA)<br>
                           .Case("flags", LLDB_REGNUM_GENERIC_FLAGS)<br>
-                          .Case("arg1\0", LLDB_REGNUM_GENERIC_ARG1)<br>
-                          .Case("arg2\0", LLDB_REGNUM_GENERIC_ARG2)<br>
-                          .Case("arg3\0", LLDB_REGNUM_GENERIC_ARG3)<br>
-                          .Case("arg4\0", LLDB_REGNUM_GENERIC_ARG4)<br>
-                          .Case("arg5\0", LLDB_REGNUM_GENERIC_ARG5)<br>
-                          .Case("arg6\0", LLDB_REGNUM_GENERIC_ARG6)<br>
-                          .Case("arg7\0", LLDB_REGNUM_GENERIC_ARG7)<br>
-                          .Case("arg8\0", LLDB_REGNUM_GENERIC_ARG8)<br>
+                          .Case("arg1", LLDB_REGNUM_GENERIC_ARG1)<br>
+                          .Case("arg2", LLDB_REGNUM_GENERIC_ARG2)<br>
+                          .Case("arg3", LLDB_REGNUM_GENERIC_ARG3)<br>
+                          .Case("arg4", LLDB_REGNUM_GENERIC_ARG4)<br>
+                          .Case("arg5", LLDB_REGNUM_GENERIC_ARG5)<br>
+                          .Case("arg6", LLDB_REGNUM_GENERIC_ARG6)<br>
+                          .Case("arg7", LLDB_REGNUM_GENERIC_ARG7)<br>
+                          .Case("arg8", LLDB_REGNUM_GENERIC_ARG8)<br>
                           .Default(LLDB_INVALID_REGNUM);<br>
     return result;<br>
 }<br>
<br>
Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp?rev=280074&r1=280073&r2=280074&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp?rev=280074&r1=280073&r2=280074&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp (original)<br>
+++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp Tue Aug 30 06:17:00 2016<br>
@@ -1814,7 +1814,10 @@ GDBRemoteCommunicationClient::GetWatchpo<br>
             while (response.GetNameColonValue(name, value))<br>
             {<br>
                 if (name.equals("num"))<br>
+                {<br>
                     value.getAsInteger(0, m_num_supported_hardware_watchpoints);<br>
+                    num = m_num_supported_hardware_watchpoints;<br>
+                }<br>
             }<br>
         }<br>
         else<br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@lists.llvm.org" target="_blank">lldb-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits</a><br>
</blockquote></div>