Skip to content

Commit 506119e

Browse files
kastiglionekastiglione
authored
[lldb] Replace use of v/var aliases in Swift tests (NFC) (#9351) (#9480)
This change is for two reasons: > prefer `frame variable` over `v` since `v` is technically an alias, so there is a chance that it will be re-aliased later on to something else. See #9320 (comment) Additionally, using `frame var` makes it easier to grep for than using `v`. (cherry-picked from commit ab5b104)
1 parent bb0d374 commit 506119e

File tree

21 files changed

+59
-59
lines changed

21 files changed

+59
-59
lines changed

‎lldb/test/API/lang/swift/c_type_external_provider/TestSwiftCTypeExternalProvider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_swift_regex(self):
2525
self, 'Set breakpoint here', self.main_source_spec)
2626

2727
# Consult the second field to ensure we call GetIndexOfChildMemberWithName.
28-
self.expect('v dummy.second', substrs=['2'])
28+
self.expect('frame var dummy.second', substrs=['2'])
2929

3030
# Make sure we look up the type with the external type info provider.
3131
provider_log_found = False

‎lldb/test/API/lang/swift/c_type_ivar/TestSwiftCTypeIvar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def test(self):
1717
lldbutil.run_to_source_breakpoint(
1818
self, "break here", lldb.SBFileSpec("main.swift")
1919
)
20-
# self.expect('v a', substrs=['asdf'])
20+
# self.expect('frame var a', substrs=['asdf'])
2121
a = self.frame().FindVariable("a")
2222
lldbutil.check_variable(
2323
self,

‎lldb/test/API/lang/swift/cxx_interop/backward/format-actors/TestSwiftBackwardInteropFormatActors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ def test_class(self):
1515
_, _, _, _= lldbutil.run_to_source_breakpoint(
1616
self, 'Set breakpoint here', lldb.SBFileSpec('main.cpp'))
1717

18-
self.expect('v actor', substrs=['Actor', 'str = "Hello"'])
18+
self.expect('frame var actor', substrs=['Actor', 'str = "Hello"'])

‎lldb/test/API/lang/swift/cxx_interop/backward/format-swift-stdlib-types/TestSwiftBackwardInteropFormatSwiftStdlibTypes.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,33 @@ def setup(self, bkpt_str):
1717
@swiftTest
1818
def test_array(self):
1919
self.setup('break here for array')
20-
self.expect('v array', substrs=['Swift.Array<a.SwiftClass>',
20+
self.expect('frame var array', substrs=['Swift.Array<a.SwiftClass>',
2121
'[0]', 'str = "Hello from the Swift class!"',
2222
'[1]', 'str = "Hello from the Swift class!"',])
2323

2424
@swiftTest
2525
def test_array_of_ints(self):
2626
self.setup('break here for array of ints')
2727

28-
self.expect('v array', substrs=['Swift.Array<Swift.Int32>', '1', '2', '3', '4'])
28+
self.expect('frame var array', substrs=['Swift.Array<Swift.Int32>', '1', '2', '3', '4'])
2929

3030
@swiftTest
3131
def test_optional(self):
3232
self.setup('break here for optional')
3333

34-
self.expect('v optional', substrs=['Swift.Optional<a.SwiftClass>',
34+
self.expect('frame var optional', substrs=['Swift.Optional<a.SwiftClass>',
3535
'str = "Hello from the Swift class!"'])
3636

3737
@swiftTest
3838
def test_optional_primitive(self):
3939
self.setup('break here for optional primitive')
4040

41-
self.expect('v optional', substrs=['Swift.Optional<Swift.Double>',
41+
self.expect('frame var optional', substrs=['Swift.Optional<Swift.Double>',
4242
'4.2'])
4343

4444
@swiftTest
4545
def test_string(self):
4646
self.setup('break here for string')
4747

48-
self.expect('v string', substrs=['"Hello from Swift!"'])
48+
self.expect('frame var string', substrs=['"Hello from Swift!"'])
4949

‎lldb/test/API/lang/swift/cxx_interop/backward/format-swift-types-in-cxx/TestSwiftBackwardInteropFormatSwiftTypesInCxx.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def setup(self, bkpt_str):
1818
def test_class(self):
1919
self.setup('Break here for class')
2020

21-
self.expect('v swiftClass', substrs=['SwiftClass', 'field = 42',
21+
self.expect('frame var swiftClass', substrs=['SwiftClass', 'field = 42',
2222
'arr = 4 values', '[0] = "An"', '[1] = "array"', '[2] = "of"',
2323
'[3] = "strings"'])
2424
self.expect('expr swiftClass', substrs=['SwiftClass', 'field = 42',
@@ -29,7 +29,7 @@ def test_class(self):
2929
def test_subclass(self):
3030
self.setup('Break here for subclass')
3131

32-
self.expect('v swiftSublass', substrs=['SwiftSubclass', 'field = 42',
32+
self.expect('frame var swiftSublass', substrs=['SwiftSubclass', 'field = 42',
3333
'arr = 4 values', '[0] = "An"', '[1] = "array"', '[2] = "of"',
3434
'[3] = "strings"', 'extraField = "this is an extra subclass field"'])
3535
self.expect('expr swiftSublass', substrs=['SwiftSubclass', 'field = 42',
@@ -40,7 +40,7 @@ def test_subclass(self):
4040
def test_struct(self):
4141
self.setup('Break here for struct')
4242

43-
self.expect('v swiftStruct', substrs=['SwiftStruct', 'str = "Hello this is a big string"',
43+
self.expect('frame var swiftStruct', substrs=['SwiftStruct', 'str = "Hello this is a big string"',
4444
'boolean = true'])
4545
self.expect('expr swiftStruct', substrs=['SwiftStruct', 'str = "Hello this is a big string"',
4646
'boolean = true'])
@@ -49,7 +49,7 @@ def test_struct(self):
4949
def test_generic_struct(self):
5050
self.setup('Break here for generic struct')
5151

52-
self.expect('v wrapper', substrs=['a.GenericStructPair<a.SwiftClass, a.SwiftStruct>',
52+
self.expect('frame var wrapper', substrs=['a.GenericStructPair<a.SwiftClass, a.SwiftStruct>',
5353
'field = 42', 'arr = 4 values', '[0] = "An"', '[1] = "array"', '[2] = "of"',
5454
'[3] = "strings"', 'str = "Hello this is a big string"', 'boolean = true'])
5555
self.expect('expr wrapper', substrs=['a.GenericStructPair<a.SwiftClass, a.SwiftStruct>',
@@ -61,7 +61,7 @@ def test_generic_struct(self):
6161
def test_generic_enum(self):
6262
self.setup('Break here for generic enum')
6363

64-
self.expect('v swiftEnum', substrs=['a.GenericEnum<a.SwiftClass>', 'some',
64+
self.expect('frame var swiftEnum', substrs=['a.GenericEnum<a.SwiftClass>', 'some',
6565
'field = 42', 'arr = 4 values', '[0] = "An"', '[1] = "array"', '[2] = "of"',
6666
'[3] = "strings"'])
6767
self.expect('expr swiftEnum', substrs=['a.GenericEnum<a.SwiftClass>', 'some',
@@ -73,7 +73,7 @@ def test_generic_enum(self):
7373
def test_swift_ivars(self):
7474
self.setup('Break here for swift ivars')
7575

76-
self.expect('v type_with_ivars', substrs=['TypeWithSwiftIvars', 'swiftClass',
76+
self.expect('frame var type_with_ivars', substrs=['TypeWithSwiftIvars', 'swiftClass',
7777
'field = 42', 'arr = 4 values', '[0] = "An"', '[1] = "array"', '[2] = "of"',
7878
'[3] = "strings"', 'swiftSubclass', 'field = 42', 'arr = 4 values',
7979
'[0] = "An"', '[1] = "array"', '[2] = "of"', '[3] = "strings"',
@@ -90,7 +90,7 @@ def test_swift_ivars(self):
9090
def test_typealias(self):
9191
self.setup('Break here for swift alias')
9292

93-
self.expect('v aliased', substrs=['SwiftClass', 'field = 42',
93+
self.expect('frame var aliased', substrs=['SwiftClass', 'field = 42',
9494
'arr = 4 values', '[0] = "An"', '[1] = "array"', '[2] = "of"',
9595
'[3] = "strings"'])
9696
self.expect('expr aliased', substrs=['SwiftClass', 'field = 42',

‎lldb/test/API/lang/swift/cxx_interop/forward/class-in-namespace/TestSwiftForwardInteropClassInNamespace.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@ def test_class(self):
1515
_, _, _, _= lldbutil.run_to_source_breakpoint(
1616
self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
1717

18-
self.expect('v fooClass', substrs=['foo::CxxClass', 'foo_field = 10'])
18+
self.expect('frame var fooClass', substrs=['foo::CxxClass', 'foo_field = 10'])
1919
self.expect('expr fooClass', substrs=['foo::CxxClass', 'foo_field = 10'])
2020

21-
self.expect('v barClass', substrs=['bar::CxxClass', 'bar_field = 30'])
21+
self.expect('frame var barClass', substrs=['bar::CxxClass', 'bar_field = 30'])
2222
self.expect('expr barClass', substrs=['bar::CxxClass', 'bar_field = 30'])
2323

2424

25-
self.expect('v bazClass', substrs=['baz::CxxClass', 'baz_field = 50'])
25+
self.expect('frame var bazClass', substrs=['baz::CxxClass', 'baz_field = 50'])
2626
self.expect('expr bazClass', substrs=['baz::CxxClass', 'baz_field = 50'])
2727

28-
self.expect('v bazClass', substrs=['baz::CxxClass', 'baz_field = 50'])
28+
self.expect('frame var bazClass', substrs=['baz::CxxClass', 'baz_field = 50'])
2929
self.expect('expr bazClass', substrs=['baz::CxxClass', 'baz_field = 50'])
3030

31-
self.expect('v fooInherited', substrs=['foo::InheritedCxxClass',
31+
self.expect('frame var fooInherited', substrs=['foo::InheritedCxxClass',
3232
'foo::CxxClass = (foo_field = 10)', 'foo_subfield = 20'])
3333
self.expect('expr fooInherited', substrs=['foo::InheritedCxxClass',
3434
'foo::CxxClass = (foo_field = 10)', 'foo_subfield = 20'])
3535

36-
self.expect('v barInherited', substrs=['bar::InheritedCxxClass',
36+
self.expect('frame var barInherited', substrs=['bar::InheritedCxxClass',
3737
'bar::CxxClass = (bar_field = 30)', 'bar_subfield = 40'])
3838
self.expect('expr barInherited', substrs=['bar::InheritedCxxClass',
3939
'bar::CxxClass = (bar_field = 30)', 'bar_subfield = 40'])
4040

4141

42-
self.expect('v bazInherited', substrs=['bar::baz::InheritedCxxClass',
42+
self.expect('frame var bazInherited', substrs=['bar::baz::InheritedCxxClass',
4343
'bar::baz::CxxClass = (baz_field = 50)', 'baz_subfield = 60'])
4444
self.expect('expr bazInherited', substrs=['bar::baz::InheritedCxxClass',
4545
'bar::baz::CxxClass = (baz_field = 50)', 'baz_subfield = 60'])

‎lldb/test/API/lang/swift/cxx_interop/forward/cxx-class-as-existential/TestSwiftForwardInteropCxxClassAsExistential.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ def test(self):
1515
_, _, _, _= lldbutil.run_to_source_breakpoint(
1616
self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
1717

18-
self.expect('v x', substrs=['CxxClass', 'a1 = 10', 'a2 = 20', 'a3 = 30'])
18+
self.expect('frame var x', substrs=['CxxClass', 'a1 = 10', 'a2 = 20', 'a3 = 30'])
1919
self.expect('expr x', substrs=['CxxClass', 'a1 = 10', 'a2 = 20', 'a3 = 30'])
2020

21-
self.expect('v y', substrs=['InheritedCxxClass', 'a1 = 10', 'a2 = 20', 'a3 = 30', 'a4 = 40'])
21+
self.expect('frame var y', substrs=['InheritedCxxClass', 'a1 = 10', 'a2 = 20', 'a3 = 30', 'a4 = 40'])
2222
self.expect('expr y', substrs=['InheritedCxxClass', 'a1 = 10', 'a2 = 20', 'a3 = 30', 'a4 = 40'])

‎lldb/test/API/lang/swift/cxx_interop/forward/cxx-class/TestSwiftForwardInteropCxxClass.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ def test_class(self):
1414
_, _, _, _= lldbutil.run_to_source_breakpoint(
1515
self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
1616

17-
self.expect('v x', substrs=['CxxClass', 'a1', '10', 'a2', '20', 'a3', '30'])
17+
self.expect('frame var x', substrs=['CxxClass', 'a1', '10', 'a2', '20', 'a3', '30'])
1818
self.expect('po x', substrs=['CxxClass', 'a1', '10', 'a2', '20', 'a3', '30'])
1919

20-
self.expect('v y', substrs=['InheritedCxxClass', 'a1', '10', 'a2', '20', 'a3', '30', 'a4', '40'])
20+
self.expect('frame var y', substrs=['InheritedCxxClass', 'a1', '10', 'a2', '20', 'a3', '30', 'a4', '40'])
2121
# FIXME: rdar://106216567
2222
self.expect('po y', substrs=['InheritedCxxClass', 'a4', '40'])

‎lldb/test/API/lang/swift/cxx_interop/forward/nested-classes/TestCxxForwardInteropNestedClasses.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def test(self):
1616
_, _, _, _= lldbutil.run_to_source_breakpoint(
1717
self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
1818

19-
self.expect('v nested', substrs=['CxxClass::NestedClass', 'b = 20'])
19+
self.expect('frame var nested', substrs=['CxxClass::NestedClass', 'b = 20'])
2020
self.expect('expr nested', substrs=['CxxClass::NestedClass', 'b = 20'])
2121

22-
self.expect('v nestedSubclass', substrs=['CxxClass::NestedSubclass',
22+
self.expect('frame var nestedSubclass', substrs=['CxxClass::NestedSubclass',
2323
'SuperClass = (a = 10)', 'c = 30'])
2424
self.expect('expr nestedSubclass', substrs=['CxxClass::NestedSubclass',
2525
'SuperClass = (a = 10)', 'c = 30'])

‎lldb/test/API/lang/swift/cxx_interop/forward/stl-types/TestSwiftForwardInteropSTLTypes.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,39 @@ def test(self):
2121
# take an execution context, so the validation happens in the
2222
# wrong SwiftASTContext.
2323
self.expect('settings set symbols.swift-validate-typesystem false')
24-
self.expect('v map', substrs=['CxxMap', 'first = 1, second = 3',
24+
self.expect('frame var map', substrs=['CxxMap', 'first = 1, second = 3',
2525
'first = 2, second = 2', 'first = 3, second = 3'])
2626
self.expect('expr map', substrs=['CxxMap', 'first = 1, second = 3',
2727
'first = 2, second = 2', 'first = 3, second = 3'])
2828

29-
self.expect('v optional', substrs=['CxxOptional', 'optional', 'Has Value=true',
29+
self.expect('frame var optional', substrs=['CxxOptional', 'optional', 'Has Value=true',
3030
'Value = "In optional!"'])
3131
self.expect('expr optional', substrs=['CxxOptional', 'Has Value=true',
3232
'Value = "In optional!"'])
3333

34-
self.expect('v emptyOptional', substrs=['CxxOptional', 'emptyOptional',
34+
self.expect('frame var emptyOptional', substrs=['CxxOptional', 'emptyOptional',
3535
'Has Value=false'])
3636
self.expect('expr emptyOptional', substrs=['CxxOptional', 'Has Value=false'])
3737

38-
self.expect('v set', substrs=['CxxSet', 'size=3', '3.7', '4.2', '9.19'])
38+
self.expect('frame var set', substrs=['CxxSet', 'size=3', '3.7', '4.2', '9.19'])
3939
self.expect('expr set', substrs=['CxxSet', 'size=3', '3.7', '4.2', '9.19'])
4040

41-
self.expect('v string', substrs=['string', 'Hello from C++!'])
41+
self.expect('frame var string', substrs=['string', 'Hello from C++!'])
4242
self.expect('expr string', substrs=['Hello from C++!'])
4343

44-
self.expect('v unorderedMap', substrs=['CxxUnorderedMap',
44+
self.expect('frame var unorderedMap', substrs=['CxxUnorderedMap',
4545
'(first = 3, second = "three")', '(first = 2, second = "two")',
4646
'(first = 1, second = "one")'], ordered=False)
4747
self.expect('expr unorderedMap', substrs=['CxxUnorderedMap',
4848
'(first = 3, second = "three")', '(first = 2, second = "two")',
4949
'(first = 1, second = "one")'], ordered=False)
5050

51-
self.expect('v unorderedSet', substrs=['CxxUnorderedSet',
51+
self.expect('frame var unorderedSet', substrs=['CxxUnorderedSet',
5252
'first', 'second', 'third'], ordered=False)
5353
self.expect('expr unorderedSet', substrs=['CxxUnorderedSet',
5454
'first', 'second', 'third'], ordered=False)
5555

56-
self.expect('v vector', substrs=['CxxVector', '[0] = 4.1', '[1] = 3.7',
56+
self.expect('frame var vector', substrs=['CxxVector', '[0] = 4.1', '[1] = 3.7',
5757
'[2] = 9.19'])
5858
self.expect('expr vector', substrs=['CxxVector', '[0] = 4.1', '[1] = 3.7',
5959
'[2] = 9.19'])

‎lldb/test/API/lang/swift/cxx_interop/forward/swift-class-with-cxx-ivars/TestSwiftForwardInteropClassWithCxxIvars.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ def test(self):
1515
_, _, _, _= lldbutil.run_to_source_breakpoint(
1616
self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
1717

18-
self.expect('v swiftClass', substrs=['SwiftClass', 'cxxClass', 'a1', '10', 'a2', '20', 'a3', '30',
18+
self.expect('frame var swiftClass', substrs=['SwiftClass', 'cxxClass', 'a1', '10', 'a2', '20', 'a3', '30',
1919
'cxxSubclass', 'a1', '10', 'a2', '20', 'a3', '30', 'a4', '40'])
2020
self.expect('expr swiftClass', substrs=['SwiftClass', 'cxxClass', 'a1', '10', 'a2', '20', 'a3', '30',
2121
'cxxSubclass', 'a1', '10', 'a2', '20', 'a3', '30', 'a4', '40'])
2222

23-
self.expect('v swiftStruct', substrs=['SwiftStruct', 'cxxClass', 'a1', '10', 'a2', '20', 'a3', '30',
23+
self.expect('frame var swiftStruct', substrs=['SwiftStruct', 'cxxClass', 'a1', '10', 'a2', '20', 'a3', '30',
2424
'cxxSubclass', 'a1', '10', 'a2', '20', 'a3', '30', 'a4', '40'])
2525
self.expect('expr swiftStruct', substrs=['SwiftStruct', 'cxxClass', 'a1', '10', 'a2', '20', 'a3', '30',
2626
'cxxSubclass', 'a1', '10', 'a2', '20', 'a3', '30', 'a4', '40'])
2727

2828

29-
self.expect('v swiftEnum1', substrs=['SwiftEnum', 'first', 'a1', '10', 'a2', '20', 'a3', '30'])
29+
self.expect('frame var swiftEnum1', substrs=['SwiftEnum', 'first', 'a1', '10', 'a2', '20', 'a3', '30'])
3030
self.expect('expr swiftEnum1', substrs=['SwiftEnum', 'first', 'a1', '10', 'a2', '20', 'a3', '30'])
3131

32-
self.expect('v swiftEnum2', substrs=['SwiftEnum', 'second', 'a1', '10', 'a2', '20', 'a3', '30',
32+
self.expect('frame var swiftEnum2', substrs=['SwiftEnum', 'second', 'a1', '10', 'a2', '20', 'a3', '30',
3333
'a4', '40'])
3434
self.expect('expr swiftEnum2', substrs=['SwiftEnum', 'second', 'a1', '10', 'a2', '20', 'a3', '30',
3535
'a4', '40'])

‎lldb/test/API/lang/swift/cxx_interop/forward/swift-generic-with-cxx-type/TestSwiftForwardInteropGenericWithCxxType.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ def test(self):
1515
_, _, _, _= lldbutil.run_to_source_breakpoint(
1616
self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
1717

18-
self.expect('v classWrapper', substrs=['Wrapper<CxxClass>', 't', 'a1 = 10',
18+
self.expect('frame var classWrapper', substrs=['Wrapper<CxxClass>', 't', 'a1 = 10',
1919
'a2 = 20', 'a3 = 30'])
2020
self.expect('expr classWrapper', substrs=['Wrapper<CxxClass>', 't', 'a1 = 10',
2121
'a2 = 20', 'a3 = 30'])
2222

23-
self.expect('v subclassWrapper', substrs=['Wrapper<CxxSubclass>', 't',
23+
self.expect('frame var subclassWrapper', substrs=['Wrapper<CxxSubclass>', 't',
2424
'CxxClass = (a1 = 10, a2 = 20, a3 = 30)', 'a4 = 40'])
2525
self.expect('expr subclassWrapper', substrs=['Wrapper<CxxSubclass>', 't',
2626
'CxxClass = (a1 = 10, a2 = 20, a3 = 30)', 'a4 = 40'])

‎lldb/test/API/lang/swift/cxx_interop/forward/template-types/TestSwiftForwardInteropTemplateTypes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def test(self):
1717

1818
# rdar://106455215 validating the typeref type system will trigger an assert in Clang
1919
self.runCmd('settings set symbols.swift-validate-typesystem false')
20-
self.expect('v wrapped', substrs=['Wrapper<CxxClass>', 't', 'a1', '10', 'a2', '20', 'a3', '30'])
20+
self.expect('frame var wrapped', substrs=['Wrapper<CxxClass>', 't', 'a1', '10', 'a2', '20', 'a3', '30'])
2121

2222
# FIXME: rdar://106455215
2323
# self.expect('expr wrapped', substrs=['Wrapper<CxxClass>', 't', 'a1', '10', 'a2', '20', 'a3', '30'])

‎lldb/test/API/lang/swift/cxx_interop/forward/typedefed-type/TestSwiftForwardInteropTypedefType.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ def test_class(self):
1515
_, _, _, _= lldbutil.run_to_source_breakpoint(
1616
self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
1717

18-
self.expect('v typedef', substrs=['TypedefedCxxClass', 'a1', '10', 'a2', '20', 'a3', '30'])
18+
self.expect('frame var typedef', substrs=['TypedefedCxxClass', 'a1', '10', 'a2', '20', 'a3', '30'])
1919
self.expect('expr typedef', substrs=['TypedefedCxxClass', 'a1', '10', 'a2', '20', 'a3', '30'])
2020

21-
self.expect('v using', substrs=['UsingCxxClass', 'a1', '10', 'a2', '20', 'a3', '30'])
21+
self.expect('frame var using', substrs=['UsingCxxClass', 'a1', '10', 'a2', '20', 'a3', '30'])
2222
self.expect('expr using', substrs=['UsingCxxClass', 'a1', '10', 'a2', '20', 'a3', '30'])
2323

24-
self.expect('v typealiased', substrs=['TypeAliased', 'a1', '10', 'a2', '20', 'a3', '30'])
24+
self.expect('frame var typealiased', substrs=['TypeAliased', 'a1', '10', 'a2', '20', 'a3', '30'])
2525
self.expect('expr typealiased', substrs=['TypeAliased', 'a1', '10', 'a2', '20', 'a3', '30'])

‎lldb/test/API/lang/swift/cxx_interop/forward/variadic-template-types/TestSwiftForwardInteropVariadicTemplateTypes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ def test(self):
1515
_, _, _, _= lldbutil.run_to_source_breakpoint(
1616
self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
1717

18-
self.expect('v pair', substrs=['Pair', 'Tuple<OtherCxxClass>', '_t',
18+
self.expect('frame var pair', substrs=['Pair', 'Tuple<OtherCxxClass>', '_t',
1919
'v = false', '_t', 'a1', '10', 'a2', '20', 'a3', '30'])
2020
self.expect('expr pair', substrs=['Pair', 'Tuple<OtherCxxClass>', '_t',
2121
'v = false', '_t', 'a1', '10', 'a2', '20', 'a3', '30'])
2222

2323
# rdar://106459037 (Swift/C++ interop: Variadic templates aren't displayed correctly)
24-
# self.expect('v variadic', substrs=['Tuple<CxxClass, OtherCxxClass>', '_t',
24+
# self.expect('frame var variadic', substrs=['Tuple<CxxClass, OtherCxxClass>', '_t',
2525
# 'v = false', 'a1', '10', 'a2', '20', 'a3', '30'])

‎lldb/test/API/lang/swift/error_handling_missing_type/TestSwiftErrorHandlingMissingType.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def test(self):
1919
val = var_object.GetChildAtIndex(1)
2020
# FIXME: Should be True, for now it's just a string
2121
self.assertFalse(val.GetError().Fail())
22-
self.expect('v object',
22+
self.expect('frame var object',
2323
substrs=['missing debug info for Clang type', 'FromC'])
24-
self.expect('v enm',
24+
self.expect('frame var enm',
2525
substrs=['missing debug info for Clang type', 'ImportedEnum'])

‎lldb/test/API/lang/swift/external_provider_extra_inhabitants/TestExternalProviderExtraInhabitants.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ def test(self):
1515
lldbutil.run_to_source_breakpoint(
1616
self, 'Set breakpoint here.', lldb.SBFileSpec('main.swift'))
1717

18-
self.expect('v object.size.some.width', substrs=['10'])
19-
self.expect('v object.size.some.height', substrs=['20'])
18+
self.expect('frame var object.size.some.width', substrs=['10'])
19+
self.expect('frame var object.size.some.height', substrs=['20'])
2020

0 commit comments

Comments
 (0)