FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[gdb/testsuite] Add -q to INTERNAL_GDBFLAGS

Browse source 
Whenever we start gdb in the testsuite, we have the rather verbose:
...
$ gdb
GNU gdb (GDB) 14.0.50.20230405-git
Copyright (C) 2023 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Type "show copying" and "show warranty" for details.
This GDB was configured as "x86_64-pc-linux-gnu".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
<https://www.gnu.org/software/gdb/bugs/>.
Find the GDB manual and other documentation resources online at:
    <http://www.gnu.org/software/gdb/documentation/>.

For help, type "help".
Type "apropos word" to search for commands related to "word".
(gdb)
...

This makes gdb.log longer than necessary and harder to read.

We do need to test that the output is produced, but that should be limited to
one or a few test-cases.

Fix this by adding -q to INTERNAL_GDBFLAGS, such that we simply have:
...
$ gdb -q
(gdb)
...

Tested on x86_64-linux.
This commit is contained in:
Tom de Vries 2023-04-07 10:26:02 +02:00
parent 929a05081e
commit 31c5028017
8 changed files with 128 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gdb/testsuite/gdb.base/early-init-file.exp
View file

@ -101,7 +101,10 @@ save_vars { env(TERM) } {
setenv TERM ansi setenv TERM ansi
# Start GDB and confirm that the version string is styled. # Start GDB and confirm that the version string is styled.
check_gdb_startup_version_string version save_vars { INTERNAL_GDBFLAGS env(HOME) env(XDG_CONFIG_HOME) } {
set INTERNAL_GDBFLAGS [string map {"-q" ""} $INTERNAL_GDBFLAGS]
check_gdb_startup_version_string version
}
# Create an empty directory we can use as HOME for some of the # Create an empty directory we can use as HOME for some of the
# tests below. When we set XDG_CONFIG_HOME we still need to point # tests below. When we set XDG_CONFIG_HOME we still need to point
@ -120,7 +123,7 @@ save_vars { env(TERM) } {
# Now arrange to use the fake home directory early init file. # Now arrange to use the fake home directory early init file.
save_vars { INTERNAL_GDBFLAGS env(HOME) env(XDG_CONFIG_HOME) } { save_vars { INTERNAL_GDBFLAGS env(HOME) env(XDG_CONFIG_HOME) } {
set INTERNAL_GDBFLAGS [string map {"-nx" ""} $INTERNAL_GDBFLAGS] set INTERNAL_GDBFLAGS [string map {"-nx" "" "-q" ""} $INTERNAL_GDBFLAGS]
# Now test GDB when using the HOME directory. # Now test GDB when using the HOME directory.
set env(HOME) $home_dir set env(HOME) $home_dir
@ -144,7 +147,7 @@ save_vars { env(TERM) } {
# Now arrange to use the fake home directory startup file. # Now arrange to use the fake home directory startup file.
save_vars { INTERNAL_GDBFLAGS env(HOME) env(XDG_CONFIG_HOME) } { save_vars { INTERNAL_GDBFLAGS env(HOME) env(XDG_CONFIG_HOME) } {
set INTERNAL_GDBFLAGS [string map {"-nx" ""} $INTERNAL_GDBFLAGS] set INTERNAL_GDBFLAGS [string map {"-nx" "" "-q" ""} $INTERNAL_GDBFLAGS]
# Now test GDB when using the HOME directory. # Now test GDB when using the HOME directory.
set env(HOME) $home_dir set env(HOME) $home_dir

5
gdb/testsuite/gdb.base/libsegfault.exp
View file

@ -84,4 +84,7 @@ proc test_libsegfault {} {
} }
} }
test_libsegfault save_vars { ::INTERNAL_GDBFLAGS } {
set ::INTERNAL_GDBFLAGS [string map {"-q" ""} $::INTERNAL_GDBFLAGS]
test_libsegfault
}

14
gdb/testsuite/gdb.base/paginate-execution-startup.exp
View file

@ -172,12 +172,16 @@ proc test_fg_execution_pagination_cancel { how } {
} }
} }
if {[probe_can_run_cmdline] > 0} { save_vars { INTERNAL_GDBFLAGS } {
test_fg_execution_pagination_return set INTERNAL_GDBFLAGS [string map {"-q" ""} $INTERNAL_GDBFLAGS]
if ![target_info exists gdb,nointerrupts] {
test_fg_execution_pagination_cancel "ctrl-c" if {[probe_can_run_cmdline] > 0} {
test_fg_execution_pagination_return
if ![target_info exists gdb,nointerrupts] {
test_fg_execution_pagination_cancel "ctrl-c"
}
test_fg_execution_pagination_cancel "quit"
} }
test_fg_execution_pagination_cancel "quit"
} }
set GDBFLAGS $saved_gdbflags set GDBFLAGS $saved_gdbflags

7
gdb/testsuite/gdb.base/style.exp
View file

@ -459,7 +459,12 @@ proc test_disassembler_error_handling { } {
# startup process). # startup process).
proc test_startup_version_string { } { proc test_startup_version_string { } {
gdb_exit gdb_exit
gdb_spawn
save_vars { ::INTERNAL_GDBFLAGS } {
set ::INTERNAL_GDBFLAGS [string map {"-q" ""} $::INTERNAL_GDBFLAGS]
gdb_spawn
}
# Deliberate use of base STYLE proc here as the style of the # Deliberate use of base STYLE proc here as the style of the
# startup version string can't (currently) be controlled. # startup version string can't (currently) be controlled.

5
gdb/testsuite/gdb.gdb/selftest.exp
View file

@ -165,4 +165,7 @@ proc test_with_self { } {
return 0 return 0
} }
do_self_tests captured_main test_with_self save_vars { INTERNAL_GDBFLAGS } {
set INTERNAL_GDBFLAGS [string map {"-q" ""} $INTERNAL_GDBFLAGS]
do_self_tests captured_main test_with_self
}

168
gdb/testsuite/gdb.python/py-prompt.exp
View file

@ -27,92 +27,96 @@ if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
return -1 return -1
} }
global GDBFLAGS save_vars { INTERNAL_GDBFLAGS } {
set saved_gdbflags $GDBFLAGS set INTERNAL_GDBFLAGS [string map {"-q" ""} $INTERNAL_GDBFLAGS]
set GDBFLAGS [concat $GDBFLAGS " -ex \"set height 0\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"set width 0\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"python p = list()\""]
set prompt_func "python def foo(x): global p; p.append(x); return \'(Foo) \'"
set GDBFLAGS [concat $GDBFLAGS " -ex \"$prompt_func\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"python gdb.prompt_hook=foo\""]
set tmp_gdbflags $GDBFLAGS global GDBFLAGS
set gdb_prompt_fail $gdb_prompt set saved_gdbflags $GDBFLAGS
set GDBFLAGS [concat $GDBFLAGS " -ex \"set height 0\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"set width 0\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"python p = list()\""]
set prompt_func "python def foo(x): global p; p.append(x); return \'(Foo) \'"
set GDBFLAGS [concat $GDBFLAGS " -ex \"$prompt_func\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"python gdb.prompt_hook=foo\""]
global gdb_prompt set tmp_gdbflags $GDBFLAGS
# Does not include the space at the end of the prompt. set gdb_prompt_fail $gdb_prompt
# gdb_test expects it not to be there.
set gdb_prompt "\[(\]Foo\[)\]"
with_test_prefix "set editing on" { global gdb_prompt
set GDBFLAGS [concat $tmp_gdbflags " -ex \"set editing on\""] # Does not include the space at the end of the prompt.
prompt_gdb_start # gdb_test expects it not to be there.
gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \ set gdb_prompt "\[(\]Foo\[)\]"
".*prompt is \"$gdb_prompt \".*" \
"show prompt gets the correct result"
gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \
"retrieving the prompt causes no extra prompt_hook calls"
gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \
"prompt_hook argument is default prompt."
gdb_exit
}
with_test_prefix "set editing off" { with_test_prefix "set editing on" {
set GDBFLAGS [concat $tmp_gdbflags " -ex \"set editing off\""] set GDBFLAGS [concat $tmp_gdbflags " -ex \"set editing on\""]
prompt_gdb_start prompt_gdb_start
gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \ gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \
".*prompt is \"$gdb_prompt \".*" \ ".*prompt is \"$gdb_prompt \".*" \
"show prompt gets the correct result 2" "show prompt gets the correct result"
gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \ gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \
"retrieving the prompt causes no extra prompt_hook calls 2" "retrieving the prompt causes no extra prompt_hook calls"
gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \ gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \
"prompt_hook argument is default prompt. 2" "prompt_hook argument is default prompt."
gdb_exit gdb_exit
} }
with_test_prefix "set editing off" {
set GDBFLAGS [concat $tmp_gdbflags " -ex \"set editing off\""]
prompt_gdb_start
gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \
".*prompt is \"$gdb_prompt \".*" \
"show prompt gets the correct result 2"
gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \
"retrieving the prompt causes no extra prompt_hook calls 2"
gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \
"prompt_hook argument is default prompt. 2"
gdb_exit
}
if {![can_spawn_for_attach]} {
set GDBFLAGS $saved_gdbflags
return 0
}
set test_spawn_id [spawn_wait_for_attach $binfile]
set testpid [spawn_id_get_pid $test_spawn_id]
set GDBFLAGS [concat $tmp_gdbflags " -ex \"set pagination off\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"set editing on\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"attach $testpid\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"continue&\""]
# sync_execution = 1 is_running = 1
with_test_prefix "sync_execution = 1, is_running = 1" {
prompt_gdb_start
gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \
".*prompt is \"$gdb_prompt \".*" \
"show prompt gets the correct result 3"
gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \
"retrieving the prompt causes no extra prompt_hook calls 3"
gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \
"prompt_hook argument is default prompt. 3"
gdb_exit
}
set GDBFLAGS [concat $tmp_gdbflags " -ex \"set pagination off\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"set editing on\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"attach $testpid\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"interrupt\""]
# sync_execution = 1 is_running = 0
with_test_prefix "sync_execution = 1, is_running = 0" {
prompt_gdb_start
gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \
".*prompt is \"$gdb_prompt \".*" \
"show prompt gets the correct result 4"
gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \
"retrieving the prompt causes no extra prompt_hook calls 4"
gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \
"prompt_hook argument is default prompt. 4"
gdb_exit
}
if {![can_spawn_for_attach]} {
set GDBFLAGS $saved_gdbflags set GDBFLAGS $saved_gdbflags
return 0 kill_wait_spawned_process $test_spawn_id
} }
set test_spawn_id [spawn_wait_for_attach $binfile]
set testpid [spawn_id_get_pid $test_spawn_id]
set GDBFLAGS [concat $tmp_gdbflags " -ex \"set pagination off\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"set editing on\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"attach $testpid\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"continue&\""]
# sync_execution = 1 is_running = 1
with_test_prefix "sync_execution = 1, is_running = 1" {
prompt_gdb_start
gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \
".*prompt is \"$gdb_prompt \".*" \
"show prompt gets the correct result 3"
gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \
"retrieving the prompt causes no extra prompt_hook calls 3"
gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \
"prompt_hook argument is default prompt. 3"
gdb_exit
}
set GDBFLAGS [concat $tmp_gdbflags " -ex \"set pagination off\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"set editing on\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"attach $testpid\""]
set GDBFLAGS [concat $GDBFLAGS " -ex \"interrupt\""]
# sync_execution = 1 is_running = 0
with_test_prefix "sync_execution = 1, is_running = 0" {
prompt_gdb_start
gdb_test "python x = len(p); print (gdb.execute(\"show prompt\", to_string = True))" \
".*prompt is \"$gdb_prompt \".*" \
"show prompt gets the correct result 4"
gdb_test "python print ('%d %d' % (x, len(p)))" "1 2" \
"retrieving the prompt causes no extra prompt_hook calls 4"
gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \
"prompt_hook argument is default prompt. 4"
gdb_exit
}
set GDBFLAGS $saved_gdbflags
kill_wait_spawned_process $test_spawn_id

9
gdb/testsuite/lib/gdb.exp
View file

@ -216,6 +216,7 @@ if ![info exists INTERNAL_GDBFLAGS] {
[join [list \ [join [list \
"-nw" \ "-nw" \
"-nx" \ "-nx" \
"-q" \
{-iex "set height 0"} \ {-iex "set height 0"} \
{-iex "set width 0"}]] {-iex "set width 0"}]]
@ -2302,6 +2303,14 @@ proc default_gdb_start { } {
# that case, this case is hit. # that case, this case is hit.
verbose "GDB initialized." verbose "GDB initialized."
} }
-re "^$gdb_prompt $" {
# Output with -q.
verbose "GDB initialized."
}
-re "^\033\\\[.2004h$gdb_prompt $" {
# Output with -q, and bracketed paste mode enabled, see above.
verbose "GDB initialized."
}
-re "$gdb_prompt $" { -re "$gdb_prompt $" {
perror "GDB never initialized." perror "GDB never initialized."
unset gdb_spawn_id unset gdb_spawn_id

4
gdb/testsuite/lib/mi-support.exp
View file

@ -265,6 +265,10 @@ proc default_mi_gdb_start { { flags {} } } {
# We have a new format mi startup prompt. # We have a new format mi startup prompt.
verbose "GDB initialized." verbose "GDB initialized."
} }
-re "^(=\[^\r\n\]*\r\n)*$mi_gdb_prompt$" {
# Output with -q.
verbose "GDB initialized."
}
-re ".*unrecognized option.*for a complete list of options." { -re ".*unrecognized option.*for a complete list of options." {
untested "skip mi tests (not compiled with mi support)." untested "skip mi tests (not compiled with mi support)."
remote_close host remote_close host