Re: [Lldb-commits] [lldb] r237429 - Fix parsing of print-values arg (MI)
Hello Tamas,
Thanks for attentiveness. I committed it in r237437.
Thanks,
Ilia
On Fri, May 15, 2015 at 2:18 PM, Tamas Berghammer
wrote:
> Hi Ilia,
>
> This CL cause 2 new failure on the Linux build bots (
> http://lab.llvm.org:8011/builders/lldb-x86_64-ubuntu-14.04-cmake/builds/2414).
> Please fix them if it is a trivial or XFAIL them to get the bot green again.
>
> Thanks
> Tamas
>
> On Fri, May 15, 2015 at 10:46 AM, Ilia K wrote:
>
>> Author: ki.stfu
>> Date: Fri May 15 04:46:28 2015
>> New Revision: 237429
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=237429&view=rev
>> Log:
>> Fix parsing of print-values arg (MI)
>>
>> # Add CMICmdArgValPrintValues argument
>> # Rework
>> -stack-list-arguments/-stack-list-locals/-stack-list-variables/-var-update/-var-list-children
>> commands to use the CMICmdArgValPrintValues argument instead of usage
>> of pair of non-mandatory
>> arguments like: CMICmdArgValNumber(0) ||
>> CMICmdArgValLongOptions("no-values")
>>
>>
>> Added:
>> lldb/trunk/tools/lldb-mi/MICmdArgValPrintValues.cpp
>> lldb/trunk/tools/lldb-mi/MICmdArgValPrintValues.h
>> Modified:
>> lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py
>> lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py
>> lldb/trunk/tools/lldb-mi/CMakeLists.txt
>> lldb/trunk/tools/lldb-mi/MICmdCmdStack.cpp
>> lldb/trunk/tools/lldb-mi/MICmdCmdStack.h
>> lldb/trunk/tools/lldb-mi/MICmdCmdVar.cpp
>> lldb/trunk/tools/lldb-mi/MICmdCmdVar.h
>>
>> Modified: lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py
>> URL:
>> http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py?rev=237429&r1=237428&r2=237429&view=diff
>>
>> ==
>> --- lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py (original)
>> +++ lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py Fri May 15
>> 04:46:28 2015
>> @@ -43,16 +43,14 @@ class MiStackTestCase(lldbmi_testcase.Mi
>> # Test that -stack-list-arguments lists stack arguments with all
>> values
>> self.runCmd("-stack-list-arguments 1 0 0")
>>
>>
>> self.expect("\^done,stack-args=\[frame={level=\"0\",args=\[{name=\"argc\",value=\"1\"},{name=\"argv\",value=\".*\"}\]}\]")
>> -# FIXME: first 0 is treated as --no-values
>> self.runCmd("-stack-list-arguments --all-values 0 0")
>> -
>> #self.expect("\^done,stack-args=\[frame={level=\"0\",args=\[{name=\"argc\",value=\"1\"},{name=\"argv\",value=\".*\"}\]}\]")
>> +
>> self.expect("\^done,stack-args=\[frame={level=\"0\",args=\[{name=\"argc\",value=\"1\"},{name=\"argv\",value=\".*\"}\]}\]")
>>
>> # Test that -stack-list-arguments lists stack arguments with
>> simple values
>> self.runCmd("-stack-list-arguments 2 0 1")
>>
>>
>> self.expect("\^done,stack-args=\[frame={level=\"0\",args=\[{name=\"argc\",value=\"1\"},{name=\"argv\",value=\".*\"}\]}")
>> -# FIXME: first 0 is treated as --no-values
>> self.runCmd("-stack-list-arguments --simple-values 0 1")
>> -
>> #self.expect("\^done,stack-args=\[frame={level=\"0\",args=\[{name=\"argc\",value=\"1\"},{name=\"argv\",value=\".*\"}\]}")
>> +
>> self.expect("\^done,stack-args=\[frame={level=\"0\",args=\[{name=\"argc\",value=\"1\"},{name=\"argv\",value=\".*\"}\]}")
>>
>> # Test that an invalid low-frame is handled
>> # FIXME: -1 is treated as unsigned int
>>
>> Modified: lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py
>> URL:
>> http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py?rev=237429&r1=237428&r2=237429&view=diff
>>
>> ==
>> --- lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py (original)
>> +++ lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py Fri May 15
>> 04:46:28 2015
>> @@ -254,12 +254,12 @@ class MiVarTestCase(lldbmi_testcase.MiTe
>>
>>
>> self.expect("\^done,name=\"var_complx_array\",numchild=\"2\",value=\"\[2\]\",type=\"complex_type
>> \[2\]\",thread-id=\"1\",has_more=\"0\"")
>>
>> # Test that -var-list-children lists empty children if range is
>> empty
>> -# FIXME (and that print-values is optional)
>> -self.runCmd("-var-list-children 0 var_complx 0 0")
>> +# (and that print-values is optional)
>> +self.runCmd("-var-list-children var_complx 0 0")
>> self.expect("\^done,numchild=\"0\",has_more=\"1\"")
>> -self.runCmd("-var-list-children 0 var_complx 99 0")
>> +self.runCmd("-var-list-children var_complx 99 0")
>> self.expect("\^done,numchild=\"0\",has_more=\"1\"")
>> -self.runCmd("-var-list-children 0 var_complx 99 3")
>> +self.runCmd("-var-list-children var_complx 99 3")
>> self.expect("\^done,numchild=\"0\",has_more=\"0\"")
>>
>> # Test that -var-list-children lists all children with their
>> values
>> @@ -272,39 +272,32 @@ class MiVarTestCase(lldbmi_testcase
[Lldb-commits] [lldb] r237429 - Fix parsing of print-values arg (MI)
Author: ki.stfu
Date: Fri May 15 04:46:28 2015
New Revision: 237429
URL: http://llvm.org/viewvc/llvm-project?rev=237429&view=rev
Log:
Fix parsing of print-values arg (MI)
# Add CMICmdArgValPrintValues argument
# Rework
-stack-list-arguments/-stack-list-locals/-stack-list-variables/-var-update/-var-list-children
commands to use the CMICmdArgValPrintValues argument instead of usage of pair
of non-mandatory
arguments like: CMICmdArgValNumber(0) || CMICmdArgValLongOptions("no-values")
Added:
lldb/trunk/tools/lldb-mi/MICmdArgValPrintValues.cpp
lldb/trunk/tools/lldb-mi/MICmdArgValPrintValues.h
Modified:
lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py
lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py
lldb/trunk/tools/lldb-mi/CMakeLists.txt
lldb/trunk/tools/lldb-mi/MICmdCmdStack.cpp
lldb/trunk/tools/lldb-mi/MICmdCmdStack.h
lldb/trunk/tools/lldb-mi/MICmdCmdVar.cpp
lldb/trunk/tools/lldb-mi/MICmdCmdVar.h
Modified: lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py?rev=237429&r1=237428&r2=237429&view=diff
==
--- lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py (original)
+++ lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py Fri May 15 04:46:28 2015
@@ -43,16 +43,14 @@ class MiStackTestCase(lldbmi_testcase.Mi
# Test that -stack-list-arguments lists stack arguments with all values
self.runCmd("-stack-list-arguments 1 0 0")
self.expect("\^done,stack-args=\[frame={level=\"0\",args=\[{name=\"argc\",value=\"1\"},{name=\"argv\",value=\".*\"}\]}\]")
-# FIXME: first 0 is treated as --no-values
self.runCmd("-stack-list-arguments --all-values 0 0")
-
#self.expect("\^done,stack-args=\[frame={level=\"0\",args=\[{name=\"argc\",value=\"1\"},{name=\"argv\",value=\".*\"}\]}\]")
+
self.expect("\^done,stack-args=\[frame={level=\"0\",args=\[{name=\"argc\",value=\"1\"},{name=\"argv\",value=\".*\"}\]}\]")
# Test that -stack-list-arguments lists stack arguments with simple
values
self.runCmd("-stack-list-arguments 2 0 1")
self.expect("\^done,stack-args=\[frame={level=\"0\",args=\[{name=\"argc\",value=\"1\"},{name=\"argv\",value=\".*\"}\]}")
-# FIXME: first 0 is treated as --no-values
self.runCmd("-stack-list-arguments --simple-values 0 1")
-
#self.expect("\^done,stack-args=\[frame={level=\"0\",args=\[{name=\"argc\",value=\"1\"},{name=\"argv\",value=\".*\"}\]}")
+
self.expect("\^done,stack-args=\[frame={level=\"0\",args=\[{name=\"argc\",value=\"1\"},{name=\"argv\",value=\".*\"}\]}")
# Test that an invalid low-frame is handled
# FIXME: -1 is treated as unsigned int
Modified: lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py?rev=237429&r1=237428&r2=237429&view=diff
==
--- lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py (original)
+++ lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py Fri May 15 04:46:28 2015
@@ -254,12 +254,12 @@ class MiVarTestCase(lldbmi_testcase.MiTe
self.expect("\^done,name=\"var_complx_array\",numchild=\"2\",value=\"\[2\]\",type=\"complex_type
\[2\]\",thread-id=\"1\",has_more=\"0\"")
# Test that -var-list-children lists empty children if range is empty
-# FIXME (and that print-values is optional)
-self.runCmd("-var-list-children 0 var_complx 0 0")
+# (and that print-values is optional)
+self.runCmd("-var-list-children var_complx 0 0")
self.expect("\^done,numchild=\"0\",has_more=\"1\"")
-self.runCmd("-var-list-children 0 var_complx 99 0")
+self.runCmd("-var-list-children var_complx 99 0")
self.expect("\^done,numchild=\"0\",has_more=\"1\"")
-self.runCmd("-var-list-children 0 var_complx 99 3")
+self.runCmd("-var-list-children var_complx 99 3")
self.expect("\^done,numchild=\"0\",has_more=\"0\"")
# Test that -var-list-children lists all children with their values
@@ -272,39 +272,32 @@ class MiVarTestCase(lldbmi_testcase.MiTe
# Test that -var-list-children lists children without values
self.runCmd("-var-list-children 0 var_complx 0 1")
self.expect("\^done,numchild=\"1\",children=\[child=\{name=\"var_complx\.i\",exp=\"i\",numchild=\"0\",type=\"int\",thread-id=\"1\",has_more=\"0\"\}\],has_more=\"1\"")
-# FIXME: first 0 is treated as --no-values
self.runCmd("-var-list-children --no-values var_complx 0 1")
-#
self.expect("\^done,numchild=\"1\",children=\[child=\{name=\"var_complx\.i\",exp=\"i\",numchild=\"0\",type=\"int\",thread-id=\"1\",has_more=\"0\"\}\],has_more=\"1\"")
+
self.expect("\^done,numchild=\"1\",ch
