Remove unused support for target-based exception catching.

[deliverable/binutils-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 505a6945dfccd93482661081d531b20f1abb79e6..f6014629a7a58ddbfd43466a4f4d5a5ede4d86f6 100644 (file)
--- a/gdb/testsuite/gdb.base/args.exp
+++ b/gdb/testsuite/gdb.base/args.exp
@@ -1,8 +1,8 @@
-# Copyright 2003 Free Software Foundation, Inc.
+# Copyright 2003, 2007 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-gdb@prep.ai.mit.edu
@@ -35,8 +34,40 @@ set testfile "args"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
+    untested args.exp
+    return -1
+}
+
+proc args_test { name arglist } {
+    global srcdir
+    global subdir
+    global binfile
+    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
+
+    runto_main
+    gdb_breakpoint [gdb_get_line_number "set breakpoint here"]
+    gdb_continue_to_breakpoint "breakpoint for $name"
+
+    set expected_len [expr 1 + [llength $arglist]]
+    gdb_test "print argc" "\\\$$decimal = $expected_len" "argc for $name"
+
+    set i 1
+    foreach arg $arglist {
+       gdb_test "print argv\[$i\]" "\\\$$decimal = $hex \"$arg\"" \
+           "argv\[$i\] for $name"
+       set i [expr $i + 1]
+    }
 }
 
 #
@@ -44,34 +75,28 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 #
 set old_gdbflags $GDBFLAGS
 set GDBFLAGS "--args $binfile 1 3"
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_test "run" \
-       "Starting program.*args(\.exe)? 1 3.*3\r\n.*args\r\n1\r\n3.*Program exited normally." \
-       "correct args printed"
+args_test basic {{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 "--args $binfile 1 '' 3"
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_test "run" \
-       "Starting program.*args(\.exe)? 1 \\\\'\\\\' 3.*4\r\n.*args\r\n1\r\n''\r\n3.*Program exited normally." \
-       "correct args printed, one empty"
+set GDBFLAGS "--args $binfile 1 {} 3"
+args_test "one empty" {{1} {} {3}}
 
 #
 # try with 2 empty args
 #
+set GDBFLAGS "--args $binfile 1 {} {} 3"
+args_test "two empty" {{1} {} {} 3}
+
+# Try with arguments containing literal single quotes.
+
+set GDBFLAGS "--args $binfile 1 '' 3"
+args_test "one empty" {{1} {''} {3}}
+
 set GDBFLAGS "--args $binfile 1 '' '' 3"
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_test "run" \
-       "Starting program.*args(\.exe)? 1 \\\\'\\\\' \\\\'\\\\' 3.*5\r\n.*args\r\n1\r\n''\r\n''\r\n3.*Program exited normally." \
-       "correct args printed, two empty"
+args_test "two empty" {{1} {''} {''} {3}}
 
 set GDBFLAGS $old_gdbflags
-