From 8ad44441ebb074b05077524e91047b1e7ca40bf5 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 19 Apr 2023 15:50:32 +0200 Subject: [PATCH] [gdb/testsuite] Use verbose -log for "GDB initialized" Since commit 31c50280179 ("[gdb/testsuite] Add -q to INTERNAL_GDBFLAGS") we have the somewhat terse: ... builtin_spawn gdb ... -q ... (gdb) ... in gdb.log. Make this a bit more verbose, to get: ... builtin_spawn gdb ... -q ... (gdb) GDB initialized. ... Tested on x86_64-linux. Reported-By: John Baldwin --- gdb/testsuite/lib/gdb.exp | 8 ++++---- gdb/testsuite/lib/mi-support.exp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 9ea0334759d..6360e62031a 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -2292,7 +2292,7 @@ proc default_gdb_start { } { # get really slow. Give gdb at least 3 minutes to start up. gdb_expect 360 { -re "\[\r\n\]$gdb_prompt $" { - verbose "GDB initialized." + verbose -log "GDB initialized." } -re "\[\r\n\]\033\\\[.2004h$gdb_prompt $" { # This special case detects what happens when GDB is @@ -2301,15 +2301,15 @@ proc default_gdb_start { } { # default_gdb_init), but for at least one test we turn # bracketed paste mode back on, and then start GDB. In # that case, this case is hit. - verbose "GDB initialized." + verbose -log "GDB initialized." } -re "^$gdb_prompt $" { # Output with -q. - verbose "GDB initialized." + verbose -log "GDB initialized." } -re "^\033\\\[.2004h$gdb_prompt $" { # Output with -q, and bracketed paste mode enabled, see above. - verbose "GDB initialized." + verbose -log "GDB initialized." } -re "$gdb_prompt $" { perror "GDB never initialized." diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 0d830d8e4ae..4570973ccf5 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -263,11 +263,11 @@ proc default_mi_gdb_start { { flags {} } } { gdb_expect { -re "~\"GNU.*\r\n~\".*$mi_gdb_prompt$" { # We have a new format mi startup prompt. - verbose "GDB initialized." + verbose -log "GDB initialized." } -re "^(=\[^\r\n\]*\r\n)*$mi_gdb_prompt$" { # Output with -q. - verbose "GDB initialized." + verbose -log "GDB initialized." } -re ".*unrecognized option.*for a complete list of options." { untested "skip mi tests (not compiled with mi support)." base-commit: 28ab94f51dcdee056d96e57ad04c27c22cf854ea -- 2.35.3