Fix skip.exp test failure observed with gcc-9.2.0

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

diff --git a/gdb/testsuite/gdb.base/siginfo.exp b/gdb/testsuite/gdb.base/siginfo.exp
index ebad41e737593a58ed3c9e49f163f03263261f8f..e6d25ad15fbfec97f1ae9da473320ecf312325cb 100644 (file)
--- a/gdb/testsuite/gdb.base/siginfo.exp
+++ b/gdb/testsuite/gdb.base/siginfo.exp
@@ -1,4 +1,4 @@
-# Copyright 2004, 2007 Free Software Foundation, Inc.
+# Copyright 2004-2019 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
@@ -24,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 ${srcfile}.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)
@@ -64,18 +51,21 @@ 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 sparc*-*-openbsd* gdb/1736
+       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} $" {
@@ -86,7 +76,7 @@ gdb_test_multiple "step" "${test}" {
        send_gdb "step\n"
        exp_continue
     }
-    -re "Program exited normally.*${gdb_prompt} $" {
+    -re "$inferior_exited_re normally.*${gdb_prompt} $" {
        kfail gdb/1613 "$test (program exited)"
     }
     -re "(while ..done|return 0).*${gdb_prompt} $" {