gdb/testsuite: Improve testing of GDB's completion functions

When looking at some failures of gdb.linespec/cp-completion-aliases.exp,
I noticed that when a completion test will fail, it always fails with a
timeout.  This is because most completion tests use gdb_test_multiple
and only add a check for the correct output.  This commit adds new
options for both, tab and command completion.

For command completion, the new option will check if the prompt was
printed, and fail in this case. This is enough to know that the test has
failed because the check comes after the PASS path. For tab completion,
we have to check if GDB outputted more than just the input line, because
sometimes GDB would have printed a partial line before finishing with
the correct completion.

Approved-By: Tom Tromey <tom@tromey.com>

diff --git a/gdb/testsuite/lib/completion-support.exp b/gdb/testsuite/lib/completion-support.exp
index bf9c5ad352c7594d2e8acac97fa4cf00274575a3..275f8874f15885d583ae207a27c224d79ebe657d 100644 (file)
--- a/gdb/testsuite/lib/completion-support.exp
+++ b/gdb/testsuite/lib/completion-support.exp
@@ -94,6 +94,9 @@ proc test_gdb_complete_tab_none { line } {
        -re "^$line_re$completion::bell_re$" {
            pass "$test"
        }
+       -re "$line_re\[^ \]+ $" {
+           fail "$test"
+       }
     }
 
     clear_input_line $test
@@ -108,11 +111,15 @@ proc test_gdb_complete_tab_unique { input_line complete_line_re append_char_re }
 
     set test "tab complete \"$input_line\""
     send_gdb "$input_line\t"
+    set partial_complete [string_to_regexp $input_line]
     set res 1
     gdb_test_multiple "" "$test" {
        -re "^$complete_line_re$append_char_re$" {
            pass "$test"
        }
+       -re "$partial_complete\[^ \]+ $" {
+           fail "$test"
+       }
        timeout {
            fail "$test (timeout)"
            set res -1
@@ -164,6 +171,9 @@ proc test_gdb_complete_tab_multiple { input_line add_completed_line \
                        }
                    }
                }
+               -re "${maybe_bell}\r\n.+\r\n$gdb_prompt $" {
+                   fail "$test"
+               }
            }
        }
     }
@@ -191,6 +201,9 @@ proc test_gdb_complete_cmd_unique { input_line complete_line_re } {
        -re "^$cmd_re\r\n$complete_line_re\r\n$gdb_prompt $" {
            pass $test
        }
+       -re "$gdb_prompt $" {
+           fail "$test"
+       }
     }
 }
 
@@ -217,6 +230,9 @@ proc test_gdb_complete_cmd_multiple { cmd_prefix completion_word completion_list
        -re "^$cmd_re\r\n$expected_re$gdb_prompt $" {
            pass $test
        }
+       -re "$gdb_prompt $" {
+           fail "$test"
+       }
     }
 }