From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: *** This commit represents a complete reformatting of the LLDB source code *** to conform to clang-format’s LLVM style. This kind of mass change has *** two obvious implications: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Firstly, merging this particular commit into a downstream fork may be a huge effort. Alternatively, it may be worth merging all changes up to this commit, performing the same reformatting operation locally, and then discarding the merge for this particular commit. The commands used to accomplish this reformatting were as follows (with current working directory as the root of the repository): find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} + find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ; The version of clang-format used was 3.9.0, and autopep8 was 1.2.4. Secondly, “blame” style tools will generally point to this commit instead of a meaningful prior commit. There are alternatives available that will attempt to look through this change and find the appropriate prior commit. YMMV. llvm-svn: 280751 --- .../Python/lldbsuite/test/help/TestHelp.py | 130 ++++++++++++--------- 1 file changed, 76 insertions(+), 54 deletions(-) (limited to 'lldb/packages/Python/lldbsuite/test/help/TestHelp.py') diff --git a/lldb/packages/Python/lldbsuite/test/help/TestHelp.py b/lldb/packages/Python/lldbsuite/test/help/TestHelp.py index f4e9faff0ed..9bcac6b398d 100644 --- a/lldb/packages/Python/lldbsuite/test/help/TestHelp.py +++ b/lldb/packages/Python/lldbsuite/test/help/TestHelp.py @@ -7,13 +7,14 @@ See also CommandInterpreter::OutputFormattedHelpText(). from __future__ import print_function - -import os, time +import os +import time import lldb from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import * from lldbsuite.test import lldbutil + class HelpCommandTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) @@ -22,25 +23,28 @@ class HelpCommandTestCase(TestBase): def test_simplehelp(self): """A simple test of 'help' command and its output.""" self.expect("help", - startstr = 'Debugger commands:') + startstr='Debugger commands:') self.expect("help -a", matching=False, - substrs = ['next']) - + substrs=['next']) + self.expect("help", matching=True, - substrs = ['next']) - + substrs=['next']) + @no_debug_info_test def test_help_on_help(self): """Testing the help on the help facility.""" self.expect("help help", matching=True, - substrs = ['--hide-aliases', - '--hide-user-commands']) + substrs=['--hide-aliases', + '--hide-user-commands']) @no_debug_info_test def version_number_string(self): """Helper function to find the version number string of lldb.""" - plist = os.path.join(os.environ["LLDB_SRC"], "resources", "LLDB-Info.plist") + plist = os.path.join( + os.environ["LLDB_SRC"], + "resources", + "LLDB-Info.plist") try: CFBundleVersionSegFound = False with open(plist, 'r') as f: @@ -53,13 +57,14 @@ class HelpCommandTestCase(TestBase): version = m.group(1) return version else: - # Unsuccessful, let's juts break out of the for loop. + # Unsuccessful, let's juts break out of the for + # loop. break if line.find("CFBundleVersion") != -1: # Found our match. The next line contains our version # string, for example: - # + # # 38 CFBundleVersionSegFound = True @@ -76,13 +81,13 @@ class HelpCommandTestCase(TestBase): def test_help_arch(self): """Test 'help arch' which should list of supported architectures.""" self.expect("help arch", - substrs = ['arm', 'x86_64', 'i386']) + substrs=['arm', 'x86_64', 'i386']) @no_debug_info_test def test_help_version(self): """Test 'help version' and 'version' commands.""" self.expect("help version", - substrs = ['Show the LLDB debugger version.']) + substrs=['Show the LLDB debugger version.']) version_str = self.version_number_string() import re match = re.match('[0-9]+', version_str) @@ -92,7 +97,7 @@ class HelpCommandTestCase(TestBase): search_regexp = ['lldb version (\d|\.)+.*$'] self.expect("version", - patterns = search_regexp) + patterns=search_regexp) @no_debug_info_test def test_help_should_not_crash_lldb(self): @@ -103,101 +108,112 @@ class HelpCommandTestCase(TestBase): @no_debug_info_test def test_help_should_not_hang_emacsshell(self): """Command 'settings set term-width 0' should not hang the help command.""" - self.expect("settings set term-width 0", - COMMAND_FAILED_AS_EXPECTED, error=True, - substrs = ['error: 0 is out of range, valid values must be between']) + self.expect( + "settings set term-width 0", + COMMAND_FAILED_AS_EXPECTED, + error=True, + substrs=['error: 0 is out of range, valid values must be between']) # self.runCmd("settings set term-width 0") self.expect("help", - startstr = 'Debugger commands:') + startstr='Debugger commands:') @no_debug_info_test def test_help_breakpoint_set(self): """Test that 'help breakpoint set' does not print out redundant lines of: 'breakpoint set [-s ] ...'.""" self.expect("help breakpoint set", matching=False, - substrs = ['breakpoint set [-s ]']) + substrs=['breakpoint set [-s ]']) @no_debug_info_test def test_help_image_dump_symtab_should_not_crash(self): """Command 'help image dump symtab' should not crash lldb.""" # 'image' is an alias for 'target modules'. self.expect("help image dump symtab", - substrs = ['dump symtab', - 'sort-order']) + substrs=['dump symtab', + 'sort-order']) @no_debug_info_test def test_help_image_du_sym_is_ambiguous(self): """Command 'help image du sym' is ambiguous and spits out the list of candidates.""" self.expect("help image du sym", COMMAND_FAILED_AS_EXPECTED, error=True, - substrs = ['error: ambiguous command image du sym', - 'symfile', - 'symtab']) + substrs=['error: ambiguous command image du sym', + 'symfile', + 'symtab']) @no_debug_info_test def test_help_image_du_line_should_work(self): """Command 'help image du line-table' is not ambiguous and should work.""" # 'image' is an alias for 'target modules'. - self.expect("help image du line", - substrs = ['Dump the line table for one or more compilation units']) + self.expect("help image du line", substrs=[ + 'Dump the line table for one or more compilation units']) @no_debug_info_test def test_help_target_variable_syntax(self): """Command 'help target variable' should display ...""" self.expect("help target variable", - substrs = [' [ [...]]']) + substrs=[' [ [...]]']) @no_debug_info_test def test_help_watchpoint_and_its_args(self): """Command 'help watchpoint', 'help watchpt-id', and 'help watchpt-id-list' should work.""" self.expect("help watchpoint", - substrs = ['delete', 'disable', 'enable', 'list']) + substrs=['delete', 'disable', 'enable', 'list']) self.expect("help watchpt-id", - substrs = ['']) + substrs=['']) self.expect("help watchpt-id-list", - substrs = ['']) + substrs=['']) @no_debug_info_test def test_help_watchpoint_set(self): """Test that 'help watchpoint set' prints out 'expression' and 'variable' as the possible subcommands.""" self.expect("help watchpoint set", - substrs = ['The following subcommands are supported:'], - patterns = ['expression +--', - 'variable +--']) + substrs=['The following subcommands are supported:'], + patterns=['expression +--', + 'variable +--']) @no_debug_info_test def test_help_po_hides_options(self): """Test that 'help po' does not show all the options for expression""" - self.expect("help po", - substrs = ['--show-all-children', '--object-description'], matching=False) + self.expect( + "help po", + substrs=[ + '--show-all-children', + '--object-description'], + matching=False) @no_debug_info_test def test_help_run_hides_options(self): """Test that 'help run' does not show all the options for process launch""" self.expect("help run", - substrs = ['--arch', '--environment'], matching=False) + substrs=['--arch', '--environment'], matching=False) @no_debug_info_test def test_help_next_shows_options(self): """Test that 'help next' shows all the options for thread step-over""" self.expect("help next", - substrs = ['--python-class','--run-mode'], matching=True) + substrs=['--python-class', '--run-mode'], matching=True) @no_debug_info_test def test_help_provides_alternatives(self): """Test that help on commands that don't exist provides information on additional help avenues""" - self.expect("help thisisnotadebuggercommand", - substrs = ["'thisisnotadebuggercommand' is not a known command.", - "Try 'help' to see a current list of commands.", - "Try 'apropos thisisnotadebuggercommand' for a list of related commands.", - "Try 'type lookup thisisnotadebuggercommand' for information on types, methods, functions, modules, etc."], error=True) - - self.expect("help process thisisnotadebuggercommand", - substrs = ["'process thisisnotadebuggercommand' is not a known command.", - "Try 'help' to see a current list of commands.", - "Try 'apropos thisisnotadebuggercommand' for a list of related commands.", - "Try 'type lookup thisisnotadebuggercommand' for information on types, methods, functions, modules, etc."]) + self.expect( + "help thisisnotadebuggercommand", + substrs=[ + "'thisisnotadebuggercommand' is not a known command.", + "Try 'help' to see a current list of commands.", + "Try 'apropos thisisnotadebuggercommand' for a list of related commands.", + "Try 'type lookup thisisnotadebuggercommand' for information on types, methods, functions, modules, etc."], + error=True) + + self.expect( + "help process thisisnotadebuggercommand", + substrs=[ + "'process thisisnotadebuggercommand' is not a known command.", + "Try 'help' to see a current list of commands.", + "Try 'apropos thisisnotadebuggercommand' for a list of related commands.", + "Try 'type lookup thisisnotadebuggercommand' for information on types, methods, functions, modules, etc."]) @no_debug_info_test def test_custom_help_alias(self): @@ -205,9 +221,15 @@ class HelpCommandTestCase(TestBase): def cleanup(): self.runCmd('command unalias afriendlyalias', check=False) self.runCmd('command unalias averyfriendlyalias', check=False) - + self.addTearDownHook(cleanup) - self.runCmd('command alias --help "I am a friendly alias" -- afriendlyalias help') - self.expect("help afriendlyalias", matching=True, substrs = ['I am a friendly alias']) - self.runCmd('command alias --long-help "I am a very friendly alias" -- averyfriendlyalias help') - self.expect("help averyfriendlyalias", matching=True, substrs = ['I am a very friendly alias']) + self.runCmd( + 'command alias --help "I am a friendly alias" -- afriendlyalias help') + self.expect( + "help afriendlyalias", + matching=True, + substrs=['I am a friendly alias']) + self.runCmd( + 'command alias --long-help "I am a very friendly alias" -- averyfriendlyalias help') + self.expect("help averyfriendlyalias", matching=True, + substrs=['I am a very friendly alias']) -- cgit v1.2.3