Index: lldb/packages/Python/lldbsuite/test/lldbtest.py =================================================================== --- lldb/packages/Python/lldbsuite/test/lldbtest.py +++ lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -2585,6 +2585,35 @@ value_check.check_value(self, eval_result, str(eval_result)) return eval_result + def expect_var_path( + self, + var_path, + result_summary=None, + result_value=None, + result_type=None, + result_children=None + ): + """ + Evaluates the given variable path and verifies the result. + See also 'frame variable' and SBFrame.GetValueForVariablePath. + :param var_path: The variable path as a string. + :param result_summary: The summary that the variable should have. None if the summary should not be checked. + :param result_value: The value that the variable should have. None if the value should not be checked. + :param result_type: The type that the variable result should have. None if the type should not be checked. + :param result_children: The expected children of the variable as a list of ValueChecks. + None if the children shouldn't be checked. + """ + self.assertTrue(var_path.strip() == var_path, + "Expression contains trailing/leading whitespace: '" + var_path + "'") + + frame = self.frame() + eval_result = frame.GetValueForVariablePath(var_path) + + value_check = ValueCheck(type=result_type, value=result_value, + summary=result_summary, children=result_children) + value_check.check_value(self, eval_result, str(eval_result)) + return eval_result + def invoke(self, obj, name, trace=False): """Use reflection to call a method dynamically with no argument.""" trace = (True if traceAlways else trace) Index: lldb/test/API/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py =================================================================== --- lldb/test/API/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py +++ lldb/test/API/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py @@ -60,21 +60,14 @@ stop_reason == lldb.eStopReasonBreakpoint, "Thread in process stopped in 'main' should have a stop reason of eStopReasonBreakpoint") - self.expect("frame variable argv[1]", substrs=['file1.txt']) - self.expect("frame variable argv[2]", substrs=['file2.txt']) - self.expect("frame variable argv[3]", substrs=['file3.txt']) - self.expect("frame variable argv[4]", substrs=['file4.txy']) - self.expect("frame variable argv[5]", substrs=['()']) - self.expect("frame variable argv[6]", substrs=['>']) - self.expect("frame variable argv[7]", substrs=['<']) - self.expect( - "frame variable argv[5]", - substrs=['file5.tyx'], - matching=False) - self.expect( - "frame variable argv[8]", - substrs=['file5.tyx'], - matching=False) + self.expect_var_path("argv[1]", result_summary='"file1.txt"') + self.expect_var_path("argv[2]", result_summary='"file2.txt"') + self.expect_var_path("argv[3]", result_summary='"file3.txt"') + self.expect_var_path("argv[4]", result_summary='"file4.txy"') + self.expect_var_path("argv[5]", result_summary='"()"') + self.expect_var_path("argv[6]", result_summary='">"') + self.expect_var_path("argv[7]", result_summary='"<"') + self.expect_var_path("argc", result_value='8') self.runCmd("process kill") Index: lldb/test/API/functionalities/archives/TestBSDArchives.py =================================================================== --- lldb/test/API/functionalities/archives/TestBSDArchives.py +++ lldb/test/API/functionalities/archives/TestBSDArchives.py @@ -43,8 +43,7 @@ # Break at a(int) first. self.expect("frame variable", VARIABLES_DISPLAYED_CORRECTLY, substrs=['(int) arg = 1']) - self.expect("frame variable __a_global", VARIABLES_DISPLAYED_CORRECTLY, - substrs=['(int) __a_global = 1']) + self.expect_var_path("__a_global", result_type="int", result_value="1") # Set breakpoint for b() next. lldbutil.run_break_set_by_symbol( @@ -57,5 +56,4 @@ 'stop reason = breakpoint']) self.expect("frame variable", VARIABLES_DISPLAYED_CORRECTLY, substrs=['(int) arg = 2']) - self.expect("frame variable __b_global", VARIABLES_DISPLAYED_CORRECTLY, - substrs=['(int) __b_global = 2']) + self.expect_var_path("__b_global", result_type="int", result_value="2") Index: lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py =================================================================== --- lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py +++ lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py @@ -20,20 +20,16 @@ lldbutil.run_to_source_breakpoint(self, "// break here", lldb.SBFileSpec("main.cpp")) # Check that we correctly report templates on wchar_t - self.expect("frame variable foo_y", - substrs=['(Foo) foo_y = ']) + self.expect_var_path("foo_y", result_type="Foo") # Check that we correctly report templates on int - self.expect("frame variable foo_x", - substrs=['(Foo) foo_x = ']) + self.expect_var_path("foo_x", result_type="Foo") # Check that we correctly report wchar_t - self.expect("frame variable foo_y.object", - substrs=['(wchar_t) foo_y.object = ']) + self.expect_var_path("foo_y.object", result_type="wchar_t") # Check that we correctly report int - self.expect("frame variable foo_x.object", - substrs=['(int) foo_x.object = ']) + self.expect_var_path("foo_x.object", result_type="int") # Check that we can run expressions that return wchar_t self.expect("expression L'a'", substrs=['(wchar_t) $', "L'a'"])