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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 18d19470d5b313a06a4e8714d835d3824c8638ac..0864d7522a459f1e50b14f495edddf9cf8bdc370 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -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>
 

diff --git a/gdb/testsuite/lib/completion-support.exp b/gdb/testsuite/lib/completion-support.exp
index 18eac827f5ecdee3220c55f62b74955a634402ef..51436cc6713caa307339d9a559a9029d55d71a5d 100644 (file)
--- 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" ""