[Lldb-commits] [lldb] r219248 - Change this test case so that it no longer fails in the face of Bug 21190. The failure and the bug are entirely unrelated, and it's trivial to write a repro case for that bug anyway, so no need to use this complicated test case

[Enrico Granata]

Author: enrico
Date: Tue Oct  7 17:57:57 2014
New Revision: 219248

URL: http://llvm.org/viewvc/llvm-project?rev=219248&view=rev
Log:
Change this test case so that it no longer fails in the face of Bug 21190. The failure and the bug are entirely unrelated, and it's trivial to write a repro case for that bug anyway, so no need to use this complicated test case

Modified:
    lldb/trunk/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py?rev=219248&r1=219247&r2=219248&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py Tue Oct  7 17:57:57 2014
@@ -156,12 +156,16 @@ class CategoriesDataFormatterTestCase(Te
         # Now add another summary to another category and switch back and forth
         self.runCmd("type category delete Category1 Category2")
 
-        self.runCmd("type summary add Rectangle --summary-string \"Category1\" -w Category1")
-        self.runCmd("type summary add Rectangle --summary-string \"Category2\" -w Category2")
+        self.runCmd("type summary add Rectangle -w Category1 --summary-string \"Category1\"")
+        self.runCmd("type summary add Rectangle -w Category2 --summary-string \"Category2\"")
+
+        self.runCmd("type category list")
 
         self.runCmd("type category enable Category2")
         self.runCmd("type category enable Category1")
         
+        self.runCmd("type summary list -w Category1")
+        
         self.expect("frame variable r1 r2 r3",
                 substrs = ['r1 = Category1',
                            'r2 = Category1',
@@ -191,8 +195,8 @@ class CategoriesDataFormatterTestCase(Te
                                'r3 = {'])
 
         # Check that multiple summaries can go into one category 
-        self.runCmd("type summary add --summary-string \"Width = ${var.w}, Height = ${var.h}\" Rectangle -w Category1")
-        self.runCmd("type summary add --summary-string \"Radius = ${var.r}\" Circle -w Category1")
+        self.runCmd("type summary add -w Category1 --summary-string \"Width = ${var.w}, Height = ${var.h}\" Rectangle")
+        self.runCmd("type summary add -w Category1 --summary-string \"Radius = ${var.r}\" Circle")
         
         self.runCmd("type category enable Category1")
 
@@ -214,7 +218,7 @@ class CategoriesDataFormatterTestCase(Te
                                'c3 = {'])
 
         # Add a regex based summary to a category
-        self.runCmd("type summary add --summary-string \"Radius = ${var.r}\" -x Circle -w Category1")
+        self.runCmd("type summary add -w Category1 --summary-string \"Radius = ${var.r}\" -x Circle")
 
         self.expect("frame variable r1 r2 r3",
                     substrs = ['r1 = Width = ',
@@ -317,7 +321,7 @@ class CategoriesDataFormatterTestCase(Te
         # check that filters work into categories
         self.runCmd("type filter add Rectangle --child w --category RectangleCategory")
         self.runCmd("type category enable RectangleCategory")
-        self.runCmd("type summary add Rectangle --summary-string \" \" -e --category RectangleCategory")
+        self.runCmd("type summary add Rectangle --category RectangleCategory --summary-string \" \" -e")
         self.expect('frame variable r2',
             substrs = ['w = 9'])
         self.runCmd("type summary add Rectangle --summary-string \" \" -e")