[gdb/testsuite] Use save_vars to restore GDBFLAGS

[thirdparty/binutils-gdb.git] / gdb / testsuite / lib / gdb.exp

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index fe3f05c18df943c66f848d45c42d0d798d655232..4c3097defa4476e6fb4e376af91aa4f099628a05 100644 (file)
--- 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
 
-    set saved_gdbflags $GDBFLAGS
+    save_vars { GDBFLAGS } {
+       if {$GDBFLAGS != ""} {
+           append GDBFLAGS " "
+       }
+       append GDBFLAGS $cmdline_flags
 
-    if {$GDBFLAGS != ""} {
-       append GDBFLAGS " "
+       set res [gdb_spawn]
     }
-    append GDBFLAGS $cmdline_flags
-
-    set res [gdb_spawn]
-
-    set GDBFLAGS $saved_gdbflags
 
     return $res
 }