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.
This commit is contained in:
Philippe Waroquiers 2018-10-25 22:42:58 +02:00
parent 82b5e646c2
commit c8ee3f04a6
36 changed files with 99 additions and 53 deletions

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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" \

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

@ -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.

View File

@ -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"

View File

@ -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

View File

@ -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.

View File

@ -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"

View File

@ -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.

View File

@ -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" {

View File

@ -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]

View File

@ -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.

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

@ -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 } {

View File

@ -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
}
#

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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)

View File

@ -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

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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

View File

@ -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" \