diff options
-rw-r--r-- | gdb/testsuite/gdb.ada/complete.exp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/gdb/testsuite/gdb.ada/complete.exp b/gdb/testsuite/gdb.ada/complete.exp index 9e92505..a73a012 100644 --- a/gdb/testsuite/gdb.ada/complete.exp +++ b/gdb/testsuite/gdb.ada/complete.exp @@ -28,7 +28,7 @@ clean_restart ${testfile} set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb] runto "foo.adb:$bp_location" -set eol "\[\r\n\]*" +set eol "\r\n" # A convenience function that verifies that the "complete EXPR" command # returns the EXPECTED_OUTPUT. @@ -227,11 +227,20 @@ test_gdb_complete "ambiguous_func" \ gdb_test_no_output "set max-completions unlimited" set test "complete break ada" -gdb_test_multiple "$test" $test { - -re "^$test$eol\(break ada\[\]\[a-z0-9._@/-\]*$eol\)+$gdb_prompt $" { - pass $test +gdb_test_multiple $test "" { + -re "^($test$eol)" { + exp_continue } + + -re "^(break ada\[\]\[a-z0-9._@/-\]*$eol)" { + exp_continue + } + + -re "^$gdb_prompt $" { + pass $gdb_test_name + } + -re "\[A-Z\].*$gdb_prompt $" { - fail "$test (gdb/22670)" + fail "$gdb_test_name (gdb/22670)" } } |