Modify the command passed to command interpreter from 'expr' (which is an alias of 'expression')

to 'expression' to avoid cases where 'expr' has been unaliased.

llvm-svn: 116780

lldb/test/class_types/TestClassTypes.py

@@ -185,7 +185,7 @@ class ClassTypesTestCase(TestBase):
         # expr this->m_c_int returns an incorrect value
         #
         # Verify that expr this->m_c_int behaves correctly.
-        self.expect("expr this->m_c_int", VARIABLES_DISPLAYED_CORRECTLY,
+        self.expect("expression this->m_c_int", VARIABLES_DISPLAYED_CORRECTLY,
             patterns = ['\(int\) \$[0-9]+ = 66'])
 
 

lldb/test/forward/TestForwardDeclaration.py

@@ -51,7 +51,7 @@ class ForwardDeclarationTestCase(TestBase):
                        '(int) b = 2'])
 
         # And so should this.
-        self.expect("expr *bar_ptr", VARIABLES_DISPLAYED_CORRECTLY,
+        self.expect("expression *bar_ptr", VARIABLES_DISPLAYED_CORRECTLY,
             substrs = ['(struct bar)',
                        '(int) a = 1',
                        '(int) b = 2'])

lldb/test/foundation/TestObjCMethods.py

@@ -140,21 +140,22 @@ class FoundationTestCase(TestBase):
                        "(NSDate *) date"])
 
         # This should fail expectedly.
-        self.expect("expr self->non_existent_member", COMMAND_FAILED_AS_EXPECTED, error=True,
+        self.expect("expression self->non_existent_member",
+                    COMMAND_FAILED_AS_EXPECTED, error=True,
             startstr = "error: 'MyString' does not have a member named 'non_existent_member'")
 
         # This currently fails.
         # rdar://problem/8492646
         #
         # Use expression parser.
-        #self.runCmd("expr self->str")
-        #self.runCmd("expr self->date")
+        #self.runCmd("expression self->str")
+        #self.runCmd("expression self->date")
 
-        # (lldb) expr self->str
+        # (lldb) expression self->str
         # error: instance variable 'str' is protected
         # error: 1 errors parsing expression
         #
-        # (lldb) expr self->date
+        # (lldb) expression self->date
         # error: instance variable 'date' is protected
         # error: 1 errors parsing expression
         #
@@ -172,7 +173,7 @@ class FoundationTestCase(TestBase):
         #
         # Test new feature with r115115:
         # Add "-o" option to "expression" which prints the object description if available.
-        self.expect("expr -o -- my", "Object description displayed correctly",
+        self.expect("expression -o -- my", "Object description displayed correctly",
             patterns = ["Hello from.*a.out.*with timestamp: "])
 
 

lldb/test/persistent_variables/TestPersistentVariables.py

@@ -21,19 +21,19 @@ class PersistentVariablesTestCase(TestBase):
 
         self.runCmd("run", RUN_SUCCEEDED)
 
-        self.expect("expr int $i = 5; $i + 1",
+        self.expect("expression int $i = 5; $i + 1",
             startstr = "(int) $0 = 6")
         # (int) $0 = 6
 
-        self.expect("expr $i + 3",
+        self.expect("expression $i + 3",
             startstr = "(int) $1 = 8")
         # (int) $1 = 8
 
-        self.expect("expr $1 + $0",
+        self.expect("expression $1 + $0",
             startstr = "(int) $2 = 14")
         # (int) $2 = 14
 
-        self.expect("expr $2",
+        self.expect("expression $2",
             startstr = "(int) $3 = 14")
         # (int) $3 =  14