[lldb] Convert more tests to use expression directly (NFC)

Author: kastiglione

lldb/test/API/lang/swift/clangimporter/Werror/TestSwiftStripWerror.py

@@ -28,7 +28,7 @@ def test(self):
         log = self.getBuildArtifact("types.log")
         self.expect("log enable lldb types -f "+log)
 
-        self.expect("p foo", DATA_TYPES_DISPLAYED_CORRECTLY, substrs=["42"])
+        self.expect("expression foo", DATA_TYPES_DISPLAYED_CORRECTLY, substrs=["42"])
         sanity = 0
         import io
         logfile = io.open(log, "r", encoding='utf-8')

lldb/test/API/lang/swift/clangimporter/config_macros/TestSwiftDedupMacros.py

@@ -49,7 +49,7 @@ def testSwiftDebugMacros(self):
         log = self.getBuildArtifact("types.log")
         self.expect("log enable lldb types -f "+log)
 
-        self.expect("p foo", DATA_TYPES_DISPLAYED_CORRECTLY, substrs=["42"])
+        self.expect("expression foo", DATA_TYPES_DISPLAYED_CORRECTLY, substrs=["42"])
         debug = 0
         space = 0
         ndebug = 0

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/TestSwiftObjCMainConflictingDylibs.py

@@ -53,11 +53,11 @@ def test(self):
         process = target.LaunchSimple(None, None, os.getcwd())
         # This is failing because the Target-SwiftASTContext uses the
         # amalgamated target header search options from all dylibs.
-        self.expect("p baz", "wrong baz", substrs=["i_am_from_Foo"])
+        self.expect("expression baz", "wrong baz", substrs=["i_am_from_Foo"])
         self.expect("fr var baz", "wrong baz", substrs=["i_am_from_Foo"])
 
 
         process.Continue()
-        self.expect("p baz", "correct baz", substrs=["i_am_from_Foo"])
+        self.expect("expression baz", "correct baz", substrs=["i_am_from_Foo"])
         self.expect("fr var baz", "correct baz", substrs=["i_am_from_Foo"])
 

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py

@@ -52,9 +52,9 @@ def test(self):
 
         # This initially fails with the shared scratch context and is
         # then retried with the per-dylib scratch context.
-        # self.expect("p bar", "expected result", substrs=["$R0", "42"])
-        # self.expect("p $R0", "expected result", substrs=["$R1", "42"])
-        # self.expect("p $R1", "expected result", substrs=["$R2", "42"])
+        # self.expect("expression bar", "expected result", substrs=["$R0", "42"])
+        # self.expect("expression $R0", "expected result", substrs=["$R1", "42"])
+        # self.expect("expression $R1", "expected result", substrs=["$R2", "42"])
 
         # This works by accident because the search paths are in the right order.
         foo_breakpoint = target.BreakpointCreateBySourceRegex(
@@ -64,7 +64,7 @@ def test(self):
         # FIXME: The following expression evaluator tests are disabled
         # because it's nondeterministic which one will work.
 
-        # self.expect("p foo", "expected result", substrs=["$R3", "23"])
-        # self.expect("p $R3", "expected result", substrs=["23"])
-        # self.expect("p $R4", "expected result", substrs=["23"])
+        # self.expect("expression foo", "expected result", substrs=["$R3", "23"])
+        # self.expect("expression $R3", "expected result", substrs=["23"])
+        # self.expect("expression $R4", "expected result", substrs=["23"])
 

lldb/test/API/lang/swift/clangimporter/remap_sdk_path/TestSwiftRemapSDKPath.py

@@ -22,7 +22,7 @@ def test(self):
         self.runCmd('log enable lldb types -f "%s"' % log)
         target, process, thread, bkpt = lldbutil.run_to_name_breakpoint(
             self, 'main')
-        self.expect("p 1", substrs=["1"])
+        self.expect("expression 1", substrs=["1"])
 
         # Scan through the types log.
         import io

lldb/test/API/lang/swift/clangimporter/static_archive/TestSwiftStaticArchiveTwoSwiftmodules.py

@@ -52,7 +52,7 @@ def test(self):
         # This test tests that the search paths from all swiftmodules
         # that are part of the main binary are honored.
         self.expect("fr var foo", "expected result", substrs=["23"])
-        self.expect("p foo", "expected result", substrs=["$R0", "i", "23"])
+        self.expect("expression foo", "expected result", substrs=["$R0", "i", "23"])
         process.Continue()
         self.expect("fr var bar", "expected result", substrs=["42"])
-        self.expect("p bar", "expected result", substrs=["j", "42"])
+        self.expect("expression bar", "expected result", substrs=["j", "42"])

lldb/test/API/lang/swift/class_empty/main.swift

@@ -17,7 +17,7 @@ class Empty : CustomStringConvertible {
 
 func main() {
   var e = Empty()
-  print(e) //% self.expect("p 1", substrs=['1'])
+  print(e) //% self.expect("expression 1", substrs=['1'])
 }
 
 main()

lldb/test/API/lang/swift/closure_shortcuts/main.swift

@@ -15,8 +15,8 @@ func main() -> Int {
   let names = ["foo", "patatino"]
 
   var reversedNames = names.sorted(by: {
-    $0 > $1 } //%self.expect('p $0', substrs=['patatino'])
-              //%self.expect('p $1', substrs=['foo'])
+    $0 > $1 } //%self.expect('expr $0', substrs=['patatino'])
+              //%self.expect('expr $1', substrs=['foo'])
               //%self.expect('frame var $0', substrs=['patatino'])
               //%self.expect('frame var $1', substrs=['foo'])
   )

lldb/test/API/lang/swift/deployment_target/TestSwiftDeploymentTarget.py

@@ -34,7 +34,7 @@ def test_swift_deployment_target(self):
         lldbutil.run_to_source_breakpoint(self,
                                           "break here",
                                           lldb.SBFileSpec('main.swift'))
-        self.expect("p f", substrs=['i = 23'])
+        self.expect("expression f", substrs=['i = 23'])
 
     @skipUnlessDarwin
     @skipIfDarwinEmbedded # This test uses macOS triples explicitly.
@@ -47,7 +47,7 @@ def test_swift_deployment_target_dlopen(self):
         bkpt = target.BreakpointCreateBySourceRegex(
             'break here', lldb.SBFileSpec('NewerTarget.swift'))
         lldbutil.continue_to_breakpoint(process, bkpt)
-        self.expect("p self", substrs=['i = 23'])
+        self.expect("expression self", substrs=['i = 23'])
 
     @skipUnlessDarwin
     @skipIfDarwinEmbedded # This test uses macOS triples explicitly.
@@ -61,7 +61,7 @@ def test_swift_deployment_target_from_macho(self):
         lldbutil.run_to_source_breakpoint(self,
                                           "break here",
                                           lldb.SBFileSpec('main.swift'))
-        self.expect("p f", substrs=['i = 23'])
+        self.expect("expression f", substrs=['i = 23'])
 
         found_no_ast = False
         found_triple = False

lldb/test/API/lang/swift/expression/allocator/TestSwiftExprAllocator.py

@@ -19,4 +19,4 @@ def test_allocator_self(self):
         target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
             self, 'break here', lldb.SBFileSpec('main.swift'))
 
-        self.expect("p x", substrs=['23'])
+        self.expect("expression x", substrs=['23'])

lldb/test/API/lang/swift/macCatalyst/TestSwiftMacCatalyst.py

@@ -36,7 +36,7 @@ def test_macCatalyst(self):
         self.expect("fr v s", "Hello macCatalyst")
         expr_log = self.getBuildArtifact("expr.log")
         self.expect('log enable lldb expr -f "%s"' % expr_log)
-        self.expect("p s", "Hello macCatalyst")
+        self.expect("expression s", "Hello macCatalyst")
         import io
         expr_logfile = io.open(expr_log, "r", encoding='utf-8')
 

lldb/test/API/lang/swift/missing_sdk/TestMissingSDK.py

@@ -26,6 +26,6 @@ def testMissingSDK(self):
         os.unlink(self.getBuildArtifact("fakesdk"))
         lldbutil.run_to_source_breakpoint(self, 'break here',
                                           lldb.SBFileSpec('main.swift'))
-        self.expect("p message", VARIABLES_DISPLAYED_CORRECTLY,
+        self.expect("expression message", VARIABLES_DISPLAYED_CORRECTLY,
                     substrs = ["Hello"])
 

lldb/test/API/lang/swift/protocol_extension_computed_property/main.swift

@@ -13,8 +13,8 @@ extension Measurement where UnitType == UnitAngle {
   }
 
   func f() {
-    return //%self.expect('p self.radians', substrs=["CGFloat) $R0", "= 1.745"])
-           //%self.expect('p self', substrs=["Measurement<UnitAngle>"])
+    return //%self.expect('expression self.radians', substrs=["CGFloat) $R0", "= 1.745"])
+           //%self.expect('expression self', substrs=["Measurement<UnitAngle>"])
   }
 }
 

lldb/test/API/lang/swift/protocol_extension_two/main.swift

@@ -10,8 +10,8 @@ extension Patatino where T == Winky {
   }
 
   func f() {
-    return //%self.expect('p self.baciotto', substrs=["(Int) $R0 = 0"])
-           //%self.expect('p self', substrs=["a.Patatino<a.Winky>"])
+    return //%self.expect('expression self.baciotto', substrs=["(Int) $R0 = 0"])
+           //%self.expect('expression self', substrs=["a.Patatino<a.Winky>"])
   }
 }
 

lldb/test/API/lang/swift/runtime_library_path/TestSwiftRuntimeLibraryPath.py

@@ -25,7 +25,7 @@ def test(self):
         target, process, thread, bkpt = lldbutil.run_to_name_breakpoint(
             self, 'main')
 
-        self.expect("p 1")
+        self.expect("expression 1")
         import io
         logfile = io.open(log, "r", encoding='utf-8')
         in_expr_log = 0

lldb/test/API/lang/swift/swift-healthcheck/TestSwiftHealthCheck.py

@@ -19,7 +19,7 @@ def test_run_healthcheck(self):
 
         target, process, thread, bkpt = lldbutil.run_to_name_breakpoint(
             self, 'main')
-        self.expect("p 1")
+        self.expect("expression 1")
         result = lldb.SBCommandReturnObject()
         ret_val = self.dbg.GetCommandInterpreter().HandleCommand("swift-healthcheck", result)
         log = result.GetOutput()[:-1].split(" ")[-1]

lldb/test/API/lang/swift/tripleDetection/TestSwiftTripleDetection.py

@@ -26,7 +26,7 @@ def test(self):
                                                               arch+"-apple-macos-unknown")
         bkpt = target.BreakpointCreateByName("main")
         process = target.LaunchSimple(None, None, self.get_process_working_directory())
-        self.expect("p 1")
+        self.expect("expression 1")
         import io
         types_logfile = io.open(types_log, "r", encoding='utf-8')
 

lldb/test/API/lang/swift/variables/swift/TestSwiftTypes.py

@@ -177,9 +177,9 @@ def do_test(self):
 
         self.expect("frame variable --raw hello", substrs=['String'])
 
-        self.expect("p/x int64_minus_two", substrs=['0xfffffffffffffffe'])
-        self.expect("p/u ~1", substrs=['18446744073709551614'])
-        self.expect("p/d ~1", substrs=['-2'])
+        self.expect("expression/x int64_minus_two", substrs=['0xfffffffffffffffe'])
+        self.expect("expression/u ~1", substrs=['18446744073709551614'])
+        self.expect("expression/d ~1", substrs=['-2'])
 
         self.expect('frame variable uint8_max', substrs=['-1'], matching=False)
         self.expect(

lldb/test/API/lang/swift/xcode_sdk/TestSwiftXcodeSDK.py

@@ -35,7 +35,7 @@ def test_decode(self):
 
         lldbutil.run_to_name_breakpoint(self, 'main')
 
-        self.expect("p 1")
+        self.expect("expression 1")
         self.check_log(log, "MacOSX")
 
     @swiftTest

lldb/test/API/linux/aarch64/non_address_bit_memory_access/TestAArch64LinuxNonAddressBitMemoryAccess.py

@@ -153,10 +153,10 @@ def test_non_address_bit_memory_caching(self):
 
         # This should fill the cache by doing a read of buf_with_non_address
         # with the non-address bits removed (which is == buf).
-        self.runCmd("p buf_with_non_address")
+        self.runCmd("expression buf_with_non_address")
         # This will read from the cache since the two pointers point to the
         # same place.
-        self.runCmd("p buf")
+        self.runCmd("expression buf")
 
         # Open log ignoring utf-8 decode errors
         with open(log_file, 'r', errors='ignore') as f: