diff options
author | Raphael Isemann <teemperor@gmail.com> | 2019-07-19 15:55:23 +0000 |
---|---|---|
committer | Raphael Isemann <teemperor@gmail.com> | 2019-07-19 15:55:23 +0000 |
commit | b45853f173139c7c3078b97f53e7a6eba6148c13 (patch) | |
tree | 3b24eec01a7b23edd4364911d9bf6490ce2c1422 /lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables | |
parent | 005423018182120f3ae2a54ff5fd3390c96fb527 (diff) | |
download | bcm5719-llvm-b45853f173139c7c3078b97f53e7a6eba6148c13.tar.gz bcm5719-llvm-b45853f173139c7c3078b97f53e7a6eba6148c13.zip |
[lldb][NFC] Cleanup mentions and code related to lldb-mi
Summary: lldb-mi has been removed, but there are still a bunch of references in the code base. This patch removes all of them.
Reviewers: JDevlieghere, jfb
Reviewed By: JDevlieghere
Subscribers: dexonsmith, ki.stfu, mgorny, abidh, jfb, lldb-commits
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D64992
llvm-svn: 366590
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables')
3 files changed, 0 insertions, 248 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/Makefile deleted file mode 100644 index 314f1cb2f07..00000000000 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -LEVEL = ../../../make - -CXX_SOURCES := main.cpp - -include $(LEVEL)/Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/TestVSCode_variables.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/TestVSCode_variables.py deleted file mode 100644 index 0a8906f1c6c..00000000000 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/TestVSCode_variables.py +++ /dev/null @@ -1,225 +0,0 @@ -""" -Test lldb-vscode setBreakpoints request -""" - -from __future__ import print_function - -import unittest2 -import vscode -from lldbsuite.test.decorators import * -from lldbsuite.test.lldbtest import * -from lldbsuite.test import lldbutil -import lldbvscode_testcase -import os - - -def make_buffer_verify_dict(start_idx, count, offset=0): - verify_dict = {} - for i in range(start_idx, start_idx + count): - verify_dict['[%i]' % (i)] = {'type': 'int', 'value': str(i+offset)} - return verify_dict - - -class TestVSCode_variables(lldbvscode_testcase.VSCodeTestCaseBase): - - mydir = TestBase.compute_mydir(__file__) - - def verify_values(self, verify_dict, actual, varref_dict=None): - if 'equals' in verify_dict: - verify = verify_dict['equals'] - for key in verify: - verify_value = verify[key] - actual_value = actual[key] - self.assertTrue(verify_value == actual_value, - '"%s" keys don\'t match (%s != %s)' % ( - key, actual_value, verify_value)) - if 'startswith' in verify_dict: - verify = verify_dict['startswith'] - for key in verify: - verify_value = verify[key] - actual_value = actual[key] - startswith = actual_value.startswith(verify_value) - self.assertTrue(startswith, - ('"%s" value "%s" doesn\'t start with' - ' "%s")') % ( - key, actual_value, - verify_value)) - hasVariablesReference = 'variablesReference' in actual - varRef = None - if hasVariablesReference: - # Remember variable references in case we want to test further - # by using the evaluate name. - varRef = actual['variablesReference'] - if varRef != 0 and varref_dict is not None: - varref_dict[actual['evaluateName']] = varRef - if ('hasVariablesReference' in verify_dict and - verify_dict['hasVariablesReference']): - self.assertTrue(hasVariablesReference, - "verify variable reference") - if 'children' in verify_dict: - self.assertTrue(hasVariablesReference and varRef is not None and - varRef != 0, - ("children verify values specified for " - "variable without children")) - - response = self.vscode.request_variables(varRef) - self.verify_variables(verify_dict['children'], - response['body']['variables'], - varref_dict) - - def verify_variables(self, verify_dict, variables, varref_dict=None): - for variable in variables: - name = variable['name'] - self.assertTrue(name in verify_dict, - 'variable "%s" in verify dictionary' % (name)) - self.verify_values(verify_dict[name], variable, varref_dict) - - @skipIfWindows - @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots - @no_debug_info_test - def test_scopes_variables_setVariable_evaluate(self): - ''' - Tests the "scopes", "variables", "setVariable", and "evaluate" - packets. - ''' - program = self.getBuildArtifact("a.out") - self.build_and_launch(program) - source = 'main.cpp' - breakpoint1_line = line_number(source, '// breakpoint 1') - lines = [breakpoint1_line] - # Set breakoint in the thread function so we can step the threads - breakpoint_ids = self.set_source_breakpoints(source, lines) - self.assertTrue(len(breakpoint_ids) == len(lines), - "expect correct number of breakpoints") - self.continue_to_breakpoints(breakpoint_ids) - locals = self.vscode.get_local_variables() - globals = self.vscode.get_global_variables() - buffer_children = make_buffer_verify_dict(0, 32) - verify_locals = { - 'argc': { - 'equals': {'type': 'int', 'value': '1'} - }, - 'argv': { - 'equals': {'type': 'const char **'}, - 'startswith': {'value': '0x'}, - 'hasVariablesReference': True - }, - 'pt': { - 'equals': {'type': 'PointType'}, - 'hasVariablesReference': True, - 'children': { - 'x': {'equals': {'type': 'int', 'value': '11'}}, - 'y': {'equals': {'type': 'int', 'value': '22'}}, - 'buffer': {'children': buffer_children} - } - } - } - verify_globals = { - 's_local': { - 'equals': {'type': 'float', 'value': '2.25'} - }, - '::g_global': { - 'equals': {'type': 'int', 'value': '123'} - }, - 's_global': { - 'equals': {'type': 'int', 'value': '234'} - }, - } - varref_dict = {} - self.verify_variables(verify_locals, locals, varref_dict) - self.verify_variables(verify_globals, globals, varref_dict) - # pprint.PrettyPrinter(indent=4).pprint(varref_dict) - # We need to test the functionality of the "variables" request as it - # has optional parameters like "start" and "count" to limit the number - # of variables that are fetched - varRef = varref_dict['pt.buffer'] - response = self.vscode.request_variables(varRef) - self.verify_variables(buffer_children, response['body']['variables']) - # Verify setting start=0 in the arguments still gets all children - response = self.vscode.request_variables(varRef, start=0) - self.verify_variables(buffer_children, response['body']['variables']) - # Verify setting count=0 in the arguments still gets all children. - # If count is zero, it means to get all children. - response = self.vscode.request_variables(varRef, count=0) - self.verify_variables(buffer_children, response['body']['variables']) - # Verify setting count to a value that is too large in the arguments - # still gets all children, and no more - response = self.vscode.request_variables(varRef, count=1000) - self.verify_variables(buffer_children, response['body']['variables']) - # Verify setting the start index and count gets only the children we - # want - response = self.vscode.request_variables(varRef, start=5, count=5) - self.verify_variables(make_buffer_verify_dict(5, 5), - response['body']['variables']) - # Verify setting the start index to a value that is out of range - # results in an empty list - response = self.vscode.request_variables(varRef, start=32, count=1) - self.assertTrue(len(response['body']['variables']) == 0, - 'verify we get no variable back for invalid start') - - # Test evaluate - expressions = { - 'pt.x': { - 'equals': {'result': '11', 'type': 'int'}, - 'hasVariablesReference': False - }, - 'pt.buffer[2]': { - 'equals': {'result': '2', 'type': 'int'}, - 'hasVariablesReference': False - }, - 'pt': { - 'equals': {'type': 'PointType'}, - 'startswith': {'result': 'PointType @ 0x'}, - 'hasVariablesReference': True - }, - 'pt.buffer': { - 'equals': {'type': 'int [32]'}, - 'startswith': {'result': 'int [32] @ 0x'}, - 'hasVariablesReference': True - }, - 'argv': { - 'equals': {'type': 'const char **'}, - 'startswith': {'result': '0x'}, - 'hasVariablesReference': True - }, - 'argv[0]': { - 'equals': {'type': 'const char *'}, - 'startswith': {'result': '0x'}, - 'hasVariablesReference': True - }, - '2+3': { - 'equals': {'result': '5', 'type': 'int'}, - 'hasVariablesReference': False - }, - } - for expression in expressions: - response = self.vscode.request_evaluate(expression) - self.verify_values(expressions[expression], response['body']) - - # Test setting variables - self.set_local('argc', 123) - argc = self.get_local_as_int('argc') - self.assertTrue(argc == 123, - 'verify argc was set to 123 (123 != %i)' % (argc)) - - self.set_local('argv', 0x1234) - argv = self.get_local_as_int('argv') - self.assertTrue(argv == 0x1234, - 'verify argv was set to 0x1234 (0x1234 != %#x)' % ( - argv)) - - # Set a variable value whose name is synthetic, like a variable index - # and verify the value by reading it - self.vscode.request_setVariable(varRef, "[0]", 100) - response = self.vscode.request_variables(varRef, start=0, count=1) - self.verify_variables(make_buffer_verify_dict(0, 1, 100), - response['body']['variables']) - - # Set a variable value whose name is a real child value, like "pt.x" - # and verify the value by reading it - varRef = varref_dict['pt'] - self.vscode.request_setVariable(varRef, "x", 111) - response = self.vscode.request_variables(varRef, start=0, count=1) - value = response['body']['variables'][0]['value'] - self.assertTrue(value == '111', - 'verify pt.x got set to 111 (111 != %s)' % (value)) diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/main.cpp deleted file mode 100644 index 0223bd0a75e..00000000000 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/main.cpp +++ /dev/null @@ -1,18 +0,0 @@ - -#define BUFFER_SIZE 32 -struct PointType { - int x; - int y; - int buffer[BUFFER_SIZE]; -}; - -int g_global = 123; -static int s_global = 234; - -int main(int argc, char const *argv[]) { - static float s_local = 2.25; - PointType pt = { 11,22, {0}}; - for (int i=0; i<BUFFER_SIZE; ++i) - pt.buffer[i] = i; - return s_global - g_global - pt.y; // breakpoint 1 -} |