From bb8d126033bc7982808323da80ac8649e27bb3eb Mon Sep 17 00:00:00 2001 From: Sandra Loosemore Date: Tue, 23 Jun 2020 09:33:31 -0700 Subject: [PATCH] Adjust command completion output when TUI is disabled The history-scrolling commands "+", "-", "<" and ">" are only known to GDB when TUI is enabled. This means the "complete pipe " command produces different output depending on whether TUI is present, which in turn caused FAIL: gdb.base/shell.exp: cmd complete "pipe " This patch provides different patterns for that test depending on whether or not TUI is available. 2020-06-23 Sandra Loosemore gdb/testsuite/ * lib/completion-support.exp (test_gdb_completion_offers_commands): Adjust for omitted commands when TUI is disabled. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/lib/completion-support.exp | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 18d19470d5b..0864d7522a4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-06-23 Sandra Loosemore + + * lib/completion-support.exp (test_gdb_completion_offers_commands): + Adjust for omitted commands when TUI is disabled. + 2020-06-23 Gary Benson Pedro Alves diff --git a/gdb/testsuite/lib/completion-support.exp b/gdb/testsuite/lib/completion-support.exp index 18eac827f5e..51436cc6713 100644 --- a/gdb/testsuite/lib/completion-support.exp +++ b/gdb/testsuite/lib/completion-support.exp @@ -555,10 +555,19 @@ proc test_gdb_completion_offers_commands {input_line} { # Force showing two commands. gdb_test_no_output "set max-completions 2" "" - test_gdb_complete_multiple $input_line "" "" { - "!" - "+" - } "" "" 1 + # TUI adds additional commands to the possible completions, so we + # need different patterns depending on whether or not it is enabled. + if { [skip_tui_tests] } { + test_gdb_complete_multiple $input_line "" "" { + "!" + "actions" + } "" "" 1 + } else { + test_gdb_complete_multiple $input_line "" "" { + "!" + "+" + } "" "" 1 + } # Restore. gdb_test_no_output "set max-completions $max_completions" "" -- 2.30.2