Update python tests to use expect_var_path where possible.

Author: cmtice

lldb/test/API/commands/frame/var-dil/basics/GlobalVariableLookup/TestFrameVarDILGlobalVariableLookup.py

@@ -24,11 +24,12 @@ def test_frame_var(self):
                                           lldb.SBFileSpec("main.cpp"))
 
         self.expect("settings set target.experimental.use-DIL true", substrs=[""])
-        self.expect("frame variable 'globalVar'", substrs=["-559038737"])  # 0xDEADBEEF
-        self.expect("frame variable 'globalPtr'", patterns=["0x[0-9]+"])
-        self.expect("frame variable 'globalRef'", substrs=["-559038737"])
-        self.expect("frame variable '::globalPtr'", patterns=["0x[0-9]+"])
-        self.expect("frame variable '::globalRef'", substrs=["-559038737"])
+        self.expect_var_path("globalVar", type="int", value="-559038737")  # 0xDEADBEEF
+        self.expect_var_path("globalPtr", type="int *")
+        self.expect_var_path("globalRef", value="-559038737")
+        self.expect_var_path("::globalVar", value="-559038737")
+        self.expect_var_path("::globalPtr", type="int *")
+        self.expect_var_path("::globalRef", value="-559038737")
 
         self.expect(
             "frame variable 'externGlobalVar'",
@@ -40,8 +41,9 @@ def test_frame_var(self):
             error=True,
             substrs=["use of undeclared identifier"],
         )  # ["12648430"])
-        self.expect("frame variable 'ns::globalVar'", substrs=["13"])
-        self.expect("frame variable 'ns::globalPtr'", patterns=["0x[0-9]+"])
-        self.expect("frame variable 'ns::globalRef'", substrs=["13"])
-        self.expect("frame variable '::ns::globalVar'", substrs=["13"])
-        self.expect("frame variable '::ns::globalPtr'", patterns=["0x[0-9]+"])
+
+        self.expect_var_path("ns::globalVar", value="13")
+        self.expect_var_path("ns::globalPtr", type="int *")
+        self.expect_var_path("ns::globalRef", value="13")
+        self.expect_var_path("::ns::globalVar", value="13")
+        self.expect_var_path("::ns::globalPtr", type="int *")

lldb/test/API/commands/frame/var-dil/basics/InstanceVariables/TestFrameVarDILInstanceVariables.py

@@ -24,5 +24,5 @@ def test_frame_var(self):
                                           lldb.SBFileSpec("main.cpp"))
 
         self.expect("settings set target.experimental.use-DIL true", substrs=[""])
-        self.expect("frame variable 'this'", patterns=["0x[0-9]+"])
+        self.expect_var_path("this", type="TestMethods *")
         self.expect("frame variable 'c'", substrs=["(field_ = -1)"])

lldb/test/API/commands/frame/var-dil/basics/LocalVars/TestFrameVarDILLocalVars.py

@@ -24,7 +24,7 @@ def test_frame_var(self):
                                           lldb.SBFileSpec("main.cpp"))
 
         self.expect("settings set target.experimental.use-DIL true", substrs=[""])
-        self.expect("frame variable a", substrs=["1"])
-        self.expect("frame variable b", substrs=["2"])
-        self.expect("frame variable c", substrs=["\\xfd"])
-        self.expect("frame variable s", substrs=["4"])
+        self.expect_var_path("a", value="1")
+        self.expect_var_path("b", value="2")
+        self.expect_var_path("c", value="'\\xfd'")
+        self.expect_var_path("s", value="4")