diff options
Diffstat (limited to 'lldb/test/lang')
13 files changed, 46 insertions, 46 deletions
diff --git a/lldb/test/lang/c/array_types/TestArrayTypes.py b/lldb/test/lang/c/array_types/TestArrayTypes.py index 2adb567a7cd..9e880036689 100644 --- a/lldb/test/lang/c/array_types/TestArrayTypes.py +++ b/lldb/test/lang/c/array_types/TestArrayTypes.py @@ -71,7 +71,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 --show-types strings", VARIABLES_DISPLAYED_CORRECTLY, startstr = '(char *[4])', substrs = ['(char *) [0]', '(char *) [1]', @@ -82,14 +82,14 @@ class ArrayTypesTestCase(TestBase): 'Bonjour', 'Guten Tag']) - self.expect("frame variable -T char_16", VARIABLES_DISPLAYED_CORRECTLY, + self.expect("frame variable --show-types char_16", VARIABLES_DISPLAYED_CORRECTLY, substrs = ['(char) [0]', '(char) [15]']) - self.expect("frame variable -T ushort_matrix", VARIABLES_DISPLAYED_CORRECTLY, + self.expect("frame variable --show-types ushort_matrix", VARIABLES_DISPLAYED_CORRECTLY, startstr = '(unsigned short [2][3])') - self.expect("frame variable -T long_6", VARIABLES_DISPLAYED_CORRECTLY, + self.expect("frame variable --show-types long_6", VARIABLES_DISPLAYED_CORRECTLY, startstr = '(long [6])') def array_types_python(self): diff --git a/lldb/test/lang/c/bitfields/TestBitfields.py b/lldb/test/lang/c/bitfields/TestBitfields.py index 177242305e8..e9bd2ee359a 100644 --- a/lldb/test/lang/c/bitfields/TestBitfields.py +++ b/lldb/test/lang/c/bitfields/TestBitfields.py @@ -64,7 +64,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 --show-types bits", VARIABLES_DISPLAYED_CORRECTLY, substrs = ['(uint32_t:1) b1 = 1', '(uint32_t:2) b2 = 3', '(uint32_t:3) b3 = 7', @@ -76,7 +76,7 @@ class BitfieldsTestCase(TestBase): # And so should this. # rdar://problem/8348251 - self.expect("frame variable -T", VARIABLES_DISPLAYED_CORRECTLY, + self.expect("frame variable --show-types", VARIABLES_DISPLAYED_CORRECTLY, substrs = ['(uint32_t:1) b1 = 1', '(uint32_t:2) b2 = 3', '(uint32_t:3) b3 = 7', diff --git a/lldb/test/lang/c/forward/TestForwardDeclaration.py b/lldb/test/lang/c/forward/TestForwardDeclaration.py index ee37bc07393..9ae1fe063cc 100644 --- a/lldb/test/lang/c/forward/TestForwardDeclaration.py +++ b/lldb/test/lang/c/forward/TestForwardDeclaration.py @@ -48,7 +48,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 --show-types *bar_ptr", VARIABLES_DISPLAYED_CORRECTLY, substrs = ['(bar) *bar_ptr = ', '(int) a = 1', '(int) b = 2']) diff --git a/lldb/test/lang/c/function_types/TestFunctionTypes.py b/lldb/test/lang/c/function_types/TestFunctionTypes.py index 009065a0e2b..5cc6a8b6c91 100644 --- a/lldb/test/lang/c/function_types/TestFunctionTypes.py +++ b/lldb/test/lang/c/function_types/TestFunctionTypes.py @@ -66,7 +66,7 @@ class FunctionTypesTestCase(TestBase): self.runToBreakpoint() # Check that the 'callback' variable display properly. - self.expect("frame variable -T callback", VARIABLES_DISPLAYED_CORRECTLY, + self.expect("frame variable --show-types callback", VARIABLES_DISPLAYED_CORRECTLY, startstr = '(int (*)(const char *)) callback =') # And that we can break on the callback function. diff --git a/lldb/test/lang/c/global_variables/TestGlobalVariables.py b/lldb/test/lang/c/global_variables/TestGlobalVariables.py index 27b0a7b2528..32a1501f181 100644 --- a/lldb/test/lang/c/global_variables/TestGlobalVariables.py +++ b/lldb/test/lang/c/global_variables/TestGlobalVariables.py @@ -13,13 +13,13 @@ class GlobalVariablesTestCase(TestBase): @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test def test_with_dsym(self): - """Test 'frame variable -s -a' which omits args and shows scopes.""" + """Test 'frame variable --scope --no-args' which omits args and shows scopes.""" self.buildDsym() self.global_variables() @dwarf_test def test_with_dwarf(self): - """Test 'frame variable -s -a' which omits args and shows scopes.""" + """Test 'frame variable --scope --no-args' which omits args and shows scopes.""" self.buildDwarf() self.global_variables() @@ -34,7 +34,7 @@ class GlobalVariablesTestCase(TestBase): self.addTearDownHook(lambda: self.runCmd("settings remove target.env-vars " + self.dylibPath)) def global_variables(self): - """Test 'frame variable -s -a' which omits args and shows scopes.""" + """Test 'frame variable --scope --no-args' which omits args and shows scopes.""" exe = os.path.join(os.getcwd(), "a.out") self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET) @@ -53,7 +53,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 --show-types --scope --show-globals --no-args", 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/lang/c/set_values/TestSetValues.py b/lldb/test/lang/c/set_values/TestSetValues.py index 1fb6e7b161a..5705a04d33c 100644 --- a/lldb/test/lang/c/set_values/TestSetValues.py +++ b/lldb/test/lang/c/set_values/TestSetValues.py @@ -61,63 +61,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 --show-types' displays the correct data type and value. + self.expect("frame variable --show-types", 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 --show-types", 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 --show-types' displays the correct data type and value. + self.expect("frame variable --show-types", 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 --show-types", 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 --show-types' displays the correct data type and value. + self.expect("frame variable --show-types", VARIABLES_DISPLAYED_CORRECTLY, startstr = "(long) 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 --show-types", VARIABLES_DISPLAYED_CORRECTLY, startstr = "(long) 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 --show-types' displays the correct data type and value. + self.expect("frame variable --show-types", 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 --show-types", 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 --show-types' 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 --show-types", 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 --show-types", VARIABLES_DISPLAYED_CORRECTLY, startstr = "(long double) i = 3.1") diff --git a/lldb/test/lang/cpp/class_types/TestClassTypes.py b/lldb/test/lang/cpp/class_types/TestClassTypes.py index f64e778d290..76e8ace4bf1 100644 --- a/lldb/test/lang/cpp/class_types/TestClassTypes.py +++ b/lldb/test/lang/cpp/class_types/TestClassTypes.py @@ -92,7 +92,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 --show-types this", VARIABLES_DISPLAYED_CORRECTLY, substrs = ['C *', ' this = ']) @@ -188,10 +188,10 @@ class ClassTypesTestCase(TestBase): self.expect("frame variable this",VARIABLES_DISPLAYED_CORRECTLY, substrs = ['C *']) - # Verify that frame variable -T this->m_c_int behaves correctly. + # Verify that frame variable --show-types this->m_c_int behaves correctly. self.runCmd("register read pc") self.runCmd("expr m_c_int") - self.expect("frame variable -T this->m_c_int", VARIABLES_DISPLAYED_CORRECTLY, + self.expect("frame variable --show-types 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/lang/cpp/namespace/TestNamespace.py b/lldb/test/lang/cpp/namespace/TestNamespace.py index 9c2c6d75ce7..4bf08a4fc23 100644 --- a/lldb/test/lang/cpp/namespace/TestNamespace.py +++ b/lldb/test/lang/cpp/namespace/TestNamespace.py @@ -66,12 +66,12 @@ class NamespaceTestCase(TestBase): substrs = slist) # 'frame variable' with basename 'i' should work. - self.expect("frame variable -c -g i", + self.expect("frame variable --show-declaration --show-globals i", startstr = "main.cpp:%d: (int) (anonymous namespace)::i = 3" % self.line_var_i) # main.cpp:12: (int) (anonymous namespace)::i = 3 # 'frame variable' with basename 'j' should work, too. - self.expect("frame variable -c -g j", + self.expect("frame variable --show-declaration --show-globals j", startstr = "main.cpp:%d: (int) A::B::j = 4" % self.line_var_j) # main.cpp:19: (int) A::B::j = 4 diff --git a/lldb/test/lang/cpp/signed_types/TestSignedTypes.py b/lldb/test/lang/cpp/signed_types/TestSignedTypes.py index d015c974b5c..ebc2c3e6dbc 100644 --- a/lldb/test/lang/cpp/signed_types/TestSignedTypes.py +++ b/lldb/test/lang/cpp/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 --show-types --no-args", 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/lang/cpp/unique-types/TestUniqueTypes.py b/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py index 891d31dd6bc..c1414c1e8be 100644 --- a/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py +++ b/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py @@ -58,8 +58,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 --show-types longs" and verify "long" is in each line of output. + self.runCmd("frame variable --show-types longs") output = self.res.GetOutput() for x in [line.strip() for line in output.split(os.linesep)]: # Skip empty line or closing brace. @@ -68,8 +68,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 --show-types shorts" and verify "short" is in each line of output. + self.runCmd("frame variable --show-types 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/lang/cpp/unsigned_types/TestUnsignedTypes.py b/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py index 3ddc2510954..6231673c54c 100644 --- a/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py +++ b/lldb/test/lang/cpp/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 --show-types --no-args", 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", diff --git a/lldb/test/lang/objc/foundation/TestObjCMethods.py b/lldb/test/lang/objc/foundation/TestObjCMethods.py index 0896fc4ed23..1d1c7ac5ede 100644 --- a/lldb/test/lang/objc/foundation/TestObjCMethods.py +++ b/lldb/test/lang/objc/foundation/TestObjCMethods.py @@ -146,7 +146,7 @@ class FoundationTestCase(TestBase): 'NSString * str;', 'NSDate * date;']) - self.expect("frame variable -T -s", VARIABLES_DISPLAYED_CORRECTLY, + self.expect("frame variable --show-types --scope", VARIABLES_DISPLAYED_CORRECTLY, substrs = ["ARG: (MyString *) self"], patterns = ["ARG: \(.*\) _cmd", "(objc_selector *)|(SEL)"]) @@ -158,16 +158,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 --show-types 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 --show-types 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 --show-types *self", VARIABLES_DISPLAYED_CORRECTLY, substrs = ["(MyString) *self", "(NSString *) str", "(NSDate *) date"]) diff --git a/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py b/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py index ad0df1dd511..16466d68cbb 100644 --- a/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py +++ b/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py @@ -48,13 +48,13 @@ class Rdar10967107TestCase(TestBase): self.runCmd("run", RUN_SUCCEEDED) # check that we correctly see the const char*, even with dynamic types on self.expect("frame variable my_string", substrs = ['const char *']) - self.expect("frame variable my_string -d run-target", substrs = ['const char *']) + self.expect("frame variable my_string --dynamic-type run-target", substrs = ['const char *']) # check that expr also gets it right self.expect("expr my_string", substrs = ['const char *']) self.expect("expr -d true -- my_string", substrs = ['const char *']) # but check that we get the real Foolie as such self.expect("frame variable my_foolie", substrs = ['FoolMeOnce *']) - self.expect("frame variable my_foolie -d run-target", substrs = ['FoolMeOnce *']) + self.expect("frame variable my_foolie --dynamic-type run-target", substrs = ['FoolMeOnce *']) # check that expr also gets it right self.expect("expr my_foolie", substrs = ['FoolMeOnce *']) self.expect("expr -d true -- my_foolie", substrs = ['FoolMeOnce *']) @@ -62,13 +62,13 @@ class Rdar10967107TestCase(TestBase): self.runCmd("next") # check that we correctly see the const char*, even with dynamic types on self.expect("frame variable my_string", substrs = ['const char *']) - self.expect("frame variable my_string -d run-target", substrs = ['const char *']) + self.expect("frame variable my_string --dynamic-type run-target", substrs = ['const char *']) # check that expr also gets it right self.expect("expr my_string", substrs = ['const char *']) self.expect("expr -d true -- my_string", substrs = ['const char *']) # but check that we get the real Foolie as such self.expect("frame variable my_foolie", substrs = ['FoolMeOnce *']) - self.expect("frame variable my_foolie -d run-target", substrs = ['FoolMeOnce *']) + self.expect("frame variable my_foolie --dynamic-type run-target", substrs = ['FoolMeOnce *']) # check that expr also gets it right self.expect("expr my_foolie", substrs = ['FoolMeOnce *']) self.expect("expr -d true -- my_foolie", substrs = ['FoolMeOnce *']) |
