diff --git a/lldb/source/Core/IOHandlerCursesGUI.cpp b/lldb/source/Core/IOHandlerCursesGUI.cpp --- a/lldb/source/Core/IOHandlerCursesGUI.cpp +++ b/lldb/source/Core/IOHandlerCursesGUI.cpp @@ -7667,14 +7667,6 @@ status_window_sp->SetDelegate( WindowDelegateSP(new StatusBarWindowDelegate(m_debugger))); - // Show the main help window once the first time the curses GUI is - // launched - static bool g_showed_help = false; - if (!g_showed_help) { - g_showed_help = true; - main_window_sp->CreateHelpSubwindow(); - } - // All colors with black background. init_pair(1, COLOR_BLACK, COLOR_BLACK); init_pair(2, COLOR_RED, COLOR_BLACK); diff --git a/lldb/test/API/commands/gui/basic/TestGuiBasic.py b/lldb/test/API/commands/gui/basic/TestGuiBasic.py --- a/lldb/test/API/commands/gui/basic/TestGuiBasic.py +++ b/lldb/test/API/commands/gui/basic/TestGuiBasic.py @@ -26,18 +26,9 @@ escape_key = chr(27).encode() - # Start the GUI for the first time and check for the welcome window. + # Start the GUI. self.child.sendline("gui") - self.child.expect_exact("Welcome to the LLDB curses GUI.") - # Press escape to quit the welcome screen - self.child.send(escape_key) - # Press escape again to quit the gui - self.child.send(escape_key) - self.expect_prompt() - - # Start the GUI a second time, this time we should have the normal GUI. - self.child.sendline("gui") # Check for GUI elements in the menu bar. self.child.expect_exact("Target") self.child.expect_exact("Process") diff --git a/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py b/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py --- a/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py +++ b/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py @@ -25,10 +25,8 @@ escape_key = chr(27).encode() - # Start the GUI and close the welcome window. + # Start the GUI. self.child.sendline("gui") - self.child.expect("Welcome to the LLDB curses GUI.") - self.child.send(escape_key) # Simulate a simple debugging session. self.child.send("s") # step diff --git a/lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py b/lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py --- a/lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py +++ b/lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py @@ -29,9 +29,8 @@ escape_key = chr(27).encode() down_key = chr(27)+'OB' # for vt100 terminal (lldbexpect sets TERM=vt100) - # Start the GUI and close the welcome window. + # Start the GUI. self.child.sendline("gui") - self.child.send(escape_key) self.child.expect_exact("Sources") # wait for gui # Go to next line, set a breakpoint. diff --git a/lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py b/lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py --- a/lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py +++ b/lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py @@ -31,9 +31,8 @@ right_key = chr(27)+'OC' ctrl_l = chr(12) - # Start the GUI and close the welcome window. + # Start the GUI. self.child.sendline("gui") - self.child.send(escape_key) # Check the sources window. self.child.expect_exact("Sources")