From 50441f0f8c82686edae36da0e11914e624ea0bfc Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 2 Sep 2020 22:57:54 +0100 Subject: [PATCH] 'runto main' -> 'runto_main' throughout This commit does 's/runto main/runto_main/g' throughout. gdb/testsuite/ChangeLog: * gdb.ada/fun_in_declare.exp: Use "runto_main" instead of "runto main". * gdb.ada/small_reg_param.exp: Likewise. * gdb.arch/powerpc-d128-regs.exp: Likewise. * gdb.base/annota1.exp: Likewise. * gdb.base/anon.exp: Likewise. * gdb.base/breakpoint-in-ro-region.exp: Likewise. * gdb.base/dprintf-non-stop.exp: Likewise. * gdb.base/dprintf.exp: Likewise. * gdb.base/gdb11530.exp: Likewise. * gdb.base/gdb11531.exp: Likewise. * gdb.base/gnu_vector.exp: Likewise. * gdb.base/interrupt-noterm.exp: Likewise. * gdb.base/memattr.exp: Likewise. * gdb.base/step-over-syscall.exp: Likewise. * gdb.base/watch-cond-infcall.exp: Likewise. * gdb.base/watch-read.exp: Likewise. * gdb.base/watch-vfork.exp: Likewise. * gdb.base/watch_thread_num.exp: Likewise. * gdb.base/watchpoint-stops-at-right-insn.exp: Likewise. * gdb.guile/scm-frame-inline.exp: Likewise. * gdb.linespec/explicit.exp: Likewise. * gdb.opt/inline-break.exp: Likewise. * gdb.python/py-frame-inline.exp: Likewise. * gdb.reverse/break-precsave.exp: Likewise. * gdb.reverse/break-reverse.exp: Likewise. * gdb.reverse/consecutive-precsave.exp: Likewise. * gdb.reverse/consecutive-reverse.exp: Likewise. * gdb.reverse/finish-precsave.exp: Likewise. * gdb.reverse/finish-reverse.exp: Likewise. * gdb.reverse/fstatat-reverse.exp: Likewise. * gdb.reverse/getresuid-reverse.exp: Likewise. * gdb.reverse/i386-precsave.exp: Likewise. * gdb.reverse/i386-reverse.exp: Likewise. * gdb.reverse/i386-sse-reverse.exp: Likewise. * gdb.reverse/i387-env-reverse.exp: Likewise. * gdb.reverse/i387-stack-reverse.exp: Likewise. * gdb.reverse/insn-reverse.exp: Likewise. * gdb.reverse/machinestate-precsave.exp: Likewise. * gdb.reverse/machinestate.exp: Likewise. * gdb.reverse/pipe-reverse.exp: Likewise. * gdb.reverse/readv-reverse.exp: Likewise. * gdb.reverse/recvmsg-reverse.exp: Likewise. * gdb.reverse/rerun-prec.exp: Likewise. * gdb.reverse/s390-mvcle.exp: Likewise. * gdb.reverse/solib-precsave.exp: Likewise. * gdb.reverse/solib-reverse.exp: Likewise. * gdb.reverse/step-precsave.exp: Likewise. * gdb.reverse/step-reverse.exp: Likewise. * gdb.reverse/time-reverse.exp: Likewise. * gdb.reverse/until-precsave.exp: Likewise. * gdb.reverse/until-reverse.exp: Likewise. * gdb.reverse/waitpid-reverse.exp: Likewise. * gdb.reverse/watch-precsave.exp: Likewise. * gdb.reverse/watch-reverse.exp: Likewise. * gdb.threads/kill.exp: Likewise. * gdb.threads/tid-reuse.exp: Likewise. Change-Id: I70f457253836019880b4d7fb981936afa56724c2 --- gdb/testsuite/ChangeLog | 60 +++++++++++++++++++ gdb/testsuite/gdb.ada/fun_in_declare.exp | 2 +- gdb/testsuite/gdb.ada/small_reg_param.exp | 2 +- gdb/testsuite/gdb.arch/powerpc-d128-regs.exp | 2 +- gdb/testsuite/gdb.base/annota1.exp | 2 +- gdb/testsuite/gdb.base/anon.exp | 2 +- .../gdb.base/breakpoint-in-ro-region.exp | 2 +- gdb/testsuite/gdb.base/dprintf-non-stop.exp | 2 +- gdb/testsuite/gdb.base/dprintf.exp | 4 +- gdb/testsuite/gdb.base/gdb11530.exp | 2 +- gdb/testsuite/gdb.base/gdb11531.exp | 2 +- gdb/testsuite/gdb.base/gnu_vector.exp | 2 +- gdb/testsuite/gdb.base/interrupt-noterm.exp | 2 +- gdb/testsuite/gdb.base/memattr.exp | 2 +- gdb/testsuite/gdb.base/step-over-syscall.exp | 4 +- gdb/testsuite/gdb.base/watch-cond-infcall.exp | 2 +- gdb/testsuite/gdb.base/watch-read.exp | 2 +- gdb/testsuite/gdb.base/watch-vfork.exp | 2 +- gdb/testsuite/gdb.base/watch_thread_num.exp | 2 +- .../watchpoint-stops-at-right-insn.exp | 4 +- gdb/testsuite/gdb.guile/scm-frame-inline.exp | 2 +- gdb/testsuite/gdb.linespec/explicit.exp | 2 +- gdb/testsuite/gdb.opt/inline-break.exp | 10 ++-- gdb/testsuite/gdb.python/py-frame-inline.exp | 2 +- gdb/testsuite/gdb.reverse/break-precsave.exp | 2 +- gdb/testsuite/gdb.reverse/break-reverse.exp | 2 +- .../gdb.reverse/consecutive-precsave.exp | 2 +- .../gdb.reverse/consecutive-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/finish-precsave.exp | 2 +- gdb/testsuite/gdb.reverse/finish-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/fstatat-reverse.exp | 2 +- .../gdb.reverse/getresuid-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/i386-precsave.exp | 2 +- gdb/testsuite/gdb.reverse/i386-reverse.exp | 2 +- .../gdb.reverse/i386-sse-reverse.exp | 2 +- .../gdb.reverse/i387-env-reverse.exp | 2 +- .../gdb.reverse/i387-stack-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/insn-reverse.exp | 2 +- .../gdb.reverse/machinestate-precsave.exp | 2 +- gdb/testsuite/gdb.reverse/machinestate.exp | 2 +- gdb/testsuite/gdb.reverse/pipe-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/readv-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/recvmsg-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/rerun-prec.exp | 2 +- gdb/testsuite/gdb.reverse/s390-mvcle.exp | 2 +- gdb/testsuite/gdb.reverse/solib-precsave.exp | 2 +- gdb/testsuite/gdb.reverse/solib-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/step-precsave.exp | 2 +- gdb/testsuite/gdb.reverse/step-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/time-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/until-precsave.exp | 2 +- gdb/testsuite/gdb.reverse/until-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/waitpid-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/watch-precsave.exp | 2 +- gdb/testsuite/gdb.reverse/watch-reverse.exp | 2 +- gdb/testsuite/gdb.threads/kill.exp | 2 +- gdb/testsuite/gdb.threads/tid-reuse.exp | 2 +- 57 files changed, 123 insertions(+), 63 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5a04e4fd70e..6248618451c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,63 @@ +2020-10-13 Pedro Alves + + * gdb.ada/fun_in_declare.exp: Use "runto_main" instead of + "runto main". + * gdb.ada/small_reg_param.exp: Likewise. + * gdb.arch/powerpc-d128-regs.exp: Likewise. + * gdb.base/annota1.exp: Likewise. + * gdb.base/anon.exp: Likewise. + * gdb.base/breakpoint-in-ro-region.exp: Likewise. + * gdb.base/dprintf-non-stop.exp: Likewise. + * gdb.base/dprintf.exp: Likewise. + * gdb.base/gdb11530.exp: Likewise. + * gdb.base/gdb11531.exp: Likewise. + * gdb.base/gnu_vector.exp: Likewise. + * gdb.base/interrupt-noterm.exp: Likewise. + * gdb.base/memattr.exp: Likewise. + * gdb.base/step-over-syscall.exp: Likewise. + * gdb.base/watch-cond-infcall.exp: Likewise. + * gdb.base/watch-read.exp: Likewise. + * gdb.base/watch-vfork.exp: Likewise. + * gdb.base/watch_thread_num.exp: Likewise. + * gdb.base/watchpoint-stops-at-right-insn.exp: Likewise. + * gdb.guile/scm-frame-inline.exp: Likewise. + * gdb.linespec/explicit.exp: Likewise. + * gdb.opt/inline-break.exp: Likewise. + * gdb.python/py-frame-inline.exp: Likewise. + * gdb.reverse/break-precsave.exp: Likewise. + * gdb.reverse/break-reverse.exp: Likewise. + * gdb.reverse/consecutive-precsave.exp: Likewise. + * gdb.reverse/consecutive-reverse.exp: Likewise. + * gdb.reverse/finish-precsave.exp: Likewise. + * gdb.reverse/finish-reverse.exp: Likewise. + * gdb.reverse/fstatat-reverse.exp: Likewise. + * gdb.reverse/getresuid-reverse.exp: Likewise. + * gdb.reverse/i386-precsave.exp: Likewise. + * gdb.reverse/i386-reverse.exp: Likewise. + * gdb.reverse/i386-sse-reverse.exp: Likewise. + * gdb.reverse/i387-env-reverse.exp: Likewise. + * gdb.reverse/i387-stack-reverse.exp: Likewise. + * gdb.reverse/insn-reverse.exp: Likewise. + * gdb.reverse/machinestate-precsave.exp: Likewise. + * gdb.reverse/machinestate.exp: Likewise. + * gdb.reverse/pipe-reverse.exp: Likewise. + * gdb.reverse/readv-reverse.exp: Likewise. + * gdb.reverse/recvmsg-reverse.exp: Likewise. + * gdb.reverse/rerun-prec.exp: Likewise. + * gdb.reverse/s390-mvcle.exp: Likewise. + * gdb.reverse/solib-precsave.exp: Likewise. + * gdb.reverse/solib-reverse.exp: Likewise. + * gdb.reverse/step-precsave.exp: Likewise. + * gdb.reverse/step-reverse.exp: Likewise. + * gdb.reverse/time-reverse.exp: Likewise. + * gdb.reverse/until-precsave.exp: Likewise. + * gdb.reverse/until-reverse.exp: Likewise. + * gdb.reverse/waitpid-reverse.exp: Likewise. + * gdb.reverse/watch-precsave.exp: Likewise. + * gdb.reverse/watch-reverse.exp: Likewise. + * gdb.threads/kill.exp: Likewise. + * gdb.threads/tid-reuse.exp: Likewise. + 2020-10-13 Simon Marchi PR gdb/26642 diff --git a/gdb/testsuite/gdb.ada/fun_in_declare.exp b/gdb/testsuite/gdb.ada/fun_in_declare.exp index 56b6d4c6c00..9e4d76fa554 100644 --- a/gdb/testsuite/gdb.ada/fun_in_declare.exp +++ b/gdb/testsuite/gdb.ada/fun_in_declare.exp @@ -25,7 +25,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } clean_restart ${testfile} -if ![runto main] then { +if ![runto_main] then { perror "Couldn't run ${testfile}" return } diff --git a/gdb/testsuite/gdb.ada/small_reg_param.exp b/gdb/testsuite/gdb.ada/small_reg_param.exp index 5737708e39f..9ae9a1805fb 100644 --- a/gdb/testsuite/gdb.ada/small_reg_param.exp +++ b/gdb/testsuite/gdb.ada/small_reg_param.exp @@ -25,7 +25,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug optimize=- clean_restart ${testfile} -if ![runto main] then { +if ![runto_main] then { perror "Couldn't run ${testfile}" return } diff --git a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp index cd96029fe85..cccf9e703eb 100644 --- a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp +++ b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp @@ -39,7 +39,7 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -if { ![runto main] } then { +if { ![runto_main] } then { fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp index 2fdfd65ce86..f3c99667acd 100644 --- a/gdb/testsuite/gdb.base/annota1.exp +++ b/gdb/testsuite/gdb.base/annota1.exp @@ -459,7 +459,7 @@ proc thread_test {} { gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} - if { ![runto main] } then { + if { ![runto_main] } then { fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/anon.exp b/gdb/testsuite/gdb.base/anon.exp index 0d77bbf5040..f6bb3c5f041 100644 --- a/gdb/testsuite/gdb.base/anon.exp +++ b/gdb/testsuite/gdb.base/anon.exp @@ -20,7 +20,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] } { return -1 } -if { ![runto main] } then { +if { ![runto_main] } then { fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp b/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp index 65f7baae9f5..3d22af5937f 100644 --- a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp +++ b/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp @@ -28,7 +28,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -if ![runto main] { +if ![runto_main] { return -1 } diff --git a/gdb/testsuite/gdb.base/dprintf-non-stop.exp b/gdb/testsuite/gdb.base/dprintf-non-stop.exp index 5ed5d022322..3d911a4073b 100644 --- a/gdb/testsuite/gdb.base/dprintf-non-stop.exp +++ b/gdb/testsuite/gdb.base/dprintf-non-stop.exp @@ -26,7 +26,7 @@ save_vars { GDBFLAGS } { clean_restart ${executable} } -if ![runto main] { +if ![runto_main] { fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/dprintf.exp b/gdb/testsuite/gdb.base/dprintf.exp index 968f9eafcc9..9fa2e64993c 100644 --- a/gdb/testsuite/gdb.base/dprintf.exp +++ b/gdb/testsuite/gdb.base/dprintf.exp @@ -22,7 +22,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { set bp_location1 [gdb_get_line_number "set breakpoint 1 here"] set dp_location1 [gdb_get_line_number "set dprintf 1 here"] -if ![runto main] { +if ![runto_main] { return -1 } @@ -72,7 +72,7 @@ proc restart {} { clean_restart $binfile - if ![runto main] { + if ![runto_main] { return -1 } diff --git a/gdb/testsuite/gdb.base/gdb11530.exp b/gdb/testsuite/gdb.base/gdb11530.exp index 705d03dd2a2..a7399267acd 100644 --- a/gdb/testsuite/gdb.base/gdb11530.exp +++ b/gdb/testsuite/gdb.base/gdb11530.exp @@ -36,7 +36,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $testfile.c {debug}] } { } -if { ![runto main] } then { +if { ![runto_main] } then { fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/gdb11531.exp b/gdb/testsuite/gdb.base/gdb11531.exp index 6cde80ddda5..59ef4394a8b 100644 --- a/gdb/testsuite/gdb.base/gdb11531.exp +++ b/gdb/testsuite/gdb.base/gdb11531.exp @@ -31,7 +31,7 @@ if [target_info exists gdb,no_hardware_watchpoints] { gdb_test_no_output "set can-use-hw-watchpoints 0" "" } -if { ![runto main] } then { +if { ![runto_main] } then { fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/gnu_vector.exp b/gdb/testsuite/gdb.base/gnu_vector.exp index 23fc2dbbd98..15cd59b0409 100644 --- a/gdb/testsuite/gdb.base/gnu_vector.exp +++ b/gdb/testsuite/gdb.base/gnu_vector.exp @@ -42,7 +42,7 @@ if { [do_compile {-mcpu=native}] != "" clean_restart ${binfile} -if { ![runto main] } { +if { ![runto_main] } { fail "runto main" return -1 } diff --git a/gdb/testsuite/gdb.base/interrupt-noterm.exp b/gdb/testsuite/gdb.base/interrupt-noterm.exp index 4ec4e8513f0..ddf4ba3352a 100644 --- a/gdb/testsuite/gdb.base/interrupt-noterm.exp +++ b/gdb/testsuite/gdb.base/interrupt-noterm.exp @@ -23,7 +23,7 @@ if [prepare_for_testing "failed to prepare for testing" \ # Pretend there's no terminal. gdb_test_no_output "set interactive-mode off" -if ![runto main] { +if ![runto_main] { fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/memattr.exp b/gdb/testsuite/gdb.base/memattr.exp index 237f51a4bae..91527cec063 100644 --- a/gdb/testsuite/gdb.base/memattr.exp +++ b/gdb/testsuite/gdb.base/memattr.exp @@ -23,7 +23,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main # Delete all target-supplied memory regions. delete_memory_regions diff --git a/gdb/testsuite/gdb.base/step-over-syscall.exp b/gdb/testsuite/gdb.base/step-over-syscall.exp index 0d0c31abe87..6f67aea12ef 100644 --- a/gdb/testsuite/gdb.base/step-over-syscall.exp +++ b/gdb/testsuite/gdb.base/step-over-syscall.exp @@ -76,7 +76,7 @@ proc setup { syscall } { clean_restart $testfile - if { ![runto main] } then { + if { ![runto_main] } then { fail "run to main ($syscall)" return -1 } @@ -317,7 +317,7 @@ step_over_syscall "clone" set testfile "step-over-fork" clean_restart $testfile -if { ![runto main] } then { +if { ![runto_main] } then { fail "run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/watch-cond-infcall.exp b/gdb/testsuite/gdb.base/watch-cond-infcall.exp index 0401ecc7fb5..dc76bf11aa2 100644 --- a/gdb/testsuite/gdb.base/watch-cond-infcall.exp +++ b/gdb/testsuite/gdb.base/watch-cond-infcall.exp @@ -33,7 +33,7 @@ proc test_watchpoint { hw } { clean_restart ${testfile} - if { ![runto main] } then { + if { ![runto_main] } then { fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/watch-read.exp b/gdb/testsuite/gdb.base/watch-read.exp index 42e5f323b6e..bb1d8476001 100644 --- a/gdb/testsuite/gdb.base/watch-read.exp +++ b/gdb/testsuite/gdb.base/watch-read.exp @@ -32,7 +32,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } -if { ![runto main] } then { +if { ![runto_main] } then { fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/watch-vfork.exp b/gdb/testsuite/gdb.base/watch-vfork.exp index a88897e34bb..ead0222a64b 100644 --- a/gdb/testsuite/gdb.base/watch-vfork.exp +++ b/gdb/testsuite/gdb.base/watch-vfork.exp @@ -27,7 +27,7 @@ proc test_watchpoint_across_vfork { hw teststr } { clean_restart ${testfile} - if { ![runto main] } then { + if { ![runto_main] } then { fail "run to main ($teststr)" return } diff --git a/gdb/testsuite/gdb.base/watch_thread_num.exp b/gdb/testsuite/gdb.base/watch_thread_num.exp index 88c22a28751..e59b9c3592d 100644 --- a/gdb/testsuite/gdb.base/watch_thread_num.exp +++ b/gdb/testsuite/gdb.base/watch_thread_num.exp @@ -41,7 +41,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab clean_restart ${binfile} -if { ![runto main] } then { +if { ![runto_main] } then { fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp b/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp index 4e36c4207fc..5b55739cc16 100644 --- a/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp +++ b/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp @@ -79,7 +79,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } -if { ![runto main] } then { +if { ![runto_main] } then { fail "run to main" return } @@ -134,7 +134,7 @@ proc test {always_inserted} { clean_restart $binfile - if { ![runto main] } then { + if { ![runto_main] } then { fail "run to main" return } diff --git a/gdb/testsuite/gdb.guile/scm-frame-inline.exp b/gdb/testsuite/gdb.guile/scm-frame-inline.exp index 8a4d8f893de..6f7c9140c00 100644 --- a/gdb/testsuite/gdb.guile/scm-frame-inline.exp +++ b/gdb/testsuite/gdb.guile/scm-frame-inline.exp @@ -24,7 +24,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { # Skip all tests if Guile scripting is not enabled. if { [skip_guile_tests] } { continue } -if ![runto main] { +if ![runto_main] { fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.linespec/explicit.exp b/gdb/testsuite/gdb.linespec/explicit.exp index 4f457dc372f..c01a425ece1 100644 --- a/gdb/testsuite/gdb.linespec/explicit.exp +++ b/gdb/testsuite/gdb.linespec/explicit.exp @@ -584,7 +584,7 @@ namespace eval $testfile { gdb_load [standard_output_file $exefile] set tst "condition_command overrides explicit linespec condition" - if {![runto main]} { + if {![runto_main]} { fail $tst } else { if {![gdb_breakpoint "-func myfunction if arg == 1"]} { diff --git a/gdb/testsuite/gdb.opt/inline-break.exp b/gdb/testsuite/gdb.opt/inline-break.exp index 560ed8ce48c..da3c706a533 100644 --- a/gdb/testsuite/gdb.opt/inline-break.exp +++ b/gdb/testsuite/gdb.opt/inline-break.exp @@ -190,7 +190,7 @@ foreach_with_prefix cmd [list "break" "tbreak"] { # Start with a clean state. delete_breakpoints - if {![runto main]} { + if {![runto_main]} { untested "could not run to main" return -1 } @@ -246,7 +246,7 @@ foreach_with_prefix func { } { clean_restart $binfile - if {![runto main]} { + if {![runto_main]} { untested "could not run to main" continue } @@ -264,7 +264,7 @@ set line [gdb_get_line_number "break here"] with_test_prefix "line number" { clean_restart $binfile - if {![runto main]} { + if {![runto_main]} { untested "could not run to main" continue } @@ -289,7 +289,7 @@ with_test_prefix "address" { clean_restart $binfile - if {![runto main]} { + if {![runto_main]} { untested "could not run to main" continue } @@ -308,7 +308,7 @@ with_test_prefix "check alignment" { clean_restart $binfile - if {![runto main]} { + if {![runto_main]} { untested "could not run to main" continue } diff --git a/gdb/testsuite/gdb.python/py-frame-inline.exp b/gdb/testsuite/gdb.python/py-frame-inline.exp index 2b3d8e2b0e1..749e040408b 100644 --- a/gdb/testsuite/gdb.python/py-frame-inline.exp +++ b/gdb/testsuite/gdb.python/py-frame-inline.exp @@ -24,7 +24,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { # Skip all tests if Python scripting is not enabled. if { [skip_python_tests] } { continue } -if ![runto main] then { +if ![runto_main] then { fail "can't run to function f" return 0 } diff --git a/gdb/testsuite/gdb.reverse/break-precsave.exp b/gdb/testsuite/gdb.reverse/break-precsave.exp index ec4ce6025be..ea0cb42a95f 100644 --- a/gdb/testsuite/gdb.reverse/break-precsave.exp +++ b/gdb/testsuite/gdb.reverse/break-precsave.exp @@ -37,7 +37,7 @@ proc precsave_tests {} { global foo_location bar_location main_location end_location global decimal srcfile precsave gdb_prompt - runto main + runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/break-reverse.exp b/gdb/testsuite/gdb.reverse/break-reverse.exp index 65c59bb8f39..07dd1da7991 100644 --- a/gdb/testsuite/gdb.reverse/break-reverse.exp +++ b/gdb/testsuite/gdb.reverse/break-reverse.exp @@ -31,7 +31,7 @@ set bar_location [gdb_get_line_number "break in bar" ] set main_location [gdb_get_line_number "break in main"] set end_location [gdb_get_line_number "end of main" ] -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp index dec501d589b..1d78df6b7da 100644 --- a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp +++ b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp @@ -28,7 +28,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/consecutive-reverse.exp b/gdb/testsuite/gdb.reverse/consecutive-reverse.exp index ff03e6744a4..d01a7dcf3a5 100644 --- a/gdb/testsuite/gdb.reverse/consecutive-reverse.exp +++ b/gdb/testsuite/gdb.reverse/consecutive-reverse.exp @@ -26,7 +26,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/finish-precsave.exp b/gdb/testsuite/gdb.reverse/finish-precsave.exp index ed468152049..1f3749849ff 100644 --- a/gdb/testsuite/gdb.reverse/finish-precsave.exp +++ b/gdb/testsuite/gdb.reverse/finish-precsave.exp @@ -27,7 +27,7 @@ if { [prepare_for_testing "failed to prepare" "$testfile" $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/finish-reverse.exp b/gdb/testsuite/gdb.reverse/finish-reverse.exp index 62eb3fd156e..89fa10ce983 100644 --- a/gdb/testsuite/gdb.reverse/finish-reverse.exp +++ b/gdb/testsuite/gdb.reverse/finish-reverse.exp @@ -26,7 +26,7 @@ if { [prepare_for_testing "failed to prepare" "$testfile" $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/fstatat-reverse.exp b/gdb/testsuite/gdb.reverse/fstatat-reverse.exp index 227f44891f0..e8151cccd2d 100644 --- a/gdb/testsuite/gdb.reverse/fstatat-reverse.exp +++ b/gdb/testsuite/gdb.reverse/fstatat-reverse.exp @@ -29,7 +29,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/getresuid-reverse.exp b/gdb/testsuite/gdb.reverse/getresuid-reverse.exp index 3e75939f528..33b64a311c4 100644 --- a/gdb/testsuite/gdb.reverse/getresuid-reverse.exp +++ b/gdb/testsuite/gdb.reverse/getresuid-reverse.exp @@ -29,7 +29,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/i386-precsave.exp b/gdb/testsuite/gdb.reverse/i386-precsave.exp index c51066cd2d8..58053f7888b 100644 --- a/gdb/testsuite/gdb.reverse/i386-precsave.exp +++ b/gdb/testsuite/gdb.reverse/i386-precsave.exp @@ -44,7 +44,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ set end_of_main [gdb_get_line_number " end of main "] set end_of_inc_dec_tests [gdb_get_line_number " end inc_dec_tests "] -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/i386-reverse.exp b/gdb/testsuite/gdb.reverse/i386-reverse.exp index c0d21b80cec..a8a8347b3d0 100644 --- a/gdb/testsuite/gdb.reverse/i386-reverse.exp +++ b/gdb/testsuite/gdb.reverse/i386-reverse.exp @@ -42,7 +42,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ set end_of_main [gdb_get_line_number " end of main "] set end_of_inc_dec_tests [gdb_get_line_number " end inc_dec_tests "] -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp b/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp index 0440409b94f..f1b7643e7b2 100644 --- a/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp +++ b/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp @@ -44,7 +44,7 @@ set end_sse_test [gdb_get_line_number " end sse_test "] set end_ssse3_test [gdb_get_line_number " end ssse3_test "] set end_sse4_test [gdb_get_line_number " end sse4_test "] -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/i387-env-reverse.exp b/gdb/testsuite/gdb.reverse/i387-env-reverse.exp index 5bef30f0e44..f051ccbe8f5 100644 --- a/gdb/testsuite/gdb.reverse/i387-env-reverse.exp +++ b/gdb/testsuite/gdb.reverse/i387-env-reverse.exp @@ -31,7 +31,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ return -1 } -runto main +runto_main # Record to end of main diff --git a/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp b/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp index 072fdba89ce..a53033c603b 100644 --- a/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp +++ b/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp @@ -31,7 +31,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ return -1 } -runto main +runto_main # Record to end of main diff --git a/gdb/testsuite/gdb.reverse/insn-reverse.exp b/gdb/testsuite/gdb.reverse/insn-reverse.exp index 53f4698763f..174b7957517 100644 --- a/gdb/testsuite/gdb.reverse/insn-reverse.exp +++ b/gdb/testsuite/gdb.reverse/insn-reverse.exp @@ -23,7 +23,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ [list debug]]} { return -1 } -if { ![runto main] } then { +if { ![runto_main] } then { fail "run to main" return } diff --git a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp index f7df3d70361..21b793c0178 100644 --- a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp +++ b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp @@ -55,7 +55,7 @@ set endmain [gdb_get_line_number " end main " $srcfile] # Test begins -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/machinestate.exp b/gdb/testsuite/gdb.reverse/machinestate.exp index 5171ee60c0c..a597bb6212d 100644 --- a/gdb/testsuite/gdb.reverse/machinestate.exp +++ b/gdb/testsuite/gdb.reverse/machinestate.exp @@ -53,7 +53,7 @@ set endmain [gdb_get_line_number " end main " $srcfile] # Test begins -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/pipe-reverse.exp b/gdb/testsuite/gdb.reverse/pipe-reverse.exp index 7113178b663..20187a06d96 100644 --- a/gdb/testsuite/gdb.reverse/pipe-reverse.exp +++ b/gdb/testsuite/gdb.reverse/pipe-reverse.exp @@ -29,7 +29,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/readv-reverse.exp b/gdb/testsuite/gdb.reverse/readv-reverse.exp index cd019dbbc98..be703cbe07e 100644 --- a/gdb/testsuite/gdb.reverse/readv-reverse.exp +++ b/gdb/testsuite/gdb.reverse/readv-reverse.exp @@ -29,7 +29,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp b/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp index ac5d136dc98..949b711ff17 100644 --- a/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp +++ b/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp @@ -29,7 +29,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/rerun-prec.exp b/gdb/testsuite/gdb.reverse/rerun-prec.exp index 637ac58954d..108c4a7bf91 100644 --- a/gdb/testsuite/gdb.reverse/rerun-prec.exp +++ b/gdb/testsuite/gdb.reverse/rerun-prec.exp @@ -24,7 +24,7 @@ if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile]]} { } # The bug is a regression in the sequence "run; record; run". -runto main +runto_main gdb_test_no_output "record" "turn on process record" gdb_run_cmd diff --git a/gdb/testsuite/gdb.reverse/s390-mvcle.exp b/gdb/testsuite/gdb.reverse/s390-mvcle.exp index beb4a69c79d..01761eb6fdf 100644 --- a/gdb/testsuite/gdb.reverse/s390-mvcle.exp +++ b/gdb/testsuite/gdb.reverse/s390-mvcle.exp @@ -32,7 +32,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp index 8d57e7951e2..e396e65066c 100644 --- a/gdb/testsuite/gdb.reverse/solib-precsave.exp +++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp @@ -79,7 +79,7 @@ gdb_load ${binfile} gdb_load_shlib $library1 gdb_load_shlib $library2 -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/solib-reverse.exp b/gdb/testsuite/gdb.reverse/solib-reverse.exp index 843aedc722a..a9ab07b3215 100644 --- a/gdb/testsuite/gdb.reverse/solib-reverse.exp +++ b/gdb/testsuite/gdb.reverse/solib-reverse.exp @@ -71,7 +71,7 @@ gdb_load ${binfile} gdb_load_shlib $library1 gdb_load_shlib $library2 -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/step-precsave.exp b/gdb/testsuite/gdb.reverse/step-precsave.exp index 12bb7d19486..7d8c12ce76b 100644 --- a/gdb/testsuite/gdb.reverse/step-precsave.exp +++ b/gdb/testsuite/gdb.reverse/step-precsave.exp @@ -32,7 +32,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/step-reverse.exp b/gdb/testsuite/gdb.reverse/step-reverse.exp index bdc9489d6f0..2320389c501 100644 --- a/gdb/testsuite/gdb.reverse/step-reverse.exp +++ b/gdb/testsuite/gdb.reverse/step-reverse.exp @@ -30,7 +30,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/time-reverse.exp b/gdb/testsuite/gdb.reverse/time-reverse.exp index fea38f37820..0f369aae711 100644 --- a/gdb/testsuite/gdb.reverse/time-reverse.exp +++ b/gdb/testsuite/gdb.reverse/time-reverse.exp @@ -29,7 +29,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/until-precsave.exp b/gdb/testsuite/gdb.reverse/until-precsave.exp index 5eb03dfeaf7..25f455fb608 100644 --- a/gdb/testsuite/gdb.reverse/until-precsave.exp +++ b/gdb/testsuite/gdb.reverse/until-precsave.exp @@ -36,7 +36,7 @@ set bp_location19 [gdb_get_line_number "set breakpoint 19 here"] set bp_location20 [gdb_get_line_number "set breakpoint 20 here"] set bp_location21 [gdb_get_line_number "set breakpoint 21 here"] -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/until-reverse.exp b/gdb/testsuite/gdb.reverse/until-reverse.exp index 6b435be4c94..f91600df550 100644 --- a/gdb/testsuite/gdb.reverse/until-reverse.exp +++ b/gdb/testsuite/gdb.reverse/until-reverse.exp @@ -34,7 +34,7 @@ set bp_location19 [gdb_get_line_number "set breakpoint 19 here"] set bp_location20 [gdb_get_line_number "set breakpoint 20 here"] set bp_location21 [gdb_get_line_number "set breakpoint 21 here"] -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/waitpid-reverse.exp b/gdb/testsuite/gdb.reverse/waitpid-reverse.exp index 39d7771fa1a..12de810dfe1 100644 --- a/gdb/testsuite/gdb.reverse/waitpid-reverse.exp +++ b/gdb/testsuite/gdb.reverse/waitpid-reverse.exp @@ -31,7 +31,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/watch-precsave.exp b/gdb/testsuite/gdb.reverse/watch-precsave.exp index de85c07b40a..30c5f26f62a 100644 --- a/gdb/testsuite/gdb.reverse/watch-precsave.exp +++ b/gdb/testsuite/gdb.reverse/watch-precsave.exp @@ -29,7 +29,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.reverse/watch-reverse.exp b/gdb/testsuite/gdb.reverse/watch-reverse.exp index 703131155f7..433bf28f688 100644 --- a/gdb/testsuite/gdb.reverse/watch-reverse.exp +++ b/gdb/testsuite/gdb.reverse/watch-reverse.exp @@ -28,7 +28,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -runto main +runto_main if [supports_process_record] { # Activate process record/replay diff --git a/gdb/testsuite/gdb.threads/kill.exp b/gdb/testsuite/gdb.threads/kill.exp index 4acb1467935..2fe4fce0a20 100644 --- a/gdb/testsuite/gdb.threads/kill.exp +++ b/gdb/testsuite/gdb.threads/kill.exp @@ -38,7 +38,7 @@ proc test {threaded} { return -1 } - if { ![runto main] } then { + if { ![runto_main] } then { fail "run to main" return } diff --git a/gdb/testsuite/gdb.threads/tid-reuse.exp b/gdb/testsuite/gdb.threads/tid-reuse.exp index 9f42fdddf8d..756a3dc2d98 100644 --- a/gdb/testsuite/gdb.threads/tid-reuse.exp +++ b/gdb/testsuite/gdb.threads/tid-reuse.exp @@ -24,7 +24,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile { debug pthreads clean_restart ${binfile} -if ![runto main] { +if ![runto_main] { fail "can't run to main" return -1 } -- 2.30.2