summaryrefslogtreecommitdiffstats
path: root/lldb/test
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/test')
-rw-r--r--lldb/test/array_types/TestArrayTypes.py8
-rw-r--r--lldb/test/bitfields/TestBitfields.py4
-rw-r--r--lldb/test/breakpoint_command/TestBreakpointCommand.py4
-rw-r--r--lldb/test/breakpoint_conditions/TestBreakpointConditions.py8
-rw-r--r--lldb/test/class_types/TestClassTypes.py6
-rw-r--r--lldb/test/cpp/dynamic-value/TestDynamicValue.py31
-rw-r--r--lldb/test/forward/TestForwardDeclaration.py2
-rw-r--r--lldb/test/foundation/TestObjCMethods.py8
-rw-r--r--lldb/test/function_types/TestFunctionTypes.py2
-rw-r--r--lldb/test/global_variables/TestGlobalVariables.py2
-rw-r--r--lldb/test/objc-dynamic-value/TestObjCDynamicValue.py14
-rw-r--r--lldb/test/set_values/TestSetValues.py30
-rw-r--r--lldb/test/signed_types/TestSignedTypes.py2
-rw-r--r--lldb/test/types/AbstractBase.py14
-rw-r--r--lldb/test/unique-types/TestUniqueTypes.py8
-rw-r--r--lldb/test/unsigned_types/TestUnsignedTypes.py2
16 files changed, 74 insertions, 71 deletions
diff --git a/lldb/test/array_types/TestArrayTypes.py b/lldb/test/array_types/TestArrayTypes.py
index f4540b6c0a9..ec243208c3f 100644
--- a/lldb/test/array_types/TestArrayTypes.py
+++ b/lldb/test/array_types/TestArrayTypes.py
@@ -69,7 +69,7 @@ class ArrayTypesTestCase(TestBase):
# Issue 'variable list' command on several array-type variables.
- self.expect("frame variable -t strings", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -T strings", VARIABLES_DISPLAYED_CORRECTLY,
startstr = '(char *[4])',
substrs = ['(char *) [0]',
'(char *) [1]',
@@ -80,14 +80,14 @@ class ArrayTypesTestCase(TestBase):
'Bonjour',
'Guten Tag'])
- self.expect("frame variable -t char_16", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -T char_16", VARIABLES_DISPLAYED_CORRECTLY,
substrs = ['(char) [0]',
'(char) [15]'])
- self.expect("frame variable -t ushort_matrix", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -T ushort_matrix", VARIABLES_DISPLAYED_CORRECTLY,
startstr = '(unsigned short [2][3])')
- self.expect("frame variable -t 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/lldb/test/bitfields/TestBitfields.py b/lldb/test/bitfields/TestBitfields.py
index f99c6e6e3bf..7381f7c7ca6 100644
--- a/lldb/test/bitfields/TestBitfields.py
+++ b/lldb/test/bitfields/TestBitfields.py
@@ -62,7 +62,7 @@ class BitfieldsTestCase(TestBase):
substrs = [' resolved, hit count = 1'])
# This should display correctly.
- self.expect("frame variable -t 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',
@@ -74,7 +74,7 @@ class BitfieldsTestCase(TestBase):
# And so should this.
# rdar://problem/8348251
- self.expect("frame variable -t", 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/lldb/test/breakpoint_command/TestBreakpointCommand.py b/lldb/test/breakpoint_command/TestBreakpointCommand.py
index 30a38428686..c892ea11573 100644
--- a/lldb/test/breakpoint_command/TestBreakpointCommand.py
+++ b/lldb/test/breakpoint_command/TestBreakpointCommand.py
@@ -51,7 +51,7 @@ class BreakpointCommandTestCase(TestBase):
self.line)
# Now add callbacks for the breakpoints just created.
- self.runCmd("breakpoint command add -s command -o 'frame variable -t -s' 1")
+ self.runCmd("breakpoint command add -s command -o 'frame variable -T -s' 1")
self.runCmd("breakpoint command add -s python -o 'here = open(\"output.txt\", \"w\"); print >> here, \"lldb\"; here.close()' 2")
# Check that the breakpoint commands are correctly set.
@@ -69,7 +69,7 @@ class BreakpointCommandTestCase(TestBase):
self.expect("breakpoint command list 1", "Breakpoint 1 command ok",
substrs = ["Breakpoint commands:",
- "frame variable -t -s"])
+ "frame variable -T -s"])
self.expect("breakpoint command list 2", "Breakpoint 2 command ok",
substrs = ["Breakpoint commands:",
"here = open",
diff --git a/lldb/test/breakpoint_conditions/TestBreakpointConditions.py b/lldb/test/breakpoint_conditions/TestBreakpointConditions.py
index aa87630ab17..b3a550c2246 100644
--- a/lldb/test/breakpoint_conditions/TestBreakpointConditions.py
+++ b/lldb/test/breakpoint_conditions/TestBreakpointConditions.py
@@ -62,8 +62,8 @@ class BreakpointConditionsTestCase(TestBase):
self.expect("process status", PROCESS_STOPPED,
patterns = ['Process .* stopped'])
- # 'frame variable -t val' should return 3 due to breakpoint condition.
- self.expect("frame variable -t val", VARIABLES_DISPLAYED_CORRECTLY,
+ # 'frame variable -T val' should return 3 due to breakpoint condition.
+ self.expect("frame variable -T val", VARIABLES_DISPLAYED_CORRECTLY,
startstr = '(int) val = 3')
# Also check the hit count, which should be 3, by design.
@@ -93,8 +93,8 @@ class BreakpointConditionsTestCase(TestBase):
self.expect("process status", PROCESS_STOPPED,
patterns = ['Process .* stopped'])
- # 'frame variable -t val' should return 1 since it is the first breakpoint hit.
- self.expect("frame variable -t val", VARIABLES_DISPLAYED_CORRECTLY,
+ # 'frame variable -T val' should return 1 since it is the first breakpoint hit.
+ self.expect("frame variable -T val", VARIABLES_DISPLAYED_CORRECTLY,
startstr = '(int) val = 1')
diff --git a/lldb/test/class_types/TestClassTypes.py b/lldb/test/class_types/TestClassTypes.py
index a1fdd63df80..0205cc9362e 100644
--- a/lldb/test/class_types/TestClassTypes.py
+++ b/lldb/test/class_types/TestClassTypes.py
@@ -88,7 +88,7 @@ class ClassTypesTestCase(TestBase):
substrs = [' resolved, hit count = 1'])
# We should be stopped on the ctor function of class C.
- self.expect("frame variable -t this", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -T this", VARIABLES_DISPLAYED_CORRECTLY,
substrs = ['C *',
' this = '])
@@ -182,8 +182,8 @@ class ClassTypesTestCase(TestBase):
self.expect("frame variable this",VARIABLES_DISPLAYED_CORRECTLY,
substrs = ['C *'])
- # Verify that frame variable -t this->m_c_int behaves correctly.
- self.expect("frame variable -t 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')
# Verify that 'expression this' gets the data type correct.
diff --git a/lldb/test/cpp/dynamic-value/TestDynamicValue.py b/lldb/test/cpp/dynamic-value/TestDynamicValue.py
index 93a47d5008c..369ce1c0f46 100644
--- a/lldb/test/cpp/dynamic-value/TestDynamicValue.py
+++ b/lldb/test/cpp/dynamic-value/TestDynamicValue.py
@@ -61,7 +61,10 @@ class DynamicValueTestCase(TestBase):
# Now read m_b_value which is only in the dynamic value:
- this_dynamic_m_b_value = this_dynamic.GetChildMemberWithName('m_b_value', True)
+ use_dynamic = lldb.eDynamicCanRunTarget
+ no_dynamic = lldb.eNoDynamicValues
+
+ this_dynamic_m_b_value = this_dynamic.GetChildMemberWithName('m_b_value', use_dynamic)
self.assertTrue (this_dynamic_m_b_value.IsValid())
m_b_value = int (this_dynamic_m_b_value.GetValue(), 0)
@@ -69,17 +72,17 @@ class DynamicValueTestCase(TestBase):
# Make sure it is not in the static version
- this_static_m_b_value = this_static.GetChildMemberWithName('m_b_value', False)
+ this_static_m_b_value = this_static.GetChildMemberWithName('m_b_value', no_dynamic)
self.assertTrue (this_static_m_b_value.IsValid() == False)
# Okay, now let's make sure that we can get the dynamic type of a child element:
- contained_auto_ptr = this_dynamic.GetChildMemberWithName ('m_client_A', True)
+ contained_auto_ptr = this_dynamic.GetChildMemberWithName ('m_client_A', use_dynamic)
self.assertTrue (contained_auto_ptr.IsValid())
- contained_b = contained_auto_ptr.GetChildMemberWithName ('_M_ptr', True)
+ contained_b = contained_auto_ptr.GetChildMemberWithName ('_M_ptr', use_dynamic)
self.assertTrue (contained_b.IsValid())
- contained_b_static = contained_auto_ptr.GetChildMemberWithName ('_M_ptr', False)
+ contained_b_static = contained_auto_ptr.GetChildMemberWithName ('_M_ptr', no_dynamic)
self.assertTrue (contained_b_static.IsValid())
contained_b_addr = int (contained_b.GetValue(), 16)
@@ -128,14 +131,14 @@ class DynamicValueTestCase(TestBase):
# Now find the dynamic addresses of myB and otherB so we can compare them
# with the dynamic values we get in doSomething:
- noDynamic = False
- useDynamic = True
+ use_dynamic = lldb.eDynamicCanRunTarget
+ no_dynamic = lldb.eNoDynamicValues
- myB = frame.FindVariable ('myB', noDynamic);
+ myB = frame.FindVariable ('myB', no_dynamic);
self.assertTrue (myB.IsValid())
myB_loc = int (myB.GetLocation(), 16)
- otherB = frame.FindVariable('otherB', noDynamic)
+ otherB = frame.FindVariable('otherB', no_dynamic)
self.assertTrue (otherB.IsValid())
otherB_loc = int (otherB.GetLocation(), 16)
@@ -149,13 +152,13 @@ class DynamicValueTestCase(TestBase):
# Get "this" using FindVariable:
- this_static = frame.FindVariable ('this', noDynamic)
- this_dynamic = frame.FindVariable ('this', useDynamic)
+ this_static = frame.FindVariable ('this', no_dynamic)
+ this_dynamic = frame.FindVariable ('this', use_dynamic)
self.examine_value_object_of_this_ptr (this_static, this_dynamic, myB_loc)
# Get "this" using FindValue, make sure that works too:
- this_static = frame.FindValue ('this', lldb.eValueTypeVariableArgument, noDynamic)
- this_dynamic = frame.FindValue ('this', lldb.eValueTypeVariableArgument, useDynamic)
+ this_static = frame.FindValue ('this', lldb.eValueTypeVariableArgument, no_dynamic)
+ this_dynamic = frame.FindValue ('this', lldb.eValueTypeVariableArgument, use_dynamic)
self.examine_value_object_of_this_ptr (this_static, this_dynamic, myB_loc)
# Get "this" using the EvaluateExpression:
@@ -167,7 +170,7 @@ class DynamicValueTestCase(TestBase):
# The "frame var" code uses another path to get into children, so let's
# make sure that works as well:
- self.expect('frame var -d 1 anotherA.m_client_A._M_ptr', 'frame var finds its way into a child member',
+ self.expect('frame var -d run-target anotherA.m_client_A._M_ptr', 'frame var finds its way into a child member',
patterns = ['\(.* B \*\)'])
# Now make sure we also get it right for a reference as well:
diff --git a/lldb/test/forward/TestForwardDeclaration.py b/lldb/test/forward/TestForwardDeclaration.py
index 6f324fa86f0..cf8d7ceef83 100644
--- a/lldb/test/forward/TestForwardDeclaration.py
+++ b/lldb/test/forward/TestForwardDeclaration.py
@@ -46,7 +46,7 @@ class ForwardDeclarationTestCase(TestBase):
# This should display correctly.
# Note that the member fields of a = 1 and b = 2 is by design.
- self.expect("frame variable -t *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/lldb/test/foundation/TestObjCMethods.py b/lldb/test/foundation/TestObjCMethods.py
index 9bbf1c08882..a51be3d28d3 100644
--- a/lldb/test/foundation/TestObjCMethods.py
+++ b/lldb/test/foundation/TestObjCMethods.py
@@ -140,7 +140,7 @@ class FoundationTestCase(TestBase):
'NSString * str;',
'NSDate * date;'])
- self.expect("frame variable -t -s", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -T -s", VARIABLES_DISPLAYED_CORRECTLY,
substrs = ["ARG: (MyString *) self"],
patterns = ["ARG: \(.*\) _cmd",
"(struct objc_selector *)|(SEL)"])
@@ -152,16 +152,16 @@ class FoundationTestCase(TestBase):
# rdar://problem/8492646
# test/foundation fails after updating to tot r115023
# self->str displays nothing as output
- self.expect("frame variable -t 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 -t 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 -t *self", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -T *self", VARIABLES_DISPLAYED_CORRECTLY,
substrs = ["(MyString) *self",
"(NSString *) str",
"(NSDate *) date"])
diff --git a/lldb/test/function_types/TestFunctionTypes.py b/lldb/test/function_types/TestFunctionTypes.py
index eb696ec2f13..4a05f18ab27 100644
--- a/lldb/test/function_types/TestFunctionTypes.py
+++ b/lldb/test/function_types/TestFunctionTypes.py
@@ -49,7 +49,7 @@ class FunctionTypesTestCase(TestBase):
substrs = [' resolved, hit count = 1'])
# Check that the 'callback' variable display properly.
- self.expect("frame variable -t 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/lldb/test/global_variables/TestGlobalVariables.py b/lldb/test/global_variables/TestGlobalVariables.py
index 4faab4001e9..d403d76672d 100644
--- a/lldb/test/global_variables/TestGlobalVariables.py
+++ b/lldb/test/global_variables/TestGlobalVariables.py
@@ -49,7 +49,7 @@ class GlobalVariablesTestCase(TestBase):
substrs = [' resolved, hit count = 1'])
# Check that GLOBAL scopes are indicated for the variables.
- self.expect("frame variable -t -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/lldb/test/objc-dynamic-value/TestObjCDynamicValue.py b/lldb/test/objc-dynamic-value/TestObjCDynamicValue.py
index f0b2ce34034..56ceb49bef4 100644
--- a/lldb/test/objc-dynamic-value/TestObjCDynamicValue.py
+++ b/lldb/test/objc-dynamic-value/TestObjCDynamicValue.py
@@ -81,9 +81,9 @@ class ObjCDynamicValueTestCase(TestBase):
# make sure we can get that properly:
frame = thread.GetFrameAtIndex(0)
- myObserver = frame.FindVariable('myObserver')
+ myObserver = frame.FindVariable('myObserver', lldb.eDynamicCanRunTarget)
self.assertTrue (myObserver.IsValid())
- myObserver_source = myObserver.GetChildMemberWithName ('_source')
+ myObserver_source = myObserver.GetChildMemberWithName ('_source', lldb.eDynamicCanRunTarget)
self.examine_SourceDerived_ptr (myObserver_source)
# The "frame var" code uses another path to get into children, so let's
@@ -91,7 +91,7 @@ class ObjCDynamicValueTestCase(TestBase):
result = lldb.SBCommandReturnObject()
- self.expect('frame var -d 1 myObserver->_source', 'frame var finds its way into a child member',
+ self.expect('frame var -d run-target myObserver->_source', 'frame var finds its way into a child member',
patterns = ['\(SourceDerived \*\)'])
# This test is not entirely related to the main thrust of this test case, but since we're here,
@@ -115,8 +115,8 @@ class ObjCDynamicValueTestCase(TestBase):
# Get "object" using FindVariable:
- noDynamic = False
- useDynamic = True
+ noDynamic = lldb.eNoDynamicValues
+ useDynamic = lldb.eDynamicCanRunTarget
object_static = frame.FindVariable ('object', noDynamic)
object_dynamic = frame.FindVariable ('object', useDynamic)
@@ -134,8 +134,8 @@ class ObjCDynamicValueTestCase(TestBase):
# Get "this" using the EvaluateExpression:
# These tests fail for now because EvaluateExpression doesn't currently support dynamic typing...
- #object_static = frame.EvaluateExpression ('object', False)
- #object_dynamic = frame.EvaluateExpression ('object', True)
+ #object_static = frame.EvaluateExpression ('object', noDynamic)
+ #object_dynamic = frame.EvaluateExpression ('object', useDynamic)
#self.examine_value_object_of_object_ptr (object_static, object_dynamic, myB_loc)
# Continue again to the handle_SourceBase and make sure we get the correct dynamic value.
diff --git a/lldb/test/set_values/TestSetValues.py b/lldb/test/set_values/TestSetValues.py
index e17eb714329..1e480f5d4c9 100644
--- a/lldb/test/set_values/TestSetValues.py
+++ b/lldb/test/set_values/TestSetValues.py
@@ -73,63 +73,63 @@ class SetValuesTestCase(TestBase):
substrs = [' resolved, hit count = 1'])
# main.c:15
- # Check that 'frame variable -t' displays the correct data type and value.
- self.expect("frame variable -t", 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'")
# Now set variable 'i' and check that it is correctly displayed.
self.runCmd("expression i = 'b'")
- self.expect("frame variable -t", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -T", VARIABLES_DISPLAYED_CORRECTLY,
startstr = "(char) i = 'b'")
self.runCmd("continue")
# main.c:36
- # Check that 'frame variable -t' displays the correct data type and value.
- self.expect("frame variable -t", 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"])
# Now set variable 'i' and check that it is correctly displayed.
self.runCmd("expression i = 333")
- self.expect("frame variable -t", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -T", VARIABLES_DISPLAYED_CORRECTLY,
patterns = ["\((short unsigned int|unsigned short)\) i = 333"])
self.runCmd("continue")
# main.c:57
- # Check that 'frame variable -t' displays the correct data type and value.
- self.expect("frame variable -t", 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")
# Now set variable 'i' and check that it is correctly displayed.
self.runCmd("expression i = 33333")
- self.expect("frame variable -t", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -T", VARIABLES_DISPLAYED_CORRECTLY,
startstr = "(long int) i = 33333")
self.runCmd("continue")
# main.c:78
- # Check that 'frame variable -t' displays the correct data type and value.
- self.expect("frame variable -t", 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")
# Now set variable 'i' and check that it is correctly displayed.
self.runCmd("expression i = 3.14")
- self.expect("frame variable -t", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -T", VARIABLES_DISPLAYED_CORRECTLY,
startstr = "(double) i = 3.14")
self.runCmd("continue")
# main.c:85
- # Check that 'frame variable -t' 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 -t", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -T", VARIABLES_DISPLAYED_CORRECTLY,
startstr = "(long double) i = 3.14159")
# Now set variable 'i' and check that it is correctly displayed.
self.runCmd("expression i = 3.1")
- self.expect("frame variable -t", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -T", VARIABLES_DISPLAYED_CORRECTLY,
startstr = "(long double) i = 3.1")
diff --git a/lldb/test/signed_types/TestSignedTypes.py b/lldb/test/signed_types/TestSignedTypes.py
index 6dde6906f66..2f7933fa31c 100644
--- a/lldb/test/signed_types/TestSignedTypes.py
+++ b/lldb/test/signed_types/TestSignedTypes.py
@@ -54,7 +54,7 @@ class UnsignedTypesTestCase(TestBase):
self.runCmd("thread step-over")
# Test that signed types display correctly.
- self.expect("frame variable -t -a", VARIABLES_DISPLAYED_CORRECTLY,
+ self.expect("frame variable -T -a", VARIABLES_DISPLAYED_CORRECTLY,
patterns = ["\((short int|short)\) the_signed_short = 99"],
substrs = ["(signed char) the_signed_char = 'c'",
"(int) the_signed_int = 99",
diff --git a/lldb/test/types/AbstractBase.py b/lldb/test/types/AbstractBase.py
index 53b26b982b6..559fa7f803c 100644
--- a/lldb/test/types/AbstractBase.py
+++ b/lldb/test/types/AbstractBase.py
@@ -9,7 +9,7 @@ from lldbtest import *
def Msg(var, val, using_frame_variable):
return "'%s %s' matches the output (from compiled code): %s" % (
- 'frame variable -t' if using_frame_variable else 'expression' ,var, val)
+ 'frame variable -T' if using_frame_variable else 'expression' ,var, val)
class GenericTester(TestBase):
@@ -42,25 +42,25 @@ class GenericTester(TestBase):
#print "golden list:", gl
# Bring the program to the point where we can issue a series of
- # 'frame variable -t' command.
+ # 'frame variable -T' command.
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
self.runCmd("breakpoint set --name Puts")
self.runCmd("run", RUN_SUCCEEDED)
self.runCmd("thread step-out", STEP_OUT_SUCCEEDED)
- #self.runCmd("frame variable -t")
+ #self.runCmd("frame variable -T")
# Now iterate through the golden list, comparing against the output from
- # 'frame variable -t var'.
+ # 'frame variable -T var'.
for var, val in gl:
- self.runCmd("frame variable -t %s" % var)
+ self.runCmd("frame variable -T %s" % var)
output = self.res.GetOutput()
# The input type is in a canonical form as a set of named atoms.
# The display type string must conatin each and every element.
#
# Example:
- # runCmd: frame variable -t a_array_bounded[0]
+ # runCmd: frame variable -T a_array_bounded[0]
# output: (char) a_array_bounded[0] = 'a'
#
try:
@@ -108,7 +108,7 @@ class GenericTester(TestBase):
self.runCmd("run", RUN_SUCCEEDED)
self.runCmd("thread step-out", STEP_OUT_SUCCEEDED)
- #self.runCmd("frame variable -t")
+ #self.runCmd("frame variable -T")
# Now iterate through the golden list, comparing against the output from
# 'expr var'.
diff --git a/lldb/test/unique-types/TestUniqueTypes.py b/lldb/test/unique-types/TestUniqueTypes.py
index 7562e33263e..4d7083884ef 100644
--- a/lldb/test/unique-types/TestUniqueTypes.py
+++ b/lldb/test/unique-types/TestUniqueTypes.py
@@ -59,8 +59,8 @@ class UniqueTypesTestCase(TestBase):
if clang_version < 3:
self.skipTest("rdar://problem/9173060 lldb hangs while running unique-types for clang version < 3")
- # Do a "frame variable -t longs" and verify "long" is in each line of output.
- self.runCmd("frame variable -t longs")
+ # Do a "frame variable -T longs" and verify "long" is in each line of output.
+ self.runCmd("frame variable -T longs")
output = self.res.GetOutput()
for x in [line.strip() for line in output.split(os.linesep)]:
# Skip empty line or closing brace.
@@ -69,8 +69,8 @@ class UniqueTypesTestCase(TestBase):
self.expect(x, "Expect type 'long'", exe=False,
substrs = ['long'])
- # Do a "frame variable -t shorts" and verify "short" is in each line of output.
- self.runCmd("frame variable -t shorts")
+ # Do a "frame variable -T shorts" and verify "short" is in each line of output.
+ self.runCmd("frame variable -T shorts")
output = self.res.GetOutput()
for x in [line.strip() for line in output.split(os.linesep)]:
# Skip empty line or closing brace.
diff --git a/lldb/test/unsigned_types/TestUnsignedTypes.py b/lldb/test/unsigned_types/TestUnsignedTypes.py
index 9b47b66cd31..e8156b5b922 100644
--- a/lldb/test/unsigned_types/TestUnsignedTypes.py
+++ b/lldb/test/unsigned_types/TestUnsignedTypes.py
@@ -51,7 +51,7 @@ class UnsignedTypesTestCase(TestBase):
substrs = [' resolved, hit count = 1'])
# Test that unsigned types display correctly.
- self.expect("frame variable -t -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",
OpenPOWER on IntegriCloud