Author: santhoshe447 Date: 2023-11-17T10:15:23-05:00 New Revision: 06effaf43e9669c55ee4a1e2254166b5e7dc5b29
URL: https://github.com/llvm/llvm-project/commit/06effaf43e9669c55ee4a1e2254166b5e7dc5b29 DIFF: https://github.com/llvm/llvm-project/commit/06effaf43e9669c55ee4a1e2254166b5e7dc5b29.diff LOG: [lldb][test] Add the ability to extract the variable value out of the summary. (#72631) Fix for https://github.com/llvm/llvm-project/issues/71897 When it comes to test infrastructure the test (TestDAP_variables.py: test_scopes_variables_setVariable_evaluate_with_descriptive_summaries) will fail if the variable has a summary along with value. I just tried to add a summary to a variable before we set a value to the variable using below expression from “request_setVariable” function. RunLLDBCommands(llvm::StringRef(), {std::string("type summary add --summary-string "{sample summary}" (const char **) argv")}); As value has nonnumeric characters where we are trying to convert into integer, python is throwing an error. We did not see this issue in upstream as we are not adding summary explicitly, by default we are getting empty summary & value for all children’s of argv parameter (even after auto summary). The test is failing with below error: ERROR: test_scopes_variables_setVariable_evaluate_with_descriptive_summaries (TestDAP_variables.TestDAP_variables) Traceback (most recent call last): File "/llvm/llvm-project/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py", line 372, in test_scopes_variables_setVariable_evaluate_with_descriptive_summaries enableAutoVariableSummaries=True File "/llvm/llvm-project/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py", line 266, in do_test_scopes_variables_setVariable_evaluate argv = self.get_local_as_int("argv") File "//llvm/llvm-project/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py", line 199, in get_local_as_int return int(value, 16) ValueError: invalid literal for int() with base 16: '0x0000000000001234 sample summary' Config=x86_64-//llvm/llvm-build/bin/clang Co-authored-by: Santhosh Kumar Ellendula <selle...@hu-sellendu-hyd.qualcomm.com> Added: Modified: lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py Removed: ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py index 9d79872b029a334..0cf9d4fde49488f 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py @@ -195,6 +195,9 @@ def collect_console(self, duration): def get_local_as_int(self, name, threadId=None): value = self.dap_server.get_local_variable_value(name, threadId=threadId) + # 'value' may have the variable value and summary. + # Extract the variable value since summary can have nonnumeric characters. + value = value.split(" ")[0] if value.startswith("0x"): return int(value, 16) elif value.startswith("0"): _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
