Short option for --summary-string in 'type summary add' is now -s. This might be a breaking change for those who have summaries defined.

llvm-svn: 138331

1 files changed, 22 insertions, 22 deletions

diff --git a/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py b/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
index 1667aeb25ef..3228cafcb6f 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
@@ -94,19 +94,19 @@ class DataFormatterTestCase(TestBase):
         self.expect("type format delete Speed", error=True,
             substrs = ['no custom format for Speed'])
         
-        self.runCmd("type summary add -f \"arr = ${var%s}\" -x \"char \\[[0-9]+\\]\" -v")
+        self.runCmd("type summary add --summary-string \"arr = ${var%s}\" -x \"char \\[[0-9]+\\]\" -v")
         
         self.expect("frame variable strarr",
                     substrs = ['arr = "Hello world!"'])
         
         self.runCmd("type summary clear")
         
-        self.runCmd("type summary add -f \"ptr = ${var%s}\" \"char *\" -v")
+        self.runCmd("type summary add --summary-string \"ptr = ${var%s}\" \"char *\" -v")
         
         self.expect("frame variable strptr",
                     substrs = ['ptr = "Hello world!"'])
         
-        self.runCmd("type summary add -f \"arr = ${var%s}\" -x \"char \\[[0-9]+\\]\" -v")
+        self.runCmd("type summary add --summary-string \"arr = ${var%s}\" -x \"char \\[[0-9]+\\]\" -v")
         
         self.expect("frame variable strarr",
                     substrs = ['arr = "Hello world!'])
@@ -124,18 +124,18 @@ class DataFormatterTestCase(TestBase):
             substrs = ['Point',
                        'one-line'])
 
-        self.runCmd("type summary add -f \"y=${var.y%x}\" Point")
+        self.runCmd("type summary add --summary-string \"y=${var.y%x}\" Point")
 
         self.expect("frame variable iAmSomewhere",
             substrs = ['y=0x'])
         
-        self.runCmd("type summary add -f \"y=${var.y},x=${var.x}\" Point")
+        self.runCmd("type summary add --summary-string \"y=${var.y},x=${var.x}\" Point")
         
         self.expect("frame variable iAmSomewhere",
                     substrs = ['y=6',
                                'x=4'])
 
-        self.runCmd("type summary add -f \"hello\" Point -e")
+        self.runCmd("type summary add --summary-string \"hello\" Point -e")
 
         self.expect("type summary list",
             substrs = ['Point',
@@ -146,25 +146,25 @@ class DataFormatterTestCase(TestBase):
                        'x = 4',
                        '}'])
 
-        self.runCmd("type summary add -f \"Sign: ${var[31]%B} Exponent: ${var[23-30]%x} Mantissa: ${var[0-22]%u}\" ShowMyGuts")
+        self.runCmd("type summary add --summary-string \"Sign: ${var[31]%B} Exponent: ${var[23-30]%x} Mantissa: ${var[0-22]%u}\" ShowMyGuts")
 
         self.expect("frame variable cool_pointer->floating",
             substrs = ['Sign: true',
                        'Exponent: 0x',
                        '80'])
 
-        self.runCmd("type summary add -f \"a test\" i_am_cool")
+        self.runCmd("type summary add --summary-string \"a test\" i_am_cool")
 
         self.expect("frame variable cool_pointer",
             substrs = ['a test'])
 
-        self.runCmd("type summary add -f \"a test\" i_am_cool --skip-pointers")
+        self.runCmd("type summary add --summary-string \"a test\" i_am_cool --skip-pointers")
         
         self.expect("frame variable cool_pointer",
             substrs = ['a test'],
             matching = False)
 
-        self.runCmd("type summary add -f \"${var[1-3]}\" \"int [5]\"")
+        self.runCmd("type summary add --summary-string \"${var[1-3]}\" \"int [5]\"")
 
         self.expect("frame variable int_array",
             substrs = ['2',
@@ -173,8 +173,8 @@ class DataFormatterTestCase(TestBase):
 
         self.runCmd("type summary clear")
 
-        self.runCmd("type summary add -f \"${var[0-2].integer}\" \"i_am_cool *\"")
-        self.runCmd("type summary add -f \"${var[2-4].integer}\" \"i_am_cool [5]\"")
+        self.runCmd("type summary add --summary-string \"${var[0-2].integer}\" \"i_am_cool *\"")
+        self.runCmd("type summary add --summary-string \"${var[2-4].integer}\" \"i_am_cool [5]\"")
 
         self.expect("frame variable cool_array",
             substrs = ['1,1,6'])
@@ -183,7 +183,7 @@ class DataFormatterTestCase(TestBase):
             substrs = ['3,0,0'])
 
         # test special symbols for formatting variables into summaries
-        self.runCmd("type summary add -f \"cool object @ ${var%L}\" i_am_cool")
+        self.runCmd("type summary add --summary-string \"cool object @ ${var%L}\" i_am_cool")
         self.runCmd("type summary delete \"i_am_cool [5]\"")
         
         # this test might fail if the compiler tries to store
@@ -197,7 +197,7 @@ class DataFormatterTestCase(TestBase):
                        '[4] = cool object @ 0x'])
                             
         # test getting similar output by exploiting ${var} = 'type @ location' for aggregates
-        self.runCmd("type summary add -f \"${var}\" i_am_cool")
+        self.runCmd("type summary add --summary-string \"${var}\" i_am_cool")
         
         # this test might fail if the compiler tries to store
         # these values into registers.. hopefully this is not
@@ -211,7 +211,7 @@ class DataFormatterTestCase(TestBase):
 
             
         # test getting same output by exploiting %T and %L together for aggregates
-        self.runCmd("type summary add -f \"${var%T} @ ${var%L}\" i_am_cool")
+        self.runCmd("type summary add --summary-string \"${var%T} @ ${var%L}\" i_am_cool")
         
         # this test might fail if the compiler tries to store
         # these values into registers.. hopefully this is not
@@ -223,37 +223,37 @@ class DataFormatterTestCase(TestBase):
                                '[3] = i_am_cool @ 0x',
                                '[4] = i_am_cool @ 0x'])
                             
-        self.runCmd("type summary add -f \"goofy\" i_am_cool")
-        self.runCmd("type summary add -f \"${var.second_cool%S}\" i_am_cooler")
+        self.runCmd("type summary add --summary-string \"goofy\" i_am_cool")
+        self.runCmd("type summary add --summary-string \"${var.second_cool%S}\" i_am_cooler")
 
         self.expect("frame variable the_coolest_guy",
             substrs = ['(i_am_cooler) the_coolest_guy = goofy'])
 
         # check that unwanted type specifiers are removed
         self.runCmd("type summary delete i_am_cool")
-        self.runCmd("type summary add -f \"goofy\" \"class i_am_cool\"")
+        self.runCmd("type summary add --summary-string \"goofy\" \"class i_am_cool\"")
         self.expect("frame variable the_coolest_guy",
                 substrs = ['(i_am_cooler) the_coolest_guy = goofy'])
 
         self.runCmd("type summary delete i_am_cool")
-        self.runCmd("type summary add -f \"goofy\" \"enum i_am_cool\"")
+        self.runCmd("type summary add --summary-string \"goofy\" \"enum i_am_cool\"")
         self.expect("frame variable the_coolest_guy",
                     substrs = ['(i_am_cooler) the_coolest_guy = goofy'])
 
         self.runCmd("type summary delete i_am_cool")
-        self.runCmd("type summary add -f \"goofy\" \"struct i_am_cool\"")
+        self.runCmd("type summary add --summary-string \"goofy\" \"struct i_am_cool\"")
         self.expect("frame variable the_coolest_guy",
                     substrs = ['(i_am_cooler) the_coolest_guy = goofy'])
 
         # many spaces, but we still do the right thing
         self.runCmd("type summary delete i_am_cool")
-        self.runCmd("type summary add -f \"goofy\" \"union     i_am_cool\"")
+        self.runCmd("type summary add --summary-string \"goofy\" \"union     i_am_cool\"")
         self.expect("frame variable the_coolest_guy",
                     substrs = ['(i_am_cooler) the_coolest_guy = goofy'])
 
         # but that not *every* specifier is removed
         self.runCmd("type summary delete i_am_cool")
-        self.runCmd("type summary add -f \"goofy\" \"wrong i_am_cool\"")
+        self.runCmd("type summary add --summary-string \"goofy\" \"wrong i_am_cool\"")
         self.expect("frame variable the_coolest_guy", matching=False,
                     substrs = ['(i_am_cooler) the_coolest_guy = goofy'])