From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id C007C3846420; Fri, 3 May 2024 13:07:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C007C3846420 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1714741643; bh=8vrkuBgDlWj5vF6lro9w8s8BxkHlj3JiIfiIKBiAajc=; h=From:To:Subject:Date:From; b=xel4Ip5T1HtPns4wKWaNPfhF5Nju/J2tNlctR4wvbhOzkTvsMfSMT1D5dKt8qs2nc raVcK5pntU1qCUbhpZzMqGKG3MqBQxyg6bDdIJokR7uFAzJYlgLi5BM+aBnKplOfCA TOdjDuIMNsFBK8ExEjwMXZ2fK9wZ108/JgyLUnS4= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Use save_vars to restore GDBFLAGS X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: bab7860fa71715f7b4f68cddf79c420ee30f04fe X-Git-Newrev: 9dd1e642084cae1caed0a4a3af7bf93804d89530 Message-Id: <20240503130723.C007C3846420@sourceware.org> Date: Fri, 3 May 2024 13:07:23 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D9dd1e642084c= ae1caed0a4a3af7bf93804d89530 commit 9dd1e642084cae1caed0a4a3af7bf93804d89530 Author: Tom de Vries Date: Fri May 3 15:07:33 2024 +0200 [gdb/testsuite] Use save_vars to restore GDBFLAGS =20 There's a pattern of using: ... set saved_gdbflags $GDBFLAGS set GDBFLAGS "$GDBFLAGS ..." set GDBFLAGS $saved_gdbflags ... =20 Simplify this by using save_vars: ... save_vars { GDBFLAGS } { set GDBFLAGS "$GDBFLAGS ..." } ... =20 Tested on x86_64-linux. Diff: --- .../gdb.base/batch-preserve-term-settings.exp | 4 -- .../gdb.base/bp-cmds-execution-x-script.exp | 20 +++------ .../gdb.base/break-main-file-remove-fail.exp | 30 ++++++------- .../gdb.base/break-on-linker-gcd-function.exp | 8 ++-- gdb/testsuite/gdb.base/break-unload-file.exp | 32 +++++++------- gdb/testsuite/gdb.base/code_elim.exp | 9 ++-- .../gdb.base/paginate-execution-startup.exp | 50 +++++++++++-------= ---- gdb/testsuite/gdb.base/remotetimeout.exp | 14 +++--- gdb/testsuite/gdb.base/write_mem.exp | 24 +++++++---- gdb/testsuite/gdb.cp/readnow-language.exp | 8 ++-- gdb/testsuite/gdb.dwarf2/count.exp | 9 ++-- gdb/testsuite/gdb.dwarf2/dw2-icycle.exp | 8 ++-- gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp | 8 ++-- gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.exp | 8 ++-- gdb/testsuite/gdb.dwarf2/implptrconst.exp | 8 ++-- gdb/testsuite/gdb.dwarf2/implptrpiece.exp | 8 ++-- gdb/testsuite/gdb.dwarf2/nostaticblock.exp | 8 ++-- gdb/testsuite/gdb.dwarf2/symtab-producer.exp | 14 +++--- gdb/testsuite/gdb.fortran/info-main.exp | 17 ++++---- gdb/testsuite/gdb.mi/mi-async.exp | 15 +++---- gdb/testsuite/gdb.python/py-prompt.exp | 6 +-- gdb/testsuite/gdb.threads/fork-plus-threads.exp | 14 +++--- .../forking-threads-plus-breakpoint.exp | 8 ++-- .../gdb.threads/process-dies-while-handling-bp.exp | 8 ++-- gdb/testsuite/lib/gdb.exp | 14 +++--- 25 files changed, 165 insertions(+), 187 deletions(-) diff --git a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp b/gdb/= testsuite/gdb.base/batch-preserve-term-settings.exp index dc2b1ce617e..d4ceba68c95 100644 --- a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp +++ b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp @@ -228,8 +228,6 @@ proc test_terminal_settings_preserved_after_cli_exit { = cmds } { return } =20 - set saved_gdbflags $GDBFLAGS - set stty_supported [run_stty "stty before" stty_before] =20 set test "start gdb" @@ -296,8 +294,6 @@ proc test_terminal_settings_preserved_after_sigterm { }= { return } =20 - set saved_gdbflags $GDBFLAGS - set stty_supported [run_stty "stty before" stty_before] =20 set test "start gdb" diff --git a/gdb/testsuite/gdb.base/bp-cmds-execution-x-script.exp b/gdb/te= stsuite/gdb.base/bp-cmds-execution-x-script.exp index 25adf015b7f..1d91958e3c5 100644 --- a/gdb/testsuite/gdb.base/bp-cmds-execution-x-script.exp +++ b/gdb/testsuite/gdb.base/bp-cmds-execution-x-script.exp @@ -25,30 +25,24 @@ if {[build_executable "failed to prepare" $testfile $sr= cfile debug]} { =20 set x_file ${srcdir}/${subdir}/$testfile.gdb =20 -global GDBFLAGS -set saved_gdbflags $GDBFLAGS - # Run the test proper. =20 proc test {} { global inferior_exited_re global binfile global gdb_prompt - global saved_gdbflags GDBFLAGS + global GDBFLAGS global x_file =20 gdb_exit =20 - set GDBFLAGS "$GDBFLAGS -x $x_file $binfile" - - set GDBFLAGS $saved_gdbflags - append GDBFLAGS " -x \"$x_file\"" - append GDBFLAGS " --args \"$binfile\"" - set test "run to end" =20 - gdb_exit - set res [gdb_spawn] + save_vars { GDBFLAGS } { + append GDBFLAGS " -x \"$x_file\"" + append GDBFLAGS " --args \"$binfile\"" + set res [gdb_spawn] + } if { $res !=3D 0} { fail $test return -1 @@ -65,5 +59,3 @@ proc test {} { } =20 test - -set GDBFLAGS $saved_gdbflags diff --git a/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp b/gdb/t= estsuite/gdb.base/break-main-file-remove-fail.exp index 8a8c508b340..97b662c7871 100644 --- a/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp +++ b/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp @@ -35,25 +35,25 @@ proc test_remove_bp { initial_load } { =20 gdb_exit =20 - set saved_gdbflags $GDBFLAGS + save_vars { GDBFLAGS } { =20 - # See "used to behave differently" further below. - if { $initial_load =3D=3D "file" } { - gdb_start - gdb_file_cmd $binfile - } else { - global last_loaded_file + # See "used to behave differently" further below. + if { $initial_load =3D=3D "file" } { + gdb_start + gdb_file_cmd $binfile + } else { + global last_loaded_file =20 - # gdb_file_cmd sets this. This is what gdb_reload - # implementations use as binary. - set last_loaded_file $binfile + # gdb_file_cmd sets this. This is what gdb_reload + # implementations use as binary. + set last_loaded_file $binfile =20 - set GDBFLAGS "$GDBFLAGS $binfile" - gdb_start + set GDBFLAGS "$GDBFLAGS $binfile" + gdb_start + } + gdb_reinitialize_dir $srcdir/$subdir + gdb_reload } - gdb_reinitialize_dir $srcdir/$subdir - gdb_reload - set GDBFLAGS $saved_gdbflags =20 if ![runto start] { return diff --git a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp b/gdb/= testsuite/gdb.base/break-on-linker-gcd-function.exp index 613c9dc47e8..67afe4c9fa5 100644 --- a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp +++ b/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp @@ -48,10 +48,10 @@ proc set_breakpoint_on_gcd_function {} { =20 set_breakpoint_on_gcd_function =20 -set saved_gdbflags $GDBFLAGS -set GDBFLAGS "$GDBFLAGS --readnow" -clean_restart ${testfile} -set GDBFLAGS $saved_gdbflags +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS --readnow" + clean_restart ${testfile} +} =20 with_test_prefix "readnow" { set_breakpoint_on_gcd_function diff --git a/gdb/testsuite/gdb.base/break-unload-file.exp b/gdb/testsuite/g= db.base/break-unload-file.exp index 2d62cc51cec..fb9874b4297 100644 --- a/gdb/testsuite/gdb.base/break-unload-file.exp +++ b/gdb/testsuite/gdb.base/break-unload-file.exp @@ -38,26 +38,26 @@ proc test_break { initial_load always_inserted break_co= mmand } { with_test_prefix "$prefix" { gdb_exit =20 - set saved_gdbflags $GDBFLAGS + save_vars { GDBFLAGS } { =20 - # See "used to behave differently" further below. - if { $initial_load =3D=3D "file" } { - gdb_start - gdb_file_cmd $binfile - } else { - global last_loaded_file + # See "used to behave differently" further below. + if { $initial_load =3D=3D "file" } { + gdb_start + gdb_file_cmd $binfile + } else { + global last_loaded_file =20 - # gdb_file_cmd sets this. This is what gdb_reload - # implementations use as binary. - set last_loaded_file $binfile + # gdb_file_cmd sets this. This is what gdb_reload + # implementations use as binary. + set last_loaded_file $binfile =20 - set GDBFLAGS "$GDBFLAGS $binfile" - gdb_start - } + set GDBFLAGS "$GDBFLAGS $binfile" + gdb_start + } =20 - gdb_reinitialize_dir $srcdir/$subdir - gdb_reload - set GDBFLAGS $saved_gdbflags + gdb_reinitialize_dir $srcdir/$subdir + gdb_reload + } =20 if {![runto_main]} { return diff --git a/gdb/testsuite/gdb.base/code_elim.exp b/gdb/testsuite/gdb.base/= code_elim.exp index e66382fdbd9..8ead31dc8e8 100644 --- a/gdb/testsuite/gdb.base/code_elim.exp +++ b/gdb/testsuite/gdb.base/code_elim.exp @@ -93,11 +93,10 @@ with_test_prefix "single psymtabs" { # Same thing for symtabs =20 gdb_exit -global GDBFLAGS -set saved_gdbflags $GDBFLAGS -set GDBFLAGS "$GDBFLAGS --readnow $binfile1" -gdb_start -set GDBFLAGS $saved_gdbflags +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS --readnow $binfile1" + gdb_start +} =20 with_test_prefix "single symtabs" { test_eliminated_var my_global_symbol diff --git a/gdb/testsuite/gdb.base/paginate-execution-startup.exp b/gdb/te= stsuite/gdb.base/paginate-execution-startup.exp index f0f7db5932c..134cf64ac8e 100644 --- a/gdb/testsuite/gdb.base/paginate-execution-startup.exp +++ b/gdb/testsuite/gdb.base/paginate-execution-startup.exp @@ -27,25 +27,22 @@ if [is_remote host] { set file_arg [remote_download host $file_arg] } =20 -global GDBFLAGS -set saved_gdbflags $GDBFLAGS - # Returns true if the board can 'gdb -ex "start"', false otherwise. =20 proc probe_can_run_cmdline {} { global srcfile file_arg - global saved_gdbflags GDBFLAGS + global GDBFLAGS global gdb_prompt =20 - set GDBFLAGS $saved_gdbflags - append GDBFLAGS " -ex \"start\"" - append GDBFLAGS " --args \"$file_arg\"" - with_test_prefix "probe support" { set test "run to main" =20 gdb_exit - set res [gdb_spawn] + save_vars { GDBFLAGS } { + append GDBFLAGS " -ex \"start\"" + append GDBFLAGS " --args \"$file_arg\"" + set res [gdb_spawn] + } if { $res !=3D 0} { fail $test return -1 @@ -74,23 +71,25 @@ proc probe_can_run_cmdline {} { =20 proc test_fg_execution_pagination_return {} { global file_arg - global saved_gdbflags GDBFLAGS + global GDBFLAGS global gdb_prompt pagination_prompt =20 - set GDBFLAGS $saved_gdbflags - append GDBFLAGS " -ex \"set height 2\"" - append GDBFLAGS " -ex \"start\"" - append GDBFLAGS " --args \"$file_arg\"" - with_test_prefix "return" { set test "run to pagination" =20 gdb_exit - set res [gdb_spawn] + + save_vars { GDBFLAGS } { + append GDBFLAGS " -ex \"set height 2\"" + append GDBFLAGS " -ex \"start\"" + append GDBFLAGS " --args \"$file_arg\"" + set res [gdb_spawn] + } if { $res !=3D 0} { fail $test return $res } + gdb_test_multiple "" $test { -re "$pagination_prompt$" { pass $test @@ -127,24 +126,25 @@ proc test_fg_execution_pagination_return {} { =20 proc test_fg_execution_pagination_cancel { how } { global file_arg - global saved_gdbflags GDBFLAGS + global GDBFLAGS global gdb_prompt pagination_prompt =20 - set GDBFLAGS $saved_gdbflags - - append GDBFLAGS " -ex \"set height 2\"" - append GDBFLAGS " -ex \"start\"" - append GDBFLAGS " --args \"$file_arg\"" - with_test_prefix "cancel with $how" { set test "run to pagination" =20 gdb_exit - set res [gdb_spawn] + + save_vars { GDBFLAGS } { + append GDBFLAGS " -ex \"set height 2\"" + append GDBFLAGS " -ex \"start\"" + append GDBFLAGS " --args \"$file_arg\"" + set res [gdb_spawn] + } if { $res !=3D 0} { fail $test return $res } + gdb_test_multiple "" $test { -re "$pagination_prompt$" { pass $test @@ -182,5 +182,3 @@ save_vars { INTERNAL_GDBFLAGS } { test_fg_execution_pagination_cancel "quit" } } - -set GDBFLAGS $saved_gdbflags diff --git a/gdb/testsuite/gdb.base/remotetimeout.exp b/gdb/testsuite/gdb.b= ase/remotetimeout.exp index 27f02956202..b7d8c90ca01 100644 --- a/gdb/testsuite/gdb.base/remotetimeout.exp +++ b/gdb/testsuite/gdb.base/remotetimeout.exp @@ -19,18 +19,16 @@ # This is a test for the gdb invocation option -l. =20 =20 -global GDBFLAGS +gdb_exit =20 # # Test that -l is processed correctly. # -set old_gdbflags $GDBFLAGS -set GDBFLAGS "$GDBFLAGS -l 42" -gdb_exit -gdb_start +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS -l 42" + gdb_start +} + gdb_test "show remotetimeout" \ "Timeout limit to wait for target to respond is 42\." \ "correct remotetimeout printed" - -set GDBFLAGS $old_gdbflags - diff --git a/gdb/testsuite/gdb.base/write_mem.exp b/gdb/testsuite/gdb.base/= write_mem.exp index 89c064795c6..3f2380c64a4 100644 --- a/gdb/testsuite/gdb.base/write_mem.exp +++ b/gdb/testsuite/gdb.base/write_mem.exp @@ -27,21 +27,27 @@ if {[build_executable $testfile.exp $testfile \ return -1 } =20 -set old_gdbflags $GDBFLAGS +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS $binfile" + clean_restart +} =20 # Expect a failure before --write has been added to the command line -set GDBFLAGS "$old_gdbflags $binfile" -clean_restart test_print_reject "set {int}main =3D 0x4242" "Cannot access memory at addr= ess" =20 +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS --write $binfile" + clean_restart +} + # Setting memory should now work correctly after adding --write -set GDBFLAGS "$old_gdbflags --write $binfile" -clean_restart gdb_test_no_output "set {int}main =3D 0x4242" =20 -# Check that memory write persists after quitting GDB gdb_exit -gdb_start -gdb_test "x /x main" "
:.*4242" +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS --write $binfile" + gdb_start +} =20 -set GDBFLAGS $old_gdbflags +# Check that memory write persists after quitting GDB +gdb_test "x /x main" "
:.*4242" diff --git a/gdb/testsuite/gdb.cp/readnow-language.exp b/gdb/testsuite/gdb.= cp/readnow-language.exp index 05193ec9f36..a9cd6451686 100644 --- a/gdb/testsuite/gdb.cp/readnow-language.exp +++ b/gdb/testsuite/gdb.cp/readnow-language.exp @@ -19,9 +19,9 @@ if {[build_executable ${testfile}.exp $testfile ${testfil= e}.cc {c++ debug}] =3D=3D - return -1 } =20 -set old_gdbflags $GDBFLAGS -set GDBFLAGS "$GDBFLAGS -readnow" -clean_restart $testfile -set GDBFLAGS $old_gdbflags +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS -readnow" + clean_restart $testfile +} =20 gdb_test "show language" {The current source language is "auto; currently = c\+\+"\.} diff --git a/gdb/testsuite/gdb.dwarf2/count.exp b/gdb/testsuite/gdb.dwarf2/= count.exp index 99c52d231ae..52deb19146b 100644 --- a/gdb/testsuite/gdb.dwarf2/count.exp +++ b/gdb/testsuite/gdb.dwarf2/count.exp @@ -138,11 +138,10 @@ if { [gdb_compile [list ${binfile}1.o ${binfile}2.o] \ return -1 } =20 -global GDBFLAGS -set saved_gdbflags $GDBFLAGS -set GDBFLAGS [concat $GDBFLAGS " -readnow"] -clean_restart ${testfile} -set GDBFLAGS $saved_gdbflags +save_vars { GDBFLAGS } { + set GDBFLAGS [concat $GDBFLAGS " -readnow"] + clean_restart ${testfile} +} =20 if ![runto_main] { return -1 diff --git a/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp b/gdb/testsuite/gdb.dw= arf2/dw2-icycle.exp index 9c004562d69..2675f70df14 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp @@ -33,10 +33,10 @@ if { [build_executable "failed to prepare" ${testfile} \ # start the debugger with -readnow. This force expansion as soon as # the objfile is loaded. =20 -set saved_gdbflags $GDBFLAGS -set GDBFLAGS "$GDBFLAGS -readnow" -clean_restart ${testfile} -set GDBFLAGS $saved_gdbflags +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS -readnow" + clean_restart ${testfile} +} =20 # And just to be sure that the debugger did not crash after having # expanded our symbols, do a life-check. diff --git a/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp b/gdb/testsuite= /gdb.dwarf2/dw2-var-zero-addr.exp index 2a5aa3ee0c1..9b89b8ce6fa 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp @@ -32,10 +32,10 @@ proc test { } { =20 test =20 -set saved_gdbflags $GDBFLAGS -set GDBFLAGS "$GDBFLAGS --readnow" -clean_restart ${binfile} -set GDBFLAGS $saved_gdbflags +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS --readnow" + clean_restart ${binfile} +} =20 with_test_prefix "readnow" { test diff --git a/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.exp b/gdb/testsui= te/gdb.dwarf2/dw4-sig-type-unused.exp index 63c834b8846..24dc132aa82 100644 --- a/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.exp +++ b/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.exp @@ -24,9 +24,9 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${bin= file}" object {}] !=3D "" return -1 } =20 -set saved_gdbflags $GDBFLAGS -set GDBFLAGS "$GDBFLAGS --readnow" -clean_restart $executable -set GDBFLAGS $saved_gdbflags +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS --readnow" + clean_restart $executable +} =20 gdb_test "p 1" " =3D 1" "alive" diff --git a/gdb/testsuite/gdb.dwarf2/implptrconst.exp b/gdb/testsuite/gdb.= dwarf2/implptrconst.exp index 796b8b70307..8e6dbf0d213 100644 --- a/gdb/testsuite/gdb.dwarf2/implptrconst.exp +++ b/gdb/testsuite/gdb.dwarf2/implptrconst.exp @@ -90,10 +90,10 @@ if { [build_executable ${testfile}.exp ${testfile} \ =20 # We need --readnow because otherwise we never read in the CU we # created above. -set saved_gdbflags $GDBFLAGS -set GDBFLAGS "$GDBFLAGS -readnow" -clean_restart ${testfile} -set GDBFLAGS $saved_gdbflags +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS -readnow" + clean_restart ${testfile} +} =20 if ![runto_main] { return -1 diff --git a/gdb/testsuite/gdb.dwarf2/implptrpiece.exp b/gdb/testsuite/gdb.= dwarf2/implptrpiece.exp index 83bdf991135..585cd7497b6 100644 --- a/gdb/testsuite/gdb.dwarf2/implptrpiece.exp +++ b/gdb/testsuite/gdb.dwarf2/implptrpiece.exp @@ -108,10 +108,10 @@ if { [build_executable ${testfile}.exp ${testfile} \ =20 # We need --readnow because otherwise we never read in the CU we # created above. -set saved_gdbflags $GDBFLAGS -set GDBFLAGS "$GDBFLAGS -readnow" -clean_restart ${testfile} -set GDBFLAGS $saved_gdbflags +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS -readnow" + clean_restart ${testfile} +} =20 if ![runto_main] { return -1 diff --git a/gdb/testsuite/gdb.dwarf2/nostaticblock.exp b/gdb/testsuite/gdb= .dwarf2/nostaticblock.exp index 46e2b4c4ca8..e8d41f04efc 100644 --- a/gdb/testsuite/gdb.dwarf2/nostaticblock.exp +++ b/gdb/testsuite/gdb.dwarf2/nostaticblock.exp @@ -38,9 +38,9 @@ if { [build_executable ${testfile}.exp ${testfile} \ return -1 } =20 -set saved_gdbflags $GDBFLAGS -set GDBFLAGS "$GDBFLAGS --readnow" -clean_restart $testfile -set GDBFLAGS $saved_gdbflags +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS --readnow" + clean_restart $testfile +} =20 gdb_test "p 1" " =3D 1" "alive" diff --git a/gdb/testsuite/gdb.dwarf2/symtab-producer.exp b/gdb/testsuite/g= db.dwarf2/symtab-producer.exp index 756b1d60bf2..ac16c95d8a3 100644 --- a/gdb/testsuite/gdb.dwarf2/symtab-producer.exp +++ b/gdb/testsuite/gdb.dwarf2/symtab-producer.exp @@ -73,17 +73,15 @@ Dwarf::assemble $asm_file { =20 # We need --readnow because otherwise we never read in the CUs we # created above. -set saved_gdbflags $GDBFLAGS -set GDBFLAGS "$GDBFLAGS -readnow" +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS -readnow" =20 -if { [prepare_for_testing "failed to prepare" ${testfile} \ - [list $srcfile $asm_file] {nodebug}] } { - set GDBFLAGS $saved_gdbflags - return -1 + if { [prepare_for_testing "failed to prepare" ${testfile} \ + [list $srcfile $asm_file] {nodebug}] } { + return -1 + } } =20 -set GDBFLAGS $saved_gdbflags - gdb_py_test_silent_cmd "python with_producer =3D gdb.lookup_global_symbol(= \"with_producer\")" \ "get with_producer symbol" 0 =20 diff --git a/gdb/testsuite/gdb.fortran/info-main.exp b/gdb/testsuite/gdb.fo= rtran/info-main.exp index e8583f3bf9f..7d11235b12f 100644 --- a/gdb/testsuite/gdb.fortran/info-main.exp +++ b/gdb/testsuite/gdb.fortran/info-main.exp @@ -19,11 +19,12 @@ load_lib fortran.exp =20 standard_testfile .f90 =20 -set old_gdbflags $GDBFLAGS -set GDBFLAGS [string map {"-readnow" ""} "$GDBFLAGS"] +save_vars { GDBFLAGS } { + set GDBFLAGS [string map {"-readnow" ""} "$GDBFLAGS"] =20 -if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90= }]} { - return -1 + if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug= f90}]} { + return -1 + } } =20 gdb_test "info main" "simple" "info main prior to start" @@ -35,8 +36,8 @@ if ![fortran_runto_main] { =20 gdb_test "info main" "simple" "info main post start" =20 -set GDBFLAGS "$GDBFLAGS -readnow" -clean_restart $testfile +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS -readnow" + clean_restart $testfile +} gdb_test "info main" "simple" "info main with readnow" - -set GDBFLAGS $old_gdbflags diff --git a/gdb/testsuite/gdb.mi/mi-async.exp b/gdb/testsuite/gdb.mi/mi-as= ync.exp index fc138a6e9ea..74aff568a34 100644 --- a/gdb/testsuite/gdb.mi/mi-async.exp +++ b/gdb/testsuite/gdb.mi/mi-async.exp @@ -29,10 +29,6 @@ if {![istarget *-linux*]} { # Check if start command is supported. require !use_gdb_stub =20 -# The plan is for async mode to become the default but toggle for now. -set saved_gdbflags $GDBFLAGS -set GDBFLAGS [concat $GDBFLAGS " -ex \"set mi-async on\""] - load_lib mi-support.exp =20 standard_testfile basics.c @@ -42,8 +38,13 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${b= infile}" executable {deb return -1 } =20 -if {[mi_clean_restart $binfile]} { - return +# The plan is for async mode to become the default but toggle for now. +save_vars { GDBFLAGS } { + set GDBFLAGS [concat $GDBFLAGS " -ex \"set mi-async on\""] + + if {[mi_clean_restart $binfile]} { + return + } } =20 # mi_gdb_test cannot be used for asynchronous commands because there are @@ -75,5 +76,3 @@ proc linux_async_tests {} { linux_async_tests =20 mi_gdb_exit - -set GDBFLAGS $saved_gdbflags diff --git a/gdb/testsuite/gdb.python/py-prompt.exp b/gdb/testsuite/gdb.pyt= hon/py-prompt.exp index f1f93bff572..614fe9d82ea 100644 --- a/gdb/testsuite/gdb.python/py-prompt.exp +++ b/gdb/testsuite/gdb.python/py-prompt.exp @@ -27,11 +27,9 @@ if {[build_executable $testfile.exp $testfile $srcfile d= ebug] =3D=3D -1} { return -1 } =20 -save_vars { INTERNAL_GDBFLAGS } { +save_vars { INTERNAL_GDBFLAGS GDBFLAGS } { set INTERNAL_GDBFLAGS [string map {"-q" ""} $INTERNAL_GDBFLAGS] =20 - global GDBFLAGS - set saved_gdbflags $GDBFLAGS set GDBFLAGS [concat $GDBFLAGS " -ex \"python p =3D list()\""] set prompt_func "python def foo(x): global p; p.append(x); return \'(= Foo) \'" set GDBFLAGS [concat $GDBFLAGS " -ex \"$prompt_func\""] @@ -72,7 +70,6 @@ save_vars { INTERNAL_GDBFLAGS } { } =20 if {![can_spawn_for_attach]} { - set GDBFLAGS $saved_gdbflags return 0 } =20 @@ -115,6 +112,5 @@ save_vars { INTERNAL_GDBFLAGS } { gdb_exit } =20 - set GDBFLAGS $saved_gdbflags kill_wait_spawned_process $test_spawn_id } diff --git a/gdb/testsuite/gdb.threads/fork-plus-threads.exp b/gdb/testsuit= e/gdb.threads/fork-plus-threads.exp index 431ad4a8b7f..c08b4c1579a 100644 --- a/gdb/testsuite/gdb.threads/fork-plus-threads.exp +++ b/gdb/testsuite/gdb.threads/fork-plus-threads.exp @@ -34,17 +34,15 @@ proc do_test { detach-on-fork } { global srcfile testfile global gdb_prompt =20 - set saved_gdbflags $GDBFLAGS - set GDBFLAGS [concat $GDBFLAGS " -ex \"set non-stop on\""] + save_vars { GDBFLAGS } { + set GDBFLAGS [concat $GDBFLAGS " -ex \"set non-stop on\""] =20 - if {[prepare_for_testing "failed to prepare" \ - $testfile $srcfile {debug pthreads}] =3D=3D -1} { - set GDBFLAGS $saved_gdbflags - return -1 + if {[prepare_for_testing "failed to prepare" \ + $testfile $srcfile {debug pthreads}] =3D=3D -1} { + return -1 + } } =20 - set GDBFLAGS $saved_gdbflags - if {![runto_main]} { return 0 } diff --git a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp = b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp index 7f010045e29..66311fe3831 100644 --- a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp +++ b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp @@ -72,10 +72,10 @@ proc do_test { cond_bp_target detach_on_fork displaced = } { global linenum global is_remote_target =20 - set saved_gdbflags $GDBFLAGS - set GDBFLAGS [concat $GDBFLAGS " -ex \"set non-stop on\""] - clean_restart $binfile - set GDBFLAGS $saved_gdbflags + save_vars { GDBFLAGS } { + set GDBFLAGS [concat $GDBFLAGS " -ex \"set non-stop on\""] + clean_restart $binfile + } =20 if {![runto_main]} { return 0 diff --git a/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp b= /gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp index e1bc6feea46..4ff68a6b71e 100644 --- a/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp +++ b/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp @@ -40,10 +40,10 @@ proc do_test { non_stop cond_bp_target } { global binfile global linenum =20 - set saved_gdbflags $GDBFLAGS - set GDBFLAGS [concat $GDBFLAGS " -ex \"set non-stop $non_stop\""] - clean_restart $binfile - set GDBFLAGS $saved_gdbflags + save_vars { GDBFLAGS } { + set GDBFLAGS [concat $GDBFLAGS " -ex \"set non-stop $non_stop\""] + clean_restart $binfile + } =20 if {![runto_main]} { return 0 diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index fe3f05c18df..4c3097defa4 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -6128,16 +6128,14 @@ proc gdb_spawn { } { proc gdb_spawn_with_cmdline_opts { cmdline_flags } { global GDBFLAGS =20 - set saved_gdbflags $GDBFLAGS + save_vars { GDBFLAGS } { + if {$GDBFLAGS !=3D ""} { + append GDBFLAGS " " + } + append GDBFLAGS $cmdline_flags =20 - if {$GDBFLAGS !=3D ""} { - append GDBFLAGS " " + set res [gdb_spawn] } - append GDBFLAGS $cmdline_flags - - set res [gdb_spawn] - - set GDBFLAGS $saved_gdbflags =20 return $res }