diff options
author | Philippe Waroquiers <philippe.waroquiers@skynet.be> | 2018-10-25 22:42:58 +0200 |
---|---|---|
committer | Philippe Waroquiers <philippe.waroquiers@skynet.be> | 2018-10-27 14:47:36 +0200 |
commit | c8ee3f04a66141d5fa930cd77bc53ac0bc17de32 (patch) | |
tree | f2c3a88ac11509adebced66c5a7d3dd3ad427557 /gdb/testsuite/gdb.base | |
parent | 82b5e646c22b25862debc68a30d44957a9e5e3d3 (diff) | |
download | gdb-c8ee3f04a66141d5fa930cd77bc53ac0bc17de32.zip gdb-c8ee3f04a66141d5fa930cd77bc53ac0bc17de32.tar.gz gdb-c8ee3f04a66141d5fa930cd77bc53ac0bc17de32.tar.bz2 |
Remove a bunch of usages of gdb_suppress_tests in 'runto_main'.
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 <philippe.waroquiers@skynet.be>
* 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.
Diffstat (limited to 'gdb/testsuite/gdb.base')
-rw-r--r-- | gdb/testsuite/gdb.base/auxv.exp | 5 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/bigcore.exp | 5 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/overlays.exp | 3 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/savedregs.exp | 5 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/setshow.exp | 5 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/sigaltstack.exp | 5 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/sigbpt.exp | 3 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/siginfo-addr.exp | 5 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/siginfo-obj.exp | 10 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/siginfo-thread.exp | 5 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/siginfo.exp | 5 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/signull.exp | 3 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/sigrepeat.exp | 5 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/structs2.exp | 5 |
14 files changed, 42 insertions, 27 deletions
diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp index 1cfbf28..4713de4 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 0a0d085..93a6faf 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 be355b6..5cad79f 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 73560b0..1e7bedf 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 8728c6e..cec9998 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 0ccfe4f..f09ee74 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 2856e46..d3ddf68 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 3f14e72..07caa50 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 b87600c..f596331 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 c1ad87f..2f3f55a 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 3c9da4b..561a817 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 7565b02..270bf25 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 5acde7f..2582269 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 0e6294e..b81bf84 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. |