[Lldb-commits] [lldb] r237443 - Fix CMICmdArgValPrintValues::Validate & enable 4 tests that were XFAIL'ed in r237437 (MI)

[Ilia K]

Author: ki.stfu
Date: Fri May 15 07:33:04 2015
New Revision: 237443

URL: http://llvm.org/viewvc/llvm-project?rev=237443&view=rev
Log:
Fix CMICmdArgValPrintValues::Validate & enable 4 tests that were XFAIL'ed in r237437 (MI)


Modified:
    lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py
    lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py
    lldb/trunk/tools/lldb-mi/MICmdArgValPrintValues.cpp

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=237443&r1=237442&r2=237443&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py (original)
+++ lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py Fri May 15 07:33:04 2015
@@ -11,7 +11,6 @@ class MiStackTestCase(lldbmi_testcase.Mi
     mydir = TestBase.compute_mydir(__file__)
 
     @lldbmi_test
-    @expectedFailureLinux # The print-values argument can't be parsed correctly on Linux
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_stack_list_arguments(self):
@@ -74,7 +73,6 @@ class MiStackTestCase(lldbmi_testcase.Mi
         self.expect("\^error,msg=\"Command 'stack-list-arguments'\. Thread frame range invalid\"")
 
     @lldbmi_test
-    @expectedFailureLinux # The print-values argument can't be parsed correctly on Linux
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_stack_list_locals(self):
@@ -202,7 +200,6 @@ class MiStackTestCase(lldbmi_testcase.Mi
         self.expect("\^done,locals=\[{name=\"test_str\",value=\".*?Rakaposhi.*?\"},{name=\"var_e\",value=\"24\"},{name=\"ptr\",value=\".*?\"}\]")
 
     @lldbmi_test
-    @expectedFailureLinux # The print-values argument can't be parsed correctly on Linux
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_stack_list_variables(self):

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=237443&r1=237442&r2=237443&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py (original)
+++ lldb/trunk/test/tools/lldb-mi/variable/TestMiVar.py Fri May 15 07:33:04 2015
@@ -11,7 +11,6 @@ class MiVarTestCase(lldbmi_testcase.MiTe
     mydir = TestBase.compute_mydir(__file__)
 
     @lldbmi_test
-    @expectedFailureLinux # The print-values argument can't be parsed correctly on Linux
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
     @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races
     def test_lldbmi_eval(self):

Modified: lldb/trunk/tools/lldb-mi/MICmdArgValPrintValues.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValPrintValues.cpp?rev=237443&r1=237442&r2=237443&view=diff
==============================================================================
--- lldb/trunk/tools/lldb-mi/MICmdArgValPrintValues.cpp (original)
+++ lldb/trunk/tools/lldb-mi/MICmdArgValPrintValues.cpp Fri May 15 07:33:04 2015
@@ -64,13 +64,13 @@ CMICmdArgValPrintValues::Validate(CMICmd
     if (vwArgContext.IsEmpty())
         return MIstatus::success;
 
-    const CMIUtilString &rArg(vwArgContext.GetArgs()[0]);
-    if (IsArgPrintValues(rArg) && ExtractPrintValues(rArg))
+    const CMIUtilString strArg(vwArgContext.GetArgs()[0]);
+    if (IsArgPrintValues(strArg) && ExtractPrintValues(strArg))
     {
         m_bFound = true;
         m_bValid = true;
         m_argValue = GetPrintValues();
-        vwArgContext.RemoveArg(rArg);
+        vwArgContext.RemoveArg(strArg);
         return MIstatus::success;
     }