Apply (query-replace "frame variable" "frame variable -t") and fix a comment about 'expr var',
not 'frame variable var'.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@116419 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/array_types/TestArrayTypes.py b/test/array_types/TestArrayTypes.py
index 010afa7..a638e74 100644
--- a/test/array_types/TestArrayTypes.py
+++ b/test/array_types/TestArrayTypes.py
@@ -66,7 +66,7 @@
# Issue 'variable list' command on several array-type variables.
- self.expect("frame variable strings", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t strings", VARIABLES_DISPLAYED_CORRECTLY,
startstr = '(char *[4])',
substrs = ['(char *) strings[0]',
'(char *) strings[1]',
@@ -77,14 +77,14 @@
'Bonjour',
'Guten Tag'])
- self.expect("frame variable char_16", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t char_16", VARIABLES_DISPLAYED_CORRECTLY,
substrs = ['(char) char_16[0]',
'(char) char_16[15]'])
- self.expect("frame variable ushort_matrix", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t ushort_matrix", VARIABLES_DISPLAYED_CORRECTLY,
startstr = '(unsigned short [2][3])')
- self.expect("frame variable long_6", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t long_6", VARIABLES_DISPLAYED_CORRECTLY,
startstr = '(long [6])')
def array_types_python(self):
diff --git a/test/bitfields/TestBitfields.py b/test/bitfields/TestBitfields.py
index b29b5f9..2a10e7f 100644
--- a/test/bitfields/TestBitfields.py
+++ b/test/bitfields/TestBitfields.py
@@ -59,7 +59,7 @@
substrs = [' resolved, hit count = 1'])
# This should display correctly.
- self.expect("frame variable bits", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t bits", VARIABLES_DISPLAYED_CORRECTLY,
substrs = ['(uint32_t:1) b1 = 1,',
'(uint32_t:2) b2 = 3,',
'(uint32_t:3) b3 = 7,',
@@ -71,7 +71,7 @@
# And so should this.
# rdar://problem/8348251
- self.expect("frame variable", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t", VARIABLES_DISPLAYED_CORRECTLY,
substrs = ['(uint32_t:1) b1 = 1,',
'(uint32_t:2) b2 = 3,',
'(uint32_t:3) b3 = 7,',
diff --git a/test/breakpoint_command/TestBreakpointCommand.py b/test/breakpoint_command/TestBreakpointCommand.py
index d14d510..600f609 100644
--- a/test/breakpoint_command/TestBreakpointCommand.py
+++ b/test/breakpoint_command/TestBreakpointCommand.py
@@ -47,7 +47,7 @@
self.line)
# Now add callbacks for the breakpoints just created.
- self.runCmd("breakpoint command add -c -o 'frame variable -s' 1")
+ self.runCmd("breakpoint command add -c -o 'frame variable -t -s' 1")
self.runCmd("breakpoint command add -p -o 'here = open(\"output.txt\", \"w\"); print >> here, \"lldb\"; here.close()' 2")
# Check that the breakpoint commands are correctly set.
@@ -61,7 +61,7 @@
self.expect("breakpoint command list 1", "Breakpoint 1 command ok",
substrs = ["Breakpoint commands:",
- "frame variable -s"])
+ "frame variable -t -s"])
self.expect("breakpoint command list 2", "Breakpoint 2 command ok",
substrs = ["Breakpoint commands:",
"here = open",
diff --git a/test/class_types/TestClassTypes.py b/test/class_types/TestClassTypes.py
index 4172a5b..1749b99 100644
--- a/test/class_types/TestClassTypes.py
+++ b/test/class_types/TestClassTypes.py
@@ -81,7 +81,7 @@
substrs = [' resolved, hit count = 1'])
# We should be stopped on the ctor function of class C.
- self.expect("frame variable this", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t this", VARIABLES_DISPLAYED_CORRECTLY,
substrs = ['C *',
' this = '])
@@ -170,8 +170,8 @@
# Continue on inside the ctor() body...
self.runCmd("thread step-over")
- # Verify that frame variable this->m_c_int behaves correctly.
- self.expect("frame variable this->m_c_int", VARIABLES_DISPLAYED_CORRECTLY,
+ # Verify that frame variable -t this->m_c_int behaves correctly.
+ self.expect("frame variable -t this->m_c_int", VARIABLES_DISPLAYED_CORRECTLY,
startstr = '(int) this->m_c_int = 66')
# rdar://problem/8430916
diff --git a/test/forward/TestForwardDeclaration.py b/test/forward/TestForwardDeclaration.py
index 2555a2a..217c28d 100644
--- a/test/forward/TestForwardDeclaration.py
+++ b/test/forward/TestForwardDeclaration.py
@@ -45,7 +45,7 @@
# This should display correctly.
# Note that the member fields of a = 1 and b = 2 is by design.
- self.expect("frame variable *bar_ptr", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t *bar_ptr", VARIABLES_DISPLAYED_CORRECTLY,
substrs = ['(struct bar *) bar_ptr = ',
'(int) a = 1',
'(int) b = 2'])
diff --git a/test/foundation/TestObjCMethods.py b/test/foundation/TestObjCMethods.py
index 8ad45aa..7e76cab 100644
--- a/test/foundation/TestObjCMethods.py
+++ b/test/foundation/TestObjCMethods.py
@@ -116,7 +116,7 @@
'NSString * str;',
'NSDate * date;'])
- self.expect("frame variable -s", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t -s", VARIABLES_DISPLAYED_CORRECTLY,
substrs = ["ARG: (MyString *) self"],
patterns = ["ARG: \(.*\) _cmd",
"(struct objc_selector *)|(SEL)"])
@@ -124,16 +124,16 @@
# rdar://problem/8492646
# test/foundation fails after updating to tot r115023
# self->str displays nothing as output
- self.expect("frame variable self->str", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t self->str", VARIABLES_DISPLAYED_CORRECTLY,
startstr = "(NSString *) self->str")
# rdar://problem/8447030
# 'frame variable self->date' displays the wrong data member
- self.expect("frame variable self->date", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t self->date", VARIABLES_DISPLAYED_CORRECTLY,
startstr = "(NSDate *) self->date")
# This should display the str and date member fields as well.
- self.expect("frame variable *self", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t *self", VARIABLES_DISPLAYED_CORRECTLY,
substrs = ["(MyString *) self",
"(NSString *) str",
"(NSDate *) date"])
diff --git a/test/function_types/TestFunctionTypes.py b/test/function_types/TestFunctionTypes.py
index 1dd14db..8d856ab 100644
--- a/test/function_types/TestFunctionTypes.py
+++ b/test/function_types/TestFunctionTypes.py
@@ -48,7 +48,7 @@
substrs = [' resolved, hit count = 1'])
# Check that the 'callback' variable display properly.
- self.expect("frame variable callback", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t callback", VARIABLES_DISPLAYED_CORRECTLY,
startstr = '(int (*)(const char *)) callback =')
# And that we can break on the callback function.
diff --git a/test/global_variables/TestGlobalVariables.py b/test/global_variables/TestGlobalVariables.py
index d25085b..239885d 100644
--- a/test/global_variables/TestGlobalVariables.py
+++ b/test/global_variables/TestGlobalVariables.py
@@ -48,7 +48,7 @@
substrs = [' resolved, hit count = 1'])
# Check that GLOBAL scopes are indicated for the variables.
- self.expect("frame variable -s -g -a", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t -s -g -a", VARIABLES_DISPLAYED_CORRECTLY,
substrs = ['GLOBAL: (int) g_file_global_int = 42',
'GLOBAL: (const char *) g_file_global_cstr',
'"g_file_global_cstr"',
diff --git a/test/set_values/TestSetValues.py b/test/set_values/TestSetValues.py
index 10085c0..321cb2c 100644
--- a/test/set_values/TestSetValues.py
+++ b/test/set_values/TestSetValues.py
@@ -72,8 +72,8 @@
substrs = [' resolved, hit count = 1'])
# main.c:15
- # Check that 'frame variable' displays the correct data type and value.
- self.expect("frame variable", VARIABLES_DISPLAYED_CORRECTLY,
+ # Check that 'frame variable -t' displays the correct data type and value.
+ self.expect("frame variable -t", VARIABLES_DISPLAYED_CORRECTLY,
startstr = "(char) i = 'a'")
# TODO:
@@ -82,8 +82,8 @@
self.runCmd("continue")
# main.c:36
- # Check that 'frame variable' displays the correct data type and value.
- self.expect("frame variable", VARIABLES_DISPLAYED_CORRECTLY,
+ # Check that 'frame variable -t' displays the correct data type and value.
+ self.expect("frame variable -t", VARIABLES_DISPLAYED_CORRECTLY,
patterns = ["\((short unsigned int|unsigned short)\) i = 33"])
# TODO:
@@ -92,8 +92,8 @@
self.runCmd("continue")
# main.c:57
- # Check that 'frame variable' displays the correct data type and value.
- self.expect("frame variable", VARIABLES_DISPLAYED_CORRECTLY,
+ # Check that 'frame variable -t' displays the correct data type and value.
+ self.expect("frame variable -t", VARIABLES_DISPLAYED_CORRECTLY,
startstr = "(long int) i = 33")
# TODO:
@@ -102,8 +102,8 @@
self.runCmd("continue")
# main.c:78
- # Check that 'frame variable' displays the correct data type and value.
- self.expect("frame variable", VARIABLES_DISPLAYED_CORRECTLY,
+ # Check that 'frame variable -t' displays the correct data type and value.
+ self.expect("frame variable -t", VARIABLES_DISPLAYED_CORRECTLY,
startstr = "(double) i = 3.14159")
# TODO:
@@ -112,10 +112,10 @@
self.runCmd("continue")
# main.c:85
- # Check that 'frame variable' displays the correct data type and value.
+ # Check that 'frame variable -t' displays the correct data type and value.
# rdar://problem/8422727
# set_values test directory: 'frame variable' shows only (long double) i =
- self.expect("frame variable", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t", VARIABLES_DISPLAYED_CORRECTLY,
startstr = "(long double) i = 3.14159")
# TODO:
diff --git a/test/types/AbstractBase.py b/test/types/AbstractBase.py
index 9ad4ff5..19da271 100644
--- a/test/types/AbstractBase.py
+++ b/test/types/AbstractBase.py
@@ -8,7 +8,7 @@
from lldbtest import *
def Msg(var, val):
- return "'frame variable %s' matches the output (from compiled code): %s" % (var, val)
+ return "'frame variable -t %s' matches the output (from compiled code): %s" % (var, val)
class GenericTester(TestBase):
@@ -70,14 +70,14 @@
# Now iterate through the golden list, comparing against the output from
# 'frame variable var'.
for var, val in gl:
- self.runCmd("frame variable %s" % var)
+ self.runCmd("frame variable -t %s" % var)
output = self.res.GetOutput()
# The input type is in a canonical form as a set named atoms.
# The display type string must conatin each and every element.
#
# Example:
- # runCmd: frame variable a_array_bounded[0]
+ # runCmd: frame variable -t a_array_bounded[0]
# output: (char) a_array_bounded[0] = 'a'
#
try:
@@ -128,7 +128,7 @@
#self.runCmd("frame variable")
# Now iterate through the golden list, comparing against the output from
- # 'frame variable var'.
+ # 'expr var'.
for var, val in gl:
self.runCmd("expr %s" % var)
output = self.res.GetOutput()
diff --git a/test/unsigned_types/TestUnsignedTypes.py b/test/unsigned_types/TestUnsignedTypes.py
index de9fb52..426e06c 100644
--- a/test/unsigned_types/TestUnsignedTypes.py
+++ b/test/unsigned_types/TestUnsignedTypes.py
@@ -50,7 +50,7 @@
substrs = [' resolved, hit count = 1'])
# Test that unsigned types display correctly.
- self.expect("frame variable -a", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -t -a", VARIABLES_DISPLAYED_CORRECTLY,
startstr = "(unsigned char) the_unsigned_char = 'c'",
patterns = ["\((short unsigned int|unsigned short)\) the_unsigned_short = 99"],
substrs = ["(unsigned int) the_unsigned_int = 99",