[gdb/testsuite] Reduce errors after gdb exit in default_gdb_start

[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 2ff7ad150759afbf264dba12ad8f11d48009f11b..ac019966726ac9f845b68b78bd4165421e2aa7c0 100644 (file)
--- a/gdb/testsuite/gdb.base/restore.exp
+++ b/gdb/testsuite/gdb.base/restore.exp
@@ -1,21 +1,19 @@
-# Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
+# This testcase is part of GDB, the GNU debugger.
+
+# Copyright 1998-2020 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.
@@ -23,24 +21,19 @@
 # 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}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+if { [prepare_for_testing "failed to prepare" $executable $srcfile] } {
+    return -1
 }
 
 proc restore_tests { } {
     global gdb_prompt
 
-    if { ! [ runto driver ] } then { return 0 }
+    if { ! [ runto driver ] } {
+       return 0
+    }
 
     set limit 5
 
@@ -48,66 +41,64 @@ proc restore_tests { } {
     #   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" "Breakpoint.*\[0-9\]*\\." "tbreak caller$c"
+        gdb_test "tbreak caller$c" "Temporary breakpoint.*\[0-9\]*\\."
 
        # 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 "tbreak callee$e" "Breakpoint.*\[0-9\]*\\." \
-                    "tbreak caller$e"
+            gdb_test "tbreak callee$e" "Temporary breakpoint.*\[0-9\]*\\." \
+               "caller$c calls callee$e; tbreak callee"
             
-           gdb_test "continue" ".*/\\* callee$e \\*/" "run to callee$e"
-
+           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 {
-               -re "Make .* return now.*y or n. $" {
-                   send_gdb "y\n"
-                   exp_continue
-               }
-               -re "$gdb_prompt $" { }
-            }
+           set test "caller$c calls callee$e; return callee now"
+
+           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.
             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"
+               set test "caller$c calls callee$e; return restored l$var to $expected"
+               set pass_pattern " = $expected"
+               set unsupported_pattern " = <optimized out>"
+               gdb_test_multiple "print l$var" $test {
+                   -re "\[\r\n\]*(?:$pass_pattern)\[\r\n\]+$gdb_prompt $" {
+                       pass $test
+                   }
+                   -re "\[\r\n\]*(?:$unsupported_pattern)\[\r\n\]+$gdb_prompt $" {
+                       unsupported $test
+                   }
+               }
             }
         }
     }
 
-    if ![gdb_skip_stdio_test "run to completion"] {
-       send_gdb "continue\n"
-
-       gdb_expect {
-           -re "exiting" {
-               pass "run to completion"
-           }
-           timeout { 
-               fail "(timeout) run to completion"
-           }
-       }
-    } else {
-       gdb_test "continue" "" ""
-    }
+    gdb_continue_to_end "" continue 1
 }
 
-
-
-# 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
+
+# Test PR cli/23785
+clean_restart $binfile
+if { ![runto_main] } {
+    return -1
+}
+gdb_test "restore non-existent-file binary" \
+    "Failed to open non-existent-file: .*"