gdb

[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 ff563efa5e2f12ecb70a614cf320ab0c60b82168..97f9ff5af591a2d1a7347433699039234b94e916 100644 (file)
--- a/gdb/testsuite/gdb.base/restore.exp
+++ b/gdb/testsuite/gdb.base/restore.exp
@@ -1,21 +1,20 @@
-# Copyright (C) 1998 Free Software Foundation, Inc.
+# This testcase is part of GDB, the GNU debugger.
+
+# Copyright 1998, 1999, 2000, 2001, 2002, 2004, 2007, 2008, 2009
+# 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,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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.  
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test GDB's ability to restore saved registers from stack frames
 # when using the `return' command.
@@ -24,7 +23,7 @@
 # fragments borrowed from return.exp.
 
 if $tracelevel then {
-       strace $tracelevel
+    strace $tracelevel
 }
 
 set prms_id 0
@@ -34,47 +33,52 @@ set testfile "restore"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested restore.exp
+    return -1
 }
 
 proc restore_tests { } {
     global gdb_prompt
 
-    if { ! [ runto driver ] } then { return 0 }
-
-    set limit 5
-
-    # Set breakpoints at each of the `caller' functions.
-    for {set c 1} {$c <= $limit} {incr c} {
-      gdb_test "break caller$c" "Breakpoint.*\[0-9\]*\\." "break caller$c"
+    if { ! [ runto driver ] } {
+       return 0
     }
 
-    # Set breakpoints at each of the `callee' functions.
-    for {set c 1} {$c <= $limit} {incr c} {
-      gdb_test "break callee$c" "Breakpoint.*\[0-9\]*\\." "break caller$c"
-    }
+    set limit 5
 
     # For each caller function,
     #   call each of the callee functions,
     #   force a return from the callee, and
     #   make sure that the local variables still have the right values.
+
     for {set c 1} {$c <= $limit} {incr c} {
 
+        # Set a breakpoint at the next caller function.
+        gdb_test "tbreak caller$c" "Temporary breakpoint.*\[0-9\]*\\." \
+           "tbreak caller$c"
+
        # Continue to the next caller function.
-       gdb_test "continue" ".*/\\* caller$c \\*/" "run to caller$c"
+       gdb_test "continue" " caller$c prologue .*" "run to caller$c"
 
        # Do each callee function.
         for {set e 1} {$e <= $limit} {incr e} {
-           gdb_test "  continue" ".*/\\* callee$e \\*/" "run to callee$e"
 
+            gdb_test "tbreak callee$e" "Temporary breakpoint.*\[0-9\]*\\." \
+               "caller$c calls callee$e; tbreak callee"
+            
+           gdb_test "continue" " callee$e prologue .*/" \
+               "caller$c calls callee$e; continue to callee"
+           
             # Do a forced return from the callee.
-           send_gdb "return 0\n"
-           gdb_expect {
+           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 "$gdb_prompt $" { }
+               -re " caller$c .*$gdb_prompt $" {
+                   pass "$test"
+               }
             }
 
             # Check that the values of the local variables are what
@@ -82,7 +86,7 @@ proc restore_tests { } {
             for {set var 1} {$var <= $c} {incr var} {
                 set expected [expr 0x7eeb + $var]
                gdb_test "print l$var" " = $expected" \
-                         "caller$c called callee$e; variable l$var restored"
+                   "caller$c calls callee$e; return restored l$var to $expected"
             }
         }
     }