* lib/gdb.exp(gdb_init): New function.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 806f58a83af73baac824d630cc30ae2f42927436..1c7c090bf7c2ef602675ba23879fb846bcd50d0a 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 Thu Feb 20 13:57:01 1997  Bob Manson  <manson@charmed.cygnus.com>
 
+       * lib/gdb.exp(gdb_init): New function.
+
        * gdb.base/setvar.exp(test_set): Don't bother printing a PASS/FAIL
        for each individual variable set.
 

diff --git a/gdb/testsuite/gdb.base/setvar.exp b/gdb/testsuite/gdb.base/setvar.exp
index 7ff717d71a95e0ae1b0b76650484cd861e0c0736..cc1d9621e166ddd17e0e09b07dfd93f096c9af34 100644 (file)
--- a/gdb/testsuite/gdb.base/setvar.exp
+++ b/gdb/testsuite/gdb.base/setvar.exp
@@ -89,12 +89,15 @@ proc test_set { args } {
     for {set x 0;} {$x < $length} {incr x;} {
        if { "[lindex $args $x]" != "" } {
            verbose "doing [lindex $args $x]"
-           gdb_test "[lindex $args $x]" "" "$message (setting variable)"
+           if [gdb_test "[lindex $args $x]" "" ""] {
+               fail "$message [lindex $args $x]";
+               return 1;
+           }
        }
     }
     verbose "expecting $print_result from '$print_cmd'"
     # Now run the test.
-    gdb_test "$print_cmd" "$print_result" "$message";
+    return [gdb_test "$print_cmd" "$print_result" "$message"];
 }
 
 #
@@ -352,6 +355,11 @@ v_long_member = 3,.*v_float_member = 4,.*v_double_member = 5.*\}" \
 # the type of the structure to be specified, as in
 # v_struct1 = (struct t_struct) {32, 33, 34, 35, 36, 37}
 # GDB should do the same if it wants to provide this feature.
+if [target_info exists gdb,cannot_call_functions] {
+    setup_xfail "*-*-*" 2416
+    fail "set variable v_struct1 = {32, 33, 34, 35, 36, 37}"
+    continue
+}
 gdb_test "set variable v_struct1 = {32, 33, 34, 35, 36, 37}" "Invalid.*"
 
 # And after the error the structure should be unchanged.