Remove a bunch of usages of gdb_suppress_tests in 'runto_main'.

[external/binutils.git] / gdb / testsuite / gdb.base / siginfo.exp

diff --git a/gdb/testsuite/gdb.base/siginfo.exp b/gdb/testsuite/gdb.base/siginfo.exp
index f335bc7..561a817 100644 (file)
--- a/gdb/testsuite/gdb.base/siginfo.exp
+++ b/gdb/testsuite/gdb.base/siginfo.exp
@@ -1,18 +1,17 @@
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004-2018 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.  
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # The program siginfo.c creates a backtrace containing a signal
@@ -25,36 +24,23 @@
 # nexti/stepi out of such a handler.
 
 if [target_info exists gdb,nosignals] {
-    verbose "Skipping signals.exp because of nosignals."
+    verbose "Skipping siginfo.exp because of nosignals."
     continue
 }
 
-if $tracelevel then {
-    strace $tracelevel
-}
 
-set prms_id 0
-set bug_id 0
+standard_testfile
 
-set testfile siginfo
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${module}.c"
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 
-# get things started
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 gdb_test "display/i \$pc"
 
 # Advance to main
-if { ![runto_main] } then {
-    gdb_suppress_tests;
+if ![runto_main] then {
+    fail "can't run to main"
+    return 0
 }
 
 # Pass all the alarms straight through (but verbosely)
@@ -65,16 +51,23 @@ if { ![runto_main] } then {
 # Run to the signal handler, validate the backtrace.
 gdb_test "break handler"
 gdb_test "continue" ".* handler .*" "continue to stepi handler"
-send_gdb "bt\n"
-gdb_expect_list "backtrace for nexti" ".*$gdb_prompt $" {
+gdb_test_sequence "bt" "backtrace for nexti" {
     "\[\r\n\]+.0 \[^\r\n\]* handler "
     "\[\r\n\]+.1  .signal handler called."
-    "\[\r\n\]+.2 \[^\r\n\]* main .*"
+    "\[\r\n\]+.2 \[^\r\n\]* main "
 }
 
 # Check that GDB can step the inferior back to main
 set test "step out of handler"
 gdb_test_multiple "step" "${test}" {
+    -re "Could not insert single-step breakpoint.*$gdb_prompt $" {
+       setup_kfail gdb/8841 sparc*-*-openbsd*
+       fail "$test (could not insert single-step breakpoint)"
+    }
+    -re "Cannot insert breakpoint.*Cannot access memory.*$gdb_prompt $" {
+        setup_kfail gdb/8841 "nios2*-*-linux*"
+       fail "$test (could not insert single-step breakpoint)"
+    }
     -re "done = 1;.*${gdb_prompt} $" {
        send_gdb "$i\n"
        exp_continue
@@ -83,9 +76,16 @@ gdb_test_multiple "step" "${test}" {
        send_gdb "step\n"
        exp_continue
     }
-    -re "return 0.*${gdb_prompt} $" {
-       # Stepping out of a function GDB advances the inferior to the
-       # start of the next line
+    -re "$inferior_exited_re normally.*${gdb_prompt} $" {
+       kfail gdb/1613 "$test (program exited)"
+    }
+    -re "(while ..done|return 0).*${gdb_prompt} $" {
+       # After stepping out of a function /r signal-handler, GDB will
+       # advance the inferior until it is at the first instruction of
+       # a code-line.  While typically things return to the middle of
+       # the "while..." (and hence GDB advances the inferior to the
+       # "return..." line) it is also possible for the return to land
+       # on the first instruction of "while...".  Accept both cases.
        pass "$test"
     }
 }