From 18b5aadea2de6955ba5818c65ef82c94c6ca5d98 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@efficios.com>
Date: Thu, 17 Jun 2021 09:41:58 -0400
Subject: [PATCH] gdb/testsuite: gdb.base/args.exp: use save_vars

Use save_vars instead of manually saving/restoring.  This ensures that
if anything throws an error, GDBFLAGS will be correctly restored.

Remove the global GDBFLAGS declaration at the top, it's not necessary.

gdb/testsuite/ChangeLog:

	* gdb.base/args.exp: Use save_vars.

Change-Id: I3a45e4fc1635ec0212de2415040f91eecaf4a057
---
 gdb/testsuite/ChangeLog         |  4 +++
 gdb/testsuite/gdb.base/args.exp | 56 ++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 224dc46f0f5..30d1a4ffa22 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-17  Simon Marchi  <simon.marchi@efficios.com>
+
+	* gdb.base/args.exp: Use save_vars.
+
 2021-06-14  Pedro Alves  <pedro@palves.net>
 
 	* gdb.base/annota1.exp: Build list using [list] instead of {}.
diff --git a/gdb/testsuite/gdb.base/args.exp b/gdb/testsuite/gdb.base/args.exp
index e848c70a482..bff750dff24 100644
--- a/gdb/testsuite/gdb.base/args.exp
+++ b/gdb/testsuite/gdb.base/args.exp
@@ -15,9 +15,6 @@
 
 # This is a test for the gdb invocation option --args.
 
-
-global GDBFLAGS
-
 # Skip test if target does not support argument passing.
 if [target_info exists noargs] {
     return
@@ -64,39 +61,40 @@ proc args_test { name arglist } {
 #
 # Test that the --args are processed correctly.
 #
-set old_gdbflags $GDBFLAGS
 
-set GDBFLAGS "$old_gdbflags --args $binfile 1 3"
-args_test basic {{1} {3}}
+save_vars { GDBFLAGS } {
+    set old_gdbflags $GDBFLAGS
 
-#
-# Test that the --args are processed correctly even if one of them is empty.
-# The syntax needed is a little peculiar; DejaGNU treats the arguments as a
-# list and expands them itself, since no shell redirection is involved.
-#
-set GDBFLAGS "$old_gdbflags --args $binfile 1 {} 3"
-args_test "one empty" {{1} {} {3}}
+    set GDBFLAGS "$old_gdbflags --args $binfile 1 3"
+    args_test basic {{1} {3}}
 
-#
-# try with 2 empty args
-#
-set GDBFLAGS "$old_gdbflags --args $binfile 1 {} {} 3"
-args_test "two empty" {{1} {} {} 3}
+    #
+    # Test that the --args are processed correctly even if one of them is empty.
+    # The syntax needed is a little peculiar; DejaGNU treats the arguments as a
+    # list and expands them itself, since no shell redirection is involved.
+    #
+    set GDBFLAGS "$old_gdbflags --args $binfile 1 {} 3"
+    args_test "one empty" {{1} {} {3}}
 
-# Try with arguments containing literal single quotes.
+    #
+    # try with 2 empty args
+    #
+    set GDBFLAGS "$old_gdbflags --args $binfile 1 {} {} 3"
+    args_test "two empty" {{1} {} {} 3}
 
-set GDBFLAGS "$old_gdbflags --args $binfile 1 '' 3"
-args_test "one empty (with single quotes)" {{1} {''} {3}}
+    # Try with arguments containing literal single quotes.
 
-set GDBFLAGS "$old_gdbflags --args $binfile 1 '' '' 3"
-args_test "two empty (with single quotes)" {{1} {''} {''} {3}}
+    set GDBFLAGS "$old_gdbflags --args $binfile 1 '' 3"
+    args_test "one empty (with single quotes)" {{1} {''} {3}}
 
-# try with arguments containing literal newlines.
+    set GDBFLAGS "$old_gdbflags --args $binfile 1 '' '' 3"
+    args_test "two empty (with single quotes)" {{1} {''} {''} {3}}
 
-set GDBFLAGS "-nx --args $binfile 1 {\n} 3"
-args_test "one newline" {{1} {\\n} {3}}
+    # try with arguments containing literal newlines.
 
-set GDBFLAGS "-nx --args $binfile 1 {\n} {\n} 3"
-args_test "two newlines" {{1} {\\n} {\\n} {3}}
+    set GDBFLAGS "-nx --args $binfile 1 {\n} 3"
+    args_test "one newline" {{1} {\\n} {3}}
 
-set GDBFLAGS $old_gdbflags
+    set GDBFLAGS "-nx --args $binfile 1 {\n} {\n} 3"
+    args_test "two newlines" {{1} {\\n} {\\n} {3}}
+}
-- 
2.30.2