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  <sandra@codesourcery.com>

	gdb/testsuite/
	* lib/completion-support.exp (test_gdb_completion_offers_commands):
	Adjust for omitted commands when TUI is disabled.
This commit is contained in:
Sandra Loosemore 2020-06-23 09:33:31 -07:00
parent d0dded5bc2
commit bb8d126033
2 changed files with 18 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2020-06-23 Sandra Loosemore <sandra@codesourcery.com>
* lib/completion-support.exp (test_gdb_completion_offers_commands):
Adjust for omitted commands when TUI is disabled.
2020-06-23 Gary Benson <gbenson@redhat.com>
Pedro Alves <palves@redhat.com>

View File

@ -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" ""