From patchwork Sat Oct 27 14:19:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Waroquiers X-Patchwork-Id: 29921 Received: (qmail 94513 invoked by alias); 27 Oct 2018 14:20:08 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 94502 invoked by uid 89); 27 Oct 2018 14:20:06 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=gdb_load, 989, gdb_start, Break X-HELO: mailsec112.isp.belgacom.be Received: from mailsec112.isp.belgacom.be (HELO mailsec112.isp.belgacom.be) (195.238.20.108) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 27 Oct 2018 14:20:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skynet.be; i=@skynet.be; q=dns/txt; s=securemail; t=1540650003; x=1572186003; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=E+qV7Wu7Jyd9ttsCbsAAeAxhJ6dPmpp06KoPxJ4tb48=; b=GxEkQbnLVONoHj/62kvdAo3K5XZ2laJ5zoDS7u0mn190wbzePZuYfrQk gjoR2F0kXKxZ3UbpxNmsEv4cFcY0TA==; Received: from 110.212-243-81.adsl-dyn.isp.belgacom.be (HELO md.home) ([81.243.212.110]) by relay.skynet.be with ESMTP/TLS/DHE-RSA-AES128-GCM-SHA256; 27 Oct 2018 16:20:00 +0200 From: Philippe Waroquiers To: gdb-patches@sourceware.org Cc: Philippe Waroquiers Subject: [PUSHED] Remove a bunch of usages of gdb_suppress_tests in 'runto_main'. Date: Sat, 27 Oct 2018 16:19:55 +0200 Message-Id: <20181027141955.17829-1-philippe.waroquiers@skynet.be> MIME-Version: 1.0 X-IsSubscribed: yes In the 'info -q -t' patch series, I started a new test from gdb.threads/threadapply.exp, that uses an obsolete way to do runto_main. This patch changes all occurrences of runto_main using gdb_suppress_tests to use instead fail+return. Note that there are still about 220 occurrences of gdb_suppress_tests but unclear (to me) if these can be similarly trivially be replaced by a fail+return. Further cleanup can be done in follow-up patches. Tests run on Debian/x86_64. gdb/testsuite/ChangeLog 2018-10-27 Philippe Waroquiers * gdb.arch/altivec-regs.exp: Do not use gdb_suppress_tests in runto_main, use fail + return instead. gdb.arch/amd64-byte.exp: Likewise. gdb.arch/amd64-dword.exp: Likewise. gdb.arch/amd64-word.exp: Likewise. gdb.arch/e500-abi.exp: Likewise. gdb.arch/e500-regs.exp: Likewise. gdb.arch/gdb1291.exp: Likewise. gdb.arch/gdb1431.exp: Likewise. gdb.arch/i386-avx.exp: Likewise. gdb.arch/i386-byte.exp: Likewise. gdb.arch/i386-prologue.exp: Likewise. gdb.arch/i386-sse.exp: Likewise. gdb.arch/i386-word.exp: Likewise. gdb.arch/iwmmxt-regs.exp: Likewise. gdb.arch/pa-nullify.exp: Likewise. gdb.arch/powerpc-prologue.exp: Likewise. gdb.arch/s390-tdbregs.exp: Likewise. gdb.arch/vsx-regs.exp: Likewise. gdb.asm/asm-source.exp: Likewise. gdb.base/auxv.exp: Likewise. gdb.base/bigcore.exp: Likewise. gdb.base/overlays.exp: Likewise. gdb.base/savedregs.exp: Likewise. gdb.base/setshow.exp: Likewise. gdb.base/sigaltstack.exp: Likewise. gdb.base/sigbpt.exp: Likewise. gdb.base/siginfo-addr.exp: Likewise. gdb.base/siginfo-obj.exp: Likewise. gdb.base/siginfo-thread.exp: Likewise. gdb.base/siginfo.exp: Likewise. gdb.base/signull.exp: Likewise. gdb.base/sigrepeat.exp: Likewise. gdb.base/structs2.exp: Likewise. gdb.threads/threadapply.exp: Likewise. gdb.threads/watchthreads.exp: Likewise. gdb.threads/watchthreads2.exp: Likewise. --- gdb/testsuite/gdb.arch/altivec-regs.exp | 3 ++- gdb/testsuite/gdb.arch/amd64-byte.exp | 3 ++- gdb/testsuite/gdb.arch/amd64-dword.exp | 3 ++- gdb/testsuite/gdb.arch/amd64-word.exp | 3 ++- gdb/testsuite/gdb.arch/e500-abi.exp | 3 ++- gdb/testsuite/gdb.arch/e500-regs.exp | 6 ++++-- gdb/testsuite/gdb.arch/gdb1291.exp | 3 ++- gdb/testsuite/gdb.arch/gdb1431.exp | 3 ++- gdb/testsuite/gdb.arch/i386-avx.exp | 3 ++- gdb/testsuite/gdb.arch/i386-byte.exp | 3 ++- gdb/testsuite/gdb.arch/i386-prologue.exp | 3 ++- gdb/testsuite/gdb.arch/i386-sse.exp | 3 ++- gdb/testsuite/gdb.arch/i386-word.exp | 3 ++- gdb/testsuite/gdb.arch/iwmmxt-regs.exp | 3 ++- gdb/testsuite/gdb.arch/pa-nullify.exp | 15 ++++++++++++--- gdb/testsuite/gdb.arch/powerpc-prologue.exp | 3 ++- gdb/testsuite/gdb.arch/s390-tdbregs.exp | 5 +++-- gdb/testsuite/gdb.arch/vsx-regs.exp | 3 ++- gdb/testsuite/gdb.asm/asm-source.exp | 3 ++- gdb/testsuite/gdb.base/auxv.exp | 5 +++-- gdb/testsuite/gdb.base/bigcore.exp | 5 +++-- gdb/testsuite/gdb.base/overlays.exp | 3 ++- gdb/testsuite/gdb.base/savedregs.exp | 5 +++-- gdb/testsuite/gdb.base/setshow.exp | 5 +++-- gdb/testsuite/gdb.base/sigaltstack.exp | 5 +++-- gdb/testsuite/gdb.base/sigbpt.exp | 3 ++- gdb/testsuite/gdb.base/siginfo-addr.exp | 5 +++-- gdb/testsuite/gdb.base/siginfo-obj.exp | 10 ++++++---- gdb/testsuite/gdb.base/siginfo-thread.exp | 5 +++-- gdb/testsuite/gdb.base/siginfo.exp | 5 +++-- gdb/testsuite/gdb.base/signull.exp | 3 ++- gdb/testsuite/gdb.base/sigrepeat.exp | 5 +++-- gdb/testsuite/gdb.base/structs2.exp | 5 +++-- gdb/testsuite/gdb.threads/threadapply.exp | 3 ++- gdb/testsuite/gdb.threads/watchthreads.exp | 3 ++- gdb/testsuite/gdb.threads/watchthreads2.exp | 3 ++- 36 files changed, 99 insertions(+), 53 deletions(-) diff --git a/gdb/testsuite/gdb.arch/altivec-regs.exp b/gdb/testsuite/gdb.arch/altivec-regs.exp index fcff886c34..e48177976c 100644 --- a/gdb/testsuite/gdb.arch/altivec-regs.exp +++ b/gdb/testsuite/gdb.arch/altivec-regs.exp @@ -58,7 +58,8 @@ gdb_load ${binfile} # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } gdb_test "set print frame-arguments all" diff --git a/gdb/testsuite/gdb.arch/amd64-byte.exp b/gdb/testsuite/gdb.arch/amd64-byte.exp index 9f2fbe8d92..d943342bac 100644 --- a/gdb/testsuite/gdb.arch/amd64-byte.exp +++ b/gdb/testsuite/gdb.arch/amd64-byte.exp @@ -38,7 +38,8 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list clean_restart ${binfile} if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } set byte_regs(1) al diff --git a/gdb/testsuite/gdb.arch/amd64-dword.exp b/gdb/testsuite/gdb.arch/amd64-dword.exp index ceafed3425..2f94ff3074 100644 --- a/gdb/testsuite/gdb.arch/amd64-dword.exp +++ b/gdb/testsuite/gdb.arch/amd64-dword.exp @@ -38,7 +38,8 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list clean_restart ${binfile} if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } set nr_regs 14 diff --git a/gdb/testsuite/gdb.arch/amd64-word.exp b/gdb/testsuite/gdb.arch/amd64-word.exp index 4387dd3a3c..b40fde4464 100644 --- a/gdb/testsuite/gdb.arch/amd64-word.exp +++ b/gdb/testsuite/gdb.arch/amd64-word.exp @@ -38,7 +38,8 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list clean_restart ${binfile} if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } set nr_regs 14 diff --git a/gdb/testsuite/gdb.arch/e500-abi.exp b/gdb/testsuite/gdb.arch/e500-abi.exp index ef5f46facc..e4f1a3f3f3 100644 --- a/gdb/testsuite/gdb.arch/e500-abi.exp +++ b/gdb/testsuite/gdb.arch/e500-abi.exp @@ -46,7 +46,8 @@ gdb_load ${binfile} # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } gdb_test "b marker" "Breakpoint 2 at.*file.*e500-abi.c, line \[0-9\]+." "break marker" diff --git a/gdb/testsuite/gdb.arch/e500-regs.exp b/gdb/testsuite/gdb.arch/e500-regs.exp index 37f93348cc..d7204b878c 100644 --- a/gdb/testsuite/gdb.arch/e500-regs.exp +++ b/gdb/testsuite/gdb.arch/e500-regs.exp @@ -45,7 +45,8 @@ gdb_load ${binfile} # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } # set all the registers integer portions to 1 @@ -145,7 +146,8 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } gdb_test "break vector_fun" \ diff --git a/gdb/testsuite/gdb.arch/gdb1291.exp b/gdb/testsuite/gdb.arch/gdb1291.exp index 39ccf8b40d..9b1202477d 100644 --- a/gdb/testsuite/gdb.arch/gdb1291.exp +++ b/gdb/testsuite/gdb.arch/gdb1291.exp @@ -47,7 +47,8 @@ gdb_load ${binfile} # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } gdb_test "b sub1" "Breakpoint 2.*" "set breakpoint" diff --git a/gdb/testsuite/gdb.arch/gdb1431.exp b/gdb/testsuite/gdb.arch/gdb1431.exp index 56718642d9..db3a15e519 100644 --- a/gdb/testsuite/gdb.arch/gdb1431.exp +++ b/gdb/testsuite/gdb.arch/gdb1431.exp @@ -49,7 +49,8 @@ gdb_load ${binfile} # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } gdb_test "advance sub1" "hello world\r\n$hex in sub1 \\(\\)" "get to sub1" diff --git a/gdb/testsuite/gdb.arch/i386-avx.exp b/gdb/testsuite/gdb.arch/i386-avx.exp index 9c0793f5fb..6e5730af40 100644 --- a/gdb/testsuite/gdb.arch/i386-avx.exp +++ b/gdb/testsuite/gdb.arch/i386-avx.exp @@ -43,7 +43,8 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list clean_restart ${binfile} if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } send_gdb "print have_avx ()\r" diff --git a/gdb/testsuite/gdb.arch/i386-byte.exp b/gdb/testsuite/gdb.arch/i386-byte.exp index 3441344aa8..8bbbe2dc95 100644 --- a/gdb/testsuite/gdb.arch/i386-byte.exp +++ b/gdb/testsuite/gdb.arch/i386-byte.exp @@ -38,7 +38,8 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list clean_restart ${binfile} if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } set byte_regs(1) al diff --git a/gdb/testsuite/gdb.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp index 6f88e557fe..949f98a456 100644 --- a/gdb/testsuite/gdb.arch/i386-prologue.exp +++ b/gdb/testsuite/gdb.arch/i386-prologue.exp @@ -66,7 +66,8 @@ gdb_load ${binfile} # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } # Testcase for standard prologue. diff --git a/gdb/testsuite/gdb.arch/i386-sse.exp b/gdb/testsuite/gdb.arch/i386-sse.exp index c5bc3c96ad..7167ca1a84 100644 --- a/gdb/testsuite/gdb.arch/i386-sse.exp +++ b/gdb/testsuite/gdb.arch/i386-sse.exp @@ -43,7 +43,8 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list clean_restart ${binfile} if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } send_gdb "print have_sse ()\r" diff --git a/gdb/testsuite/gdb.arch/i386-word.exp b/gdb/testsuite/gdb.arch/i386-word.exp index 9669ae2fb8..dce0f582c3 100644 --- a/gdb/testsuite/gdb.arch/i386-word.exp +++ b/gdb/testsuite/gdb.arch/i386-word.exp @@ -38,7 +38,8 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list clean_restart ${binfile} if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } set word_regs(1) ax diff --git a/gdb/testsuite/gdb.arch/iwmmxt-regs.exp b/gdb/testsuite/gdb.arch/iwmmxt-regs.exp index a6560b3adc..74190b22c0 100644 --- a/gdb/testsuite/gdb.arch/iwmmxt-regs.exp +++ b/gdb/testsuite/gdb.arch/iwmmxt-regs.exp @@ -41,7 +41,8 @@ gdb_load ${binfile} # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } # Set all the registers to arbitrary values. diff --git a/gdb/testsuite/gdb.arch/pa-nullify.exp b/gdb/testsuite/gdb.arch/pa-nullify.exp index 1b3a88fb64..7532ea9029 100644 --- a/gdb/testsuite/gdb.arch/pa-nullify.exp +++ b/gdb/testsuite/gdb.arch/pa-nullify.exp @@ -88,7 +88,10 @@ proc get_addr_of_sym { sym } { return $addr } -if { ! [ runto_main ] } then { gdb_suppress_tests; } +if ![runto_main] then { + fail "can't run to main" + return 0 +} set foo [get_addr_of_sym "foo"] set bar [get_addr_of_sym "bar"] @@ -122,7 +125,10 @@ proc test_core_bt { test } { } set test "core at last insn in foo" -if { ! [ runto_main ] } then { gdb_suppress_tests; } +if ![runto_main] then { + fail "can't run to main" + return 0 +} gdb_breakpoint "*$foo_last" gdb_test "continue" "Breakpoint \[0-9\]*,.* in foo.*" "$test: continue to breakpoint" if [gen_core $test] { @@ -130,7 +136,10 @@ if [gen_core $test] { } set test "core at nullified insn" -if { ! [ runto_main ] } then { gdb_suppress_tests; } +if ![runto_main] then { + fail "can't run to main" + return 0 +} gdb_breakpoint "*$foo_last" gdb_test "continue" "Breakpoint \[0-9\]*,.* in foo.*" "$test: continue to breakpoint" gdb_test "stepi" ".*in foo.*" "$test: step to nullified instruction" diff --git a/gdb/testsuite/gdb.arch/powerpc-prologue.exp b/gdb/testsuite/gdb.arch/powerpc-prologue.exp index 5251dfa9c3..eef1f7b887 100644 --- a/gdb/testsuite/gdb.arch/powerpc-prologue.exp +++ b/gdb/testsuite/gdb.arch/powerpc-prologue.exp @@ -44,7 +44,8 @@ gdb_load ${binfile} # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } # Testcase for PIC prologue. diff --git a/gdb/testsuite/gdb.arch/s390-tdbregs.exp b/gdb/testsuite/gdb.arch/s390-tdbregs.exp index e454feb9d9..f5d1513a70 100644 --- a/gdb/testsuite/gdb.arch/s390-tdbregs.exp +++ b/gdb/testsuite/gdb.arch/s390-tdbregs.exp @@ -35,8 +35,9 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile \ return -1 } -if { ![runto_main] } then { - gdb_suppress_tests +if ![runto_main] then { + fail "can't run to main" + return 0 } gdb_test_multiple "next" "check for TE support" { diff --git a/gdb/testsuite/gdb.arch/vsx-regs.exp b/gdb/testsuite/gdb.arch/vsx-regs.exp index e4f674a314..ca6e776541 100644 --- a/gdb/testsuite/gdb.arch/vsx-regs.exp +++ b/gdb/testsuite/gdb.arch/vsx-regs.exp @@ -53,7 +53,8 @@ gdb_load ${binfile} # Run to `main' where we begin our tests. if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } set endianness [get_endianness] diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp index 9879f0ca47..8b645a20c6 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -294,7 +294,8 @@ gdb_load ${binfile} # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } # Execute the `f' command and see if the result includes source info. diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp index 1cfbf28ea4..4713de4ce2 100644 --- a/gdb/testsuite/gdb.base/auxv.exp +++ b/gdb/testsuite/gdb.base/auxv.exp @@ -56,8 +56,9 @@ if {$core_works} { } } -if { ![runto_main] } then { - gdb_suppress_tests +if ![runto_main] then { + fail "can't run to main" + return 0 } set print_core_line [gdb_get_line_number "ABORT;"] gdb_test "tbreak $print_core_line" diff --git a/gdb/testsuite/gdb.base/bigcore.exp b/gdb/testsuite/gdb.base/bigcore.exp index 0a0d08524c..93a6faf62e 100644 --- a/gdb/testsuite/gdb.base/bigcore.exp +++ b/gdb/testsuite/gdb.base/bigcore.exp @@ -58,8 +58,9 @@ if {![is_remote host]} { "cd to test directory" } -if { ![runto_main] } then { - gdb_suppress_tests +if ![runto_main] then { + fail "can't run to main" + return 0 } set print_core_line [gdb_get_line_number "Dump core"] gdb_test "tbreak $print_core_line" diff --git a/gdb/testsuite/gdb.base/overlays.exp b/gdb/testsuite/gdb.base/overlays.exp index be355b6473..5cad79f99e 100644 --- a/gdb/testsuite/gdb.base/overlays.exp +++ b/gdb/testsuite/gdb.base/overlays.exp @@ -58,7 +58,8 @@ gdb_load ${binfile} # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } # couple of convenience variables diff --git a/gdb/testsuite/gdb.base/savedregs.exp b/gdb/testsuite/gdb.base/savedregs.exp index 73560b013e..1e7bedf255 100644 --- a/gdb/testsuite/gdb.base/savedregs.exp +++ b/gdb/testsuite/gdb.base/savedregs.exp @@ -41,8 +41,9 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb clean_restart ${binfile} # Advance to main -if { ![runto_main] } { - gdb_suppress_tests +if ![runto_main] then { + fail "can't run to main" + return 0 } proc process_saved_regs { current inner outer } { diff --git a/gdb/testsuite/gdb.base/setshow.exp b/gdb/testsuite/gdb.base/setshow.exp index 8728c6eb69..cec999806a 100644 --- a/gdb/testsuite/gdb.base/setshow.exp +++ b/gdb/testsuite/gdb.base/setshow.exp @@ -28,8 +28,9 @@ if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable {debug}] clean_restart ${binfile} # make sure $pc is sane, in case we're talking to a board. -if { ![runto_main] } { - gdb_suppress_tests +if ![runto_main] then { + fail "can't run to main" + return 0 } # diff --git a/gdb/testsuite/gdb.base/sigaltstack.exp b/gdb/testsuite/gdb.base/sigaltstack.exp index 0ccfe4f0e3..f09ee74efa 100644 --- a/gdb/testsuite/gdb.base/sigaltstack.exp +++ b/gdb/testsuite/gdb.base/sigaltstack.exp @@ -44,8 +44,9 @@ gdb_test "handle SIGVTALRM print pass nostop" gdb_test "handle SIGPROF print pass nostop" # Advance to main -if { ![runto_main] } then { - gdb_suppress_tests +if ![runto_main] then { + fail "can't run to main" + return 0 } # Stop in handle, when at the inner most level diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp index 2856e4622c..d3ddf685f1 100644 --- a/gdb/testsuite/gdb.base/sigbpt.exp +++ b/gdb/testsuite/gdb.base/sigbpt.exp @@ -45,7 +45,8 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } # If we can examine what's at memory address 0, it is possible that we diff --git a/gdb/testsuite/gdb.base/siginfo-addr.exp b/gdb/testsuite/gdb.base/siginfo-addr.exp index 3f14e72c7b..07caa50933 100644 --- a/gdb/testsuite/gdb.base/siginfo-addr.exp +++ b/gdb/testsuite/gdb.base/siginfo-addr.exp @@ -34,8 +34,9 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { 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 } # Run to the signal. diff --git a/gdb/testsuite/gdb.base/siginfo-obj.exp b/gdb/testsuite/gdb.base/siginfo-obj.exp index b87600cd3e..f596331b4c 100644 --- a/gdb/testsuite/gdb.base/siginfo-obj.exp +++ b/gdb/testsuite/gdb.base/siginfo-obj.exp @@ -39,8 +39,9 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } # Advance to main -if { ![runto_main] } then { - gdb_suppress_tests +if ![runto_main] then { + fail "can't run to main" + return 0 } # Run to the signal. @@ -97,8 +98,9 @@ gdb_test "p ssi_signo" " = $ssi_signo" # the changed value. # Advance to main -if { ![runto_main] } then { - gdb_suppress_tests +if ![runto_main] then { + fail "can't run to main" + return 0 } # Run to the signal. diff --git a/gdb/testsuite/gdb.base/siginfo-thread.exp b/gdb/testsuite/gdb.base/siginfo-thread.exp index c1ad87f2ec..2f3f55a2c8 100644 --- a/gdb/testsuite/gdb.base/siginfo-thread.exp +++ b/gdb/testsuite/gdb.base/siginfo-thread.exp @@ -36,8 +36,9 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" \ clean_restart $binfile # Advance to main -if { ![runto_main] } then { - gdb_suppress_tests +if ![runto_main] then { + fail "can't run to main" + return 0 } # Run to the signal. diff --git a/gdb/testsuite/gdb.base/siginfo.exp b/gdb/testsuite/gdb.base/siginfo.exp index 3c9da4bc55..561a8177c2 100644 --- a/gdb/testsuite/gdb.base/siginfo.exp +++ b/gdb/testsuite/gdb.base/siginfo.exp @@ -38,8 +38,9 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { 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) diff --git a/gdb/testsuite/gdb.base/signull.exp b/gdb/testsuite/gdb.base/signull.exp index 7565b02b5e..270bf25ef9 100644 --- a/gdb/testsuite/gdb.base/signull.exp +++ b/gdb/testsuite/gdb.base/signull.exp @@ -47,7 +47,8 @@ clean_restart ${binfile} # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } # If we can examine what's at memory address 0, it is possible that we diff --git a/gdb/testsuite/gdb.base/sigrepeat.exp b/gdb/testsuite/gdb.base/sigrepeat.exp index 5acde7f81f..258226917d 100644 --- a/gdb/testsuite/gdb.base/sigrepeat.exp +++ b/gdb/testsuite/gdb.base/sigrepeat.exp @@ -36,8 +36,9 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb clean_restart ${binfile} # Advance to main -if { ![runto_main] } then { - gdb_suppress_tests +if ![runto_main] then { + fail "can't run to main" + return 0 } # Run to the signal handler wait loop. diff --git a/gdb/testsuite/gdb.base/structs2.exp b/gdb/testsuite/gdb.base/structs2.exp index 0e6294e5fc..b81bf849a7 100644 --- a/gdb/testsuite/gdb.base/structs2.exp +++ b/gdb/testsuite/gdb.base/structs2.exp @@ -39,8 +39,9 @@ clean_restart ${binfile} gdb_test_no_output "set width 0" -if { ![runto_main] } then { - gdb_suppress_tests +if ![runto_main] then { + fail "can't run to main" + return 0 } # Ok, we're finally ready to actually do our tests. diff --git a/gdb/testsuite/gdb.threads/threadapply.exp b/gdb/testsuite/gdb.threads/threadapply.exp index 8979ee38d8..cf68482653 100644 --- a/gdb/testsuite/gdb.threads/threadapply.exp +++ b/gdb/testsuite/gdb.threads/threadapply.exp @@ -32,7 +32,8 @@ clean_restart ${binfile} # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } # Break after all threads have been started. diff --git a/gdb/testsuite/gdb.threads/watchthreads.exp b/gdb/testsuite/gdb.threads/watchthreads.exp index e4e284eb03..54bedf0b19 100644 --- a/gdb/testsuite/gdb.threads/watchthreads.exp +++ b/gdb/testsuite/gdb.threads/watchthreads.exp @@ -45,7 +45,8 @@ gdb_test_no_output "set can-use-hw-watchpoints 1" "" # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } set args_0 0 diff --git a/gdb/testsuite/gdb.threads/watchthreads2.exp b/gdb/testsuite/gdb.threads/watchthreads2.exp index 3bfbcd7171..aa0cc3d0ca 100644 --- a/gdb/testsuite/gdb.threads/watchthreads2.exp +++ b/gdb/testsuite/gdb.threads/watchthreads2.exp @@ -42,7 +42,8 @@ gdb_test_no_output "set can-use-hw-watchpoints 1" "" # if ![runto_main] then { - gdb_suppress_tests + fail "can't run to main" + return 0 } gdb_test "break thread_started" \