[lldb] Update p usage in tests

Author: kastiglione

lldb/test/API/lang/swift/clangimporter/hard_macro_conflict/TestSwiftHardMacroConflict.py

@@ -35,7 +35,7 @@ def test(self):
         process.Continue()
         threads = lldbutil.get_threads_stopped_at_breakpoint(
             process, b_breakpoint)
-        self.expect("p foo", error=True)
+        self.expect("expression foo", error=True)
 
         per_module_fallback = 0
         import io

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py

@@ -38,14 +38,14 @@ def test(self):
 
 
         self.expect("fr var bar", "expected result", substrs=["42"])
-        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"])
 
         foo_breakpoint = target.BreakpointCreateBySourceRegex(
             'break here', lldb.SBFileSpec('Foo.swift'))
         process.Continue()
         self.expect("fr var foo", "expected result", substrs=["23"])
-        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/rewrite_clang_paths/TestSwiftRewriteClangPaths.py

@@ -82,13 +82,13 @@ def dotest(self, remap):
 
         if remap:
             comment = "returns correct value"
-            self.expect("p foo", comment, substrs=["x", "23"])
-            self.expect("p bar", comment, substrs=["y", "42"])
+            self.expect("expression foo", comment, substrs=["x", "23"])
+            self.expect("expression bar", comment, substrs=["y", "42"])
             self.expect("fr var foo", comment, substrs=["x", "23"])
             self.expect("fr var bar", comment, substrs=["y", "42"])
             self.assertTrue(os.path.isdir(mod_cache), "module cache exists")
         else:
-            self.expect("p foo", error=True)
+            self.expect("expression foo", error=True)
 
         # Scan through the types log.
         errs = 0

lldb/test/API/lang/swift/parseable_interfaces/dsym/TestSwiftInterfaceDsym.py

@@ -114,7 +114,7 @@ def test_sanity_negative(self):
         # prints the type *name*.
         self.assertEqual(var.GetTypeName(), "AA.MyPoint")
         # Evaluating an expression fails, though.
-        self.expect("p x", error=1)
+        self.expect("expression x", error=1)
 
     @swiftTest
     @skipIf(archs=no_match("x86_64"))
@@ -153,7 +153,7 @@ def test_sanity_positive(self):
 
         # The expression evaluator sees the whole program, so it also
         # sees the private members.
-        self.expect("p x", substrs=["x = 10"])
+        self.expect("expression x", substrs=["x = 10"])
         # FIXME: this doesn't work, the summary/value is null/null.
         #lldbutil.check_expression(
         #    self, frame, "x", "x = 10", use_summary=False)
@@ -168,5 +168,5 @@ def test_sanity_positive(self):
         # MyPoint.x is private and we should still see it.
         child_x = var.GetChildMemberWithName("x")
         lldbutil.check_variable(self, child_x, value="10")
-        self.expect("p self", substrs=["x = 10"])
+        self.expect("expression self", substrs=["x = 10"])
 

lldb/test/API/lang/swift/private_discriminator/TestSwiftPrivateDiscriminator.py

@@ -28,10 +28,10 @@ def test(self):
         self.expect("e --bind-generic-types true -- self", error=True, substrs=["Hint"])
         # This should work because expression evaluation automatically falls back
         # to not binding generic parameters.
-        self.expect("p self", substrs=['Generic', '<T>', 'n', '23'])
+        self.expect("expression self", substrs=['Generic', '<T>', 'n', '23'])
 
         process.Continue()
         # This should work.
         self.expect("frame var -d run -- visible",
                     substrs=['Generic.Visible', 'n', '42'])
-        self.expect("p visible", substrs=['Generic.Visible', 'n', '42'])
+        self.expect("expression visible", substrs=['Generic.Visible', 'n', '42'])