Imported Upstream version 7.9

[platform/upstream/gdb.git] / gdb / testsuite / gdb.base / args.exp

diff --git a/gdb/testsuite/gdb.base/args.exp b/gdb/testsuite/gdb.base/args.exp
index 4b812de..44a53a0 100644 (file)
--- a/gdb/testsuite/gdb.base/args.exp
+++ b/gdb/testsuite/gdb.base/args.exp
@@ -1,4 +1,4 @@
-# Copyright 2003, 2007-2012 Free Software Foundation, Inc.
+# Copyright 2003-2015 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,33 +20,25 @@ global GDBFLAGS
 
 # Skip test if target does not support argument passing.
 if [target_info exists noargs] {
-    return;
+    return
 }
 
-set testfile "args"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested args.exp
+if {[build_executable $testfile.exp $testfile \
+        $srcfile {debug nowarnings}] == -1} {
+    untested $testfile.exp
     return -1
 }
 
 proc args_test { name arglist } {
     global srcdir
     global subdir
-    global binfile
+    global testfile
     global hex
     global decimal
 
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-
-    # No loading needs to be done when the target is `exec'.  Some targets
-    # require that the program be loaded, however, and it doesn't hurt
-    # for `exec'.
-    gdb_load $binfile
+    clean_restart $testfile
 
     runto_main
     gdb_breakpoint [gdb_get_line_number "set breakpoint here"]