Test for PR gdb/17511, spurious SIGTRAP after stepping into+in signal handler

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / restore.exp

diff --git a/gdb/testsuite/gdb.base/restore.exp b/gdb/testsuite/gdb.base/restore.exp
index f7ab949e303f2149a0a2c9337cbe07beb12784f2..9bba53504b436845e53890428fff8ef35aa235fe 100644 (file)
--- a/gdb/testsuite/gdb.base/restore.exp
+++ b/gdb/testsuite/gdb.base/restore.exp
@@ -1,7 +1,6 @@
 # This testcase is part of GDB, the GNU debugger.
 
-# Copyright 1998, 1999, 2000, 2001, 2002, 2004, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# Copyright 1998-2014 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
@@ -22,18 +21,10 @@
 # This file was written by Jim Blandy <jimb@cygnus.com>, with
 # fragments borrowed from return.exp.
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
+standard_testfile
+set executable $testfile
 
-set testfile "restore"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested restore.exp
+if { [prepare_for_testing $testfile.exp $executable $srcfile] } {
     return -1
 }
 
@@ -71,15 +62,12 @@ proc restore_tests { } {
            
             # Do a forced return from the callee.
            set test "caller$c calls callee$e; return callee now"
-           gdb_test_multiple "return 0" "$test" {
-               -re "Make .* return now.*y or n. $" {
-                   send_gdb "y\n"
-                   exp_continue
-               }
-               -re " caller$c .*$gdb_prompt $" {
-                   pass "$test"
-               }
-            }
+
+           gdb_test "return 0" \
+               " caller$c .*" \
+               "$test" \
+               "Make .* return now.*y or n. $" \
+               "y"
 
             # Check that the values of the local variables are what
            # they should be.
@@ -103,18 +91,11 @@ proc restore_tests { } {
            }
        }
     } else {
-       gdb_test "continue" "" ""
+       gdb_test "continue" ".*" ""
     }
 }
 
-
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
+set prev_timeout $timeout
 set timeout 30
 restore_tests
+set timeout $prev_timeout