diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2021-09-30 11:52:21 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2021-09-30 15:27:39 -0400 |
| commit | 4dfef5be6812dd7abfbc8f18e9c0384f2522b511 (patch) | |
| tree | 90aa986d915c17f2320655298e2799d3a2cd1841 /gdb/testsuite/gdb.base | |
| parent | 2fed9db40b1179f62c6fb0f2cacfb0db6b50af46 (diff) | |
| download | binutils-gdb-4dfef5be6812dd7abfbc8f18e9c0384f2522b511.tar.gz | |
gdb/testsuite: make runto_main not pass no-message to runto
As follow-up to this discussion:
https://sourceware.org/pipermail/gdb-patches/2020-August/171385.html
... make runto_main not pass no-message to runto. This means that if we
fail to run to main, for some reason, we'll emit a FAIL. This is the
behavior we want the majority of (if not all) the time.
Without this, we rely on tests logging a failure if runto_main fails,
otherwise. They do so in a very inconsisteny mannet, sometimes using
"fail", "unsupported" or "untested". The messages also vary widly.
This patch removes all these messages as well.
Also, remove a few "fail" where we call runto (and not runto_main). by
default (without an explicit no-message argument), runto prints a
failure already. In two places, gdb.multi/multi-re-run.exp and
gdb.python/py-pp-registration.exp, remove "message" passed to runto.
This removes a few PASSes that we don't care about (but FAILs will still
be printed if we fail to run to where we want to). This aligns their
behavior with the rest of the testsuite.
Change-Id: Ib763c98c5f4fb6898886b635210d7c34bd4b9023
Diffstat (limited to 'gdb/testsuite/gdb.base')
230 files changed, 66 insertions, 299 deletions
diff --git a/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp b/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp index 60b6666fd6e..6190c07626e 100644 --- a/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp +++ b/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp @@ -34,7 +34,6 @@ proc_with_prefix until_advance_lineno_from_inlined {cmd} { global lineno if ![runto test] { - fail "can't run to test" return } @@ -55,7 +54,6 @@ proc_with_prefix until_advance_lineno_from_non_inlined {cmd} { global lineno if ![runto test] { - fail "can't run to test" return } @@ -71,7 +69,6 @@ proc_with_prefix until_advance_inline_func {cmd} { global lineno if ![runto test] { - fail "can't run to test" return } @@ -87,7 +84,6 @@ proc_with_prefix advance_overload {} { global lineno if ![runto test] { - fail "can't run to test" return } @@ -122,7 +118,6 @@ proc_with_prefix until_overload {} { global lineno if ![runto test] { - fail "can't run to test" return } diff --git a/gdb/testsuite/gdb.base/advance.exp b/gdb/testsuite/gdb.base/advance.exp index ad5d4c0fbc3..2486bb296d1 100644 --- a/gdb/testsuite/gdb.base/advance.exp +++ b/gdb/testsuite/gdb.base/advance.exp @@ -22,7 +22,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/annota-input-while-running.exp b/gdb/testsuite/gdb.base/annota-input-while-running.exp index 389cb644517..4a49f9d0b19 100644 --- a/gdb/testsuite/gdb.base/annota-input-while-running.exp +++ b/gdb/testsuite/gdb.base/annota-input-while-running.exp @@ -25,7 +25,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug] == -1} { # Because runto_main doesn't know how to handle the prompt with annotations, # run to main before we set the annotation level. if ![runto_main] then { - fail "can't run to main" return 1 } diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp index 3689f49fa1b..13c9a48bba8 100644 --- a/gdb/testsuite/gdb.base/annota1.exp +++ b/gdb/testsuite/gdb.base/annota1.exp @@ -463,7 +463,6 @@ proc thread_test {} { gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} if { ![runto_main] } then { - fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/annotate-symlink.exp b/gdb/testsuite/gdb.base/annotate-symlink.exp index d02736d117c..2aaac0a9c96 100644 --- a/gdb/testsuite/gdb.base/annotate-symlink.exp +++ b/gdb/testsuite/gdb.base/annotate-symlink.exp @@ -39,7 +39,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcfilelink}" "${binfile}" \ clean_restart ${testfile} if {![runto_main]} { - unsupported "failed to run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/anon.exp b/gdb/testsuite/gdb.base/anon.exp index a271d286b56..f99e9b8dca4 100644 --- a/gdb/testsuite/gdb.base/anon.exp +++ b/gdb/testsuite/gdb.base/anon.exp @@ -21,7 +21,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] } { } if { ![runto_main] } then { - fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/argv0-symlink.exp b/gdb/testsuite/gdb.base/argv0-symlink.exp index f55d9861603..ff928efaefa 100644 --- a/gdb/testsuite/gdb.base/argv0-symlink.exp +++ b/gdb/testsuite/gdb.base/argv0-symlink.exp @@ -54,7 +54,6 @@ with_test_prefix "file symlink" { clean_restart "$filelink" if ![runto_main] { - untested "could not run to main" return -1 } @@ -95,7 +94,6 @@ with_test_prefix "dir symlink" { clean_restart "$dirlink/$filelink" if ![runto_main] { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/asmlabel.exp b/gdb/testsuite/gdb.base/asmlabel.exp index 80e2ed868a9..67ed4bef70f 100644 --- a/gdb/testsuite/gdb.base/asmlabel.exp +++ b/gdb/testsuite/gdb.base/asmlabel.exp @@ -38,7 +38,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/attach-wait-input.exp b/gdb/testsuite/gdb.base/attach-wait-input.exp index f190af1811a..abc42bfcef9 100644 --- a/gdb/testsuite/gdb.base/attach-wait-input.exp +++ b/gdb/testsuite/gdb.base/attach-wait-input.exp @@ -48,7 +48,6 @@ proc start_program {binfile} { clean_restart $binfile if ![runto setup_done] then { - fail "can't run to setup_done" return 0 } diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp index d6c59227559..56b87474a2f 100644 --- a/gdb/testsuite/gdb.base/attach.exp +++ b/gdb/testsuite/gdb.base/attach.exp @@ -493,7 +493,6 @@ proc_with_prefix test_command_line_attach_run {} { clean_restart $binfile if { ![runto_main] } { - fail "could not run to main" return } diff --git a/gdb/testsuite/gdb.base/auto-connect-native-target.exp b/gdb/testsuite/gdb.base/auto-connect-native-target.exp index 10cddc042c5..4f009b1b702 100644 --- a/gdb/testsuite/gdb.base/auto-connect-native-target.exp +++ b/gdb/testsuite/gdb.base/auto-connect-native-target.exp @@ -69,7 +69,6 @@ if { $topmost != "exec" } { # Check which target this board connects to. If testing with a native # target board, this should cause the native target to auto connect. if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp index d5e8c06fb52..bbd2f641c1d 100644 --- a/gdb/testsuite/gdb.base/auxv.exp +++ b/gdb/testsuite/gdb.base/auxv.exp @@ -57,7 +57,6 @@ if {$core_works} { } if ![runto_main] then { - fail "can't run to main" return 0 } set print_core_line [gdb_get_line_number "ABORT;"] diff --git a/gdb/testsuite/gdb.base/backtrace.exp b/gdb/testsuite/gdb.base/backtrace.exp index 2c063c21e65..4f574f4da0d 100644 --- a/gdb/testsuite/gdb.base/backtrace.exp +++ b/gdb/testsuite/gdb.base/backtrace.exp @@ -22,7 +22,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/bigcore.exp b/gdb/testsuite/gdb.base/bigcore.exp index bac72f07484..1ee8a6ed4a1 100644 --- a/gdb/testsuite/gdb.base/bigcore.exp +++ b/gdb/testsuite/gdb.base/bigcore.exp @@ -59,7 +59,6 @@ if {![is_remote host]} { } if ![runto_main] then { - fail "can't run to main" return 0 } set print_core_line [gdb_get_line_number "Dump core"] diff --git a/gdb/testsuite/gdb.base/break-idempotent.exp b/gdb/testsuite/gdb.base/break-idempotent.exp index 2b55130e3e8..08434f6e593 100644 --- a/gdb/testsuite/gdb.base/break-idempotent.exp +++ b/gdb/testsuite/gdb.base/break-idempotent.exp @@ -110,7 +110,6 @@ proc test_break { always_inserted break_command } { delete_breakpoints if ![runto_main] then { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp b/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp index 94ba1e3297a..9626a9db449 100644 --- a/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp +++ b/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp @@ -56,7 +56,6 @@ proc test_remove_bp { initial_load } { set GDBFLAGS $saved_gdbflags if ![runto start] { - fail "can't run to start" return } diff --git a/gdb/testsuite/gdb.base/break-unload-file.exp b/gdb/testsuite/gdb.base/break-unload-file.exp index 4948ce35798..2cbd0ac91f7 100644 --- a/gdb/testsuite/gdb.base/break-unload-file.exp +++ b/gdb/testsuite/gdb.base/break-unload-file.exp @@ -60,7 +60,6 @@ proc test_break { initial_load always_inserted break_command } { set GDBFLAGS $saved_gdbflags if ![runto_main] then { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp index c896a488f94..4885a5bd9ef 100644 --- a/gdb/testsuite/gdb.base/break.exp +++ b/gdb/testsuite/gdb.base/break.exp @@ -473,7 +473,9 @@ gdb_test "info break" "Num Type.*Disp Enb Address.*What.*\[\r\n\] # inappropriately. (There are no calls to those system functions # in this test program.) # -if ![runto_main] then { fail "break tests suppressed" } +if ![runto_main] then { + return +} gdb_test "catch fork" "Catchpoint \[0-9\]+ \\(fork\\)" \ "set catch fork, never expected to trigger" @@ -521,7 +523,9 @@ gdb_test "break" \ # Verify that a "silent" breakpoint can be set, and that GDB is indeed # "silent" about its triggering. # -if ![runto_main] then { fail "break tests suppressed" } +if ![runto_main] then { + return +} gdb_test_multiple "break $bp_location1" \ "set to-be-silent break bp_location1" { @@ -637,7 +641,9 @@ gdb_test_multiple "finish" "finish from called function" { # Verify that GDB responds gracefully to a "finish" command with # arguments. # -if ![runto_main] then { fail "break tests suppressed" } +if ![runto_main] then { + return +} send_gdb "finish 123\n" gdb_expect { diff --git a/gdb/testsuite/gdb.base/breakpoint-shadow.exp b/gdb/testsuite/gdb.base/breakpoint-shadow.exp index e36fb3b275b..aa985b51b3a 100644 --- a/gdb/testsuite/gdb.base/breakpoint-shadow.exp +++ b/gdb/testsuite/gdb.base/breakpoint-shadow.exp @@ -21,7 +21,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { # We need to start the inferior to place the breakpoints in the memory at all. if ![runto_main] { - untested start return -1 } diff --git a/gdb/testsuite/gdb.base/bt-on-error-and-warning.exp b/gdb/testsuite/gdb.base/bt-on-error-and-warning.exp index d988cf742b4..a43a951bbd2 100644 --- a/gdb/testsuite/gdb.base/bt-on-error-and-warning.exp +++ b/gdb/testsuite/gdb.base/bt-on-error-and-warning.exp @@ -26,7 +26,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} { # Check we can run to main. If this works this time then we just # assume that it will work later on (when we repeatedly restart GDB). if ![runto_main] then { - untested "run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp b/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp index 8875d00fdb1..b0cde6e23c3 100644 --- a/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp +++ b/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp @@ -35,7 +35,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} { # Check we can run to main. If this works this time then we just # assume that it will work later on (when we repeatedly restart GDB). if ![runto_main] then { - untested $testfile return -1 } diff --git a/gdb/testsuite/gdb.base/bt-selected-frame.exp b/gdb/testsuite/gdb.base/bt-selected-frame.exp index c454f4c9a11..56b888d25ab 100644 --- a/gdb/testsuite/gdb.base/bt-selected-frame.exp +++ b/gdb/testsuite/gdb.base/bt-selected-frame.exp @@ -29,7 +29,6 @@ proc check_selected_frame_after_bt { bt_cmd stack_pattern } { with_test_prefix $bt_cmd { if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp index 931aa9a5103..7218858135c 100644 --- a/gdb/testsuite/gdb.base/call-signal-resume.exp +++ b/gdb/testsuite/gdb.base/call-signal-resume.exp @@ -56,7 +56,6 @@ proc get_dummy_frame_number { } { clean_restart ${binfile} if { ![runto_main] } { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/callexit.exp b/gdb/testsuite/gdb.base/callexit.exp index 6a46a60bba7..c787f414747 100644 --- a/gdb/testsuite/gdb.base/callexit.exp +++ b/gdb/testsuite/gdb.base/callexit.exp @@ -33,7 +33,6 @@ if [target_info exists gdb,cannot_call_functions] { clean_restart ${binfile} if { ![runto_main] } { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/cast-call.exp b/gdb/testsuite/gdb.base/cast-call.exp index 96f84f107fc..444eb9cd338 100644 --- a/gdb/testsuite/gdb.base/cast-call.exp +++ b/gdb/testsuite/gdb.base/cast-call.exp @@ -28,7 +28,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } { } if {![runto_main]} { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/catch-follow-exec.exp b/gdb/testsuite/gdb.base/catch-follow-exec.exp index a477002be1e..fc7482307d8 100644 --- a/gdb/testsuite/gdb.base/catch-follow-exec.exp +++ b/gdb/testsuite/gdb.base/catch-follow-exec.exp @@ -28,7 +28,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } { proc catch_follow_exec { } { if { ![runto_main] } { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/catch-fork-kill.exp b/gdb/testsuite/gdb.base/catch-fork-kill.exp index 1939160c990..05113499f5d 100644 --- a/gdb/testsuite/gdb.base/catch-fork-kill.exp +++ b/gdb/testsuite/gdb.base/catch-fork-kill.exp @@ -58,7 +58,6 @@ proc do_test {fork_kind exit_kind} { clean_restart $testfile if ![runto_main] { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp index 0124dd201cb..1e8937192b7 100644 --- a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp +++ b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp @@ -36,7 +36,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] { - fail "can't run to main to make the tests" return -1 } diff --git a/gdb/testsuite/gdb.base/catch-load.exp b/gdb/testsuite/gdb.base/catch-load.exp index ece46cbc2fc..94d29717958 100644 --- a/gdb/testsuite/gdb.base/catch-load.exp +++ b/gdb/testsuite/gdb.base/catch-load.exp @@ -53,7 +53,6 @@ proc one_catch_load_test {scenario kind match sostop} { gdb_load_shlib $binfile2 if {![runto_main]} { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp b/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp index e527d7859fd..f16cbe5ee75 100644 --- a/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp +++ b/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp @@ -42,7 +42,6 @@ if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile {debug}] } } if ![runto_main] then { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp index d7183d18bcd..811a92b0aea 100644 --- a/gdb/testsuite/gdb.base/catch-syscall.exp +++ b/gdb/testsuite/gdb.base/catch-syscall.exp @@ -27,7 +27,6 @@ if { [prepare_for_testing "failed to prepare" $testfile ${testfile}.c] } { # Check target supports catch syscall or not. if ![runto_main] then { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index c2123ac01c3..6785f9532b1 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -28,7 +28,6 @@ if { [prepare_for_testing "failed to prepare" commands run.c {debug additional_f proc runto_or_return {function} { if { ![runto factorial] } { - fail "cannot run to $function" return -code return } } diff --git a/gdb/testsuite/gdb.base/compare-sections.exp b/gdb/testsuite/gdb.base/compare-sections.exp index e78811429c9..ba683c1f1c2 100644 --- a/gdb/testsuite/gdb.base/compare-sections.exp +++ b/gdb/testsuite/gdb.base/compare-sections.exp @@ -80,7 +80,6 @@ gdb_test_multiple $command $test { # Now get past startup code. if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/complex-parts.exp b/gdb/testsuite/gdb.base/complex-parts.exp index 6385752a2f0..353ae1bf49d 100644 --- a/gdb/testsuite/gdb.base/complex-parts.exp +++ b/gdb/testsuite/gdb.base/complex-parts.exp @@ -20,7 +20,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if { ![runto_main] } then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/cond-eval-mode.exp b/gdb/testsuite/gdb.base/cond-eval-mode.exp index dc8159125e3..2d7b5082253 100644 --- a/gdb/testsuite/gdb.base/cond-eval-mode.exp +++ b/gdb/testsuite/gdb.base/cond-eval-mode.exp @@ -22,7 +22,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/condbreak-bad.exp b/gdb/testsuite/gdb.base/condbreak-bad.exp index 67d9f297518..4bc523dcec3 100644 --- a/gdb/testsuite/gdb.base/condbreak-bad.exp +++ b/gdb/testsuite/gdb.base/condbreak-bad.exp @@ -67,7 +67,6 @@ with_test_prefix "with run" { # deletes the breakpoints. with_test_prefix "with continue 1" { if {![runto_main]} { - fail "could not run to main" return -1 } @@ -88,7 +87,6 @@ with_test_prefix "with continue 1" { # Repeat with a condition that evaluates to false. with_test_prefix "with continue 2" { if {![runto_main]} { - fail "could not run to main" return -1 } @@ -109,7 +107,6 @@ with_test_prefix "with continue 2" { # Repeat with a condition that contains junk at the end. with_test_prefix "with junk" { if {![runto_main]} { - fail "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/condbreak-call-false.exp b/gdb/testsuite/gdb.base/condbreak-call-false.exp index c852e3299fd..cef38100f8a 100644 --- a/gdb/testsuite/gdb.base/condbreak-call-false.exp +++ b/gdb/testsuite/gdb.base/condbreak-call-false.exp @@ -23,7 +23,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/consecutive-step-over.exp b/gdb/testsuite/gdb.base/consecutive-step-over.exp index 3370579064d..3af83d9f59c 100644 --- a/gdb/testsuite/gdb.base/consecutive-step-over.exp +++ b/gdb/testsuite/gdb.base/consecutive-step-over.exp @@ -25,7 +25,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp b/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp index 42ffb4a1df7..65bfe4a0c4e 100644 --- a/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp +++ b/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp @@ -51,7 +51,6 @@ proc do_test {displaced breakpoint_always_inserted} { gdb_test_no_output "set breakpoint always-inserted $breakpoint_always_inserted" if ![runto_main] { - fail "run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/continue-all-already-running.exp b/gdb/testsuite/gdb.base/continue-all-already-running.exp index de84897c766..23cd9920bc7 100644 --- a/gdb/testsuite/gdb.base/continue-all-already-running.exp +++ b/gdb/testsuite/gdb.base/continue-all-already-running.exp @@ -26,7 +26,6 @@ save_vars { GDBFLAGS } { } if ![runto_main] { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/coredump-filter-build-id.exp b/gdb/testsuite/gdb.base/coredump-filter-build-id.exp index a9012b898f3..76a39878c33 100644 --- a/gdb/testsuite/gdb.base/coredump-filter-build-id.exp +++ b/gdb/testsuite/gdb.base/coredump-filter-build-id.exp @@ -38,7 +38,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } { } if { ![runto_main] } { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/coredump-filter.exp b/gdb/testsuite/gdb.base/coredump-filter.exp index 739ff09353b..fc1ee86a3b7 100644 --- a/gdb/testsuite/gdb.base/coredump-filter.exp +++ b/gdb/testsuite/gdb.base/coredump-filter.exp @@ -26,7 +26,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } { } if { ![runto_main] } { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/corefile2.exp b/gdb/testsuite/gdb.base/corefile2.exp index b97493b7753..78b9c42c423 100644 --- a/gdb/testsuite/gdb.base/corefile2.exp +++ b/gdb/testsuite/gdb.base/corefile2.exp @@ -175,7 +175,6 @@ with_test_prefix "renamed binfile" { clean_restart $binfile if ![runto_main] then { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/ctxobj.exp b/gdb/testsuite/gdb.base/ctxobj.exp index 29969cc1dfc..0d1297d2e39 100644 --- a/gdb/testsuite/gdb.base/ctxobj.exp +++ b/gdb/testsuite/gdb.base/ctxobj.exp @@ -59,7 +59,6 @@ gdb_load_shlib $libobj1 gdb_load_shlib $libobj2 if ![runto_main] { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/debug-expr.exp b/gdb/testsuite/gdb.base/debug-expr.exp index 77cf030d906..5669b6dfe0a 100644 --- a/gdb/testsuite/gdb.base/debug-expr.exp +++ b/gdb/testsuite/gdb.base/debug-expr.exp @@ -29,7 +29,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} { } if ![runto_main] { - fail "run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/decl-before-def.exp b/gdb/testsuite/gdb.base/decl-before-def.exp index 7f3601069e4..d907e656e33 100644 --- a/gdb/testsuite/gdb.base/decl-before-def.exp +++ b/gdb/testsuite/gdb.base/decl-before-def.exp @@ -26,7 +26,6 @@ gdb_test "maint expand-symtabs" gdb_test "p a" { = \{1, 2\}} if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/define.exp b/gdb/testsuite/gdb.base/define.exp index ff34e7f2943..0d69d52f773 100644 --- a/gdb/testsuite/gdb.base/define.exp +++ b/gdb/testsuite/gdb.base/define.exp @@ -30,7 +30,9 @@ if {[prepare_for_testing "failed to prepare" ${testfile} \ set bp_location1 [gdb_get_line_number "set breakpoint 1 here"] set bp_location11 [gdb_get_line_number "set breakpoint 11 here"] -if ![runto_main] then { fail "define tests suppressed" } +if ![runto_main] then { + return +} # Verify that GDB allows a user to define their very own commands. # diff --git a/gdb/testsuite/gdb.base/detach-sysroot-target.exp b/gdb/testsuite/gdb.base/detach-sysroot-target.exp index 9ae1eb6277a..18c579a79b6 100644 --- a/gdb/testsuite/gdb.base/detach-sysroot-target.exp +++ b/gdb/testsuite/gdb.base/detach-sysroot-target.exp @@ -49,7 +49,6 @@ gdb_test_multiple "show sysroot" "" { } if ![runto_main] { - fail "couldn't run to main" return } diff --git a/gdb/testsuite/gdb.base/disabled-location.exp b/gdb/testsuite/gdb.base/disabled-location.exp index 12eb6b58458..e3e0edca4d3 100644 --- a/gdb/testsuite/gdb.base/disabled-location.exp +++ b/gdb/testsuite/gdb.base/disabled-location.exp @@ -20,7 +20,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile}] } { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp index dac036fb2fe..b5e5a062918 100644 --- a/gdb/testsuite/gdb.base/display.exp +++ b/gdb/testsuite/gdb.base/display.exp @@ -52,8 +52,7 @@ if !$use_gdb_stub { # Ok, on to real life # if ![runto_main] then { - fail "could not run to main - other tests will fail." - continue + return } # Disable hardware watchpoints if necessary. diff --git a/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp b/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp index 58a5560cc5c..61a11bb765a 100644 --- a/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp +++ b/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp @@ -31,7 +31,6 @@ proc test { style } { clean_restart $binfile if ![runto_main] { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/dprintf-detach.exp b/gdb/testsuite/gdb.base/dprintf-detach.exp index aa06a5bee52..ea4e23a08c5 100644 --- a/gdb/testsuite/gdb.base/dprintf-detach.exp +++ b/gdb/testsuite/gdb.base/dprintf-detach.exp @@ -46,7 +46,6 @@ proc dprintf_detach_test { breakpoint_always_inserted dprintf_style disconnected gdb_test_no_output "set disconnected-dprintf ${disconnected_dprintf}" if ![runto_main] { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/dprintf-next.exp b/gdb/testsuite/gdb.base/dprintf-next.exp index 67588f8e448..5862843c2ef 100644 --- a/gdb/testsuite/gdb.base/dprintf-next.exp +++ b/gdb/testsuite/gdb.base/dprintf-next.exp @@ -25,7 +25,6 @@ if [prepare_for_testing "failed to prepare for dprintf with next" \ } if ![runto_main] { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/dprintf-non-stop.exp b/gdb/testsuite/gdb.base/dprintf-non-stop.exp index 7133490986f..2e767990094 100644 --- a/gdb/testsuite/gdb.base/dprintf-non-stop.exp +++ b/gdb/testsuite/gdb.base/dprintf-non-stop.exp @@ -27,7 +27,6 @@ save_vars { GDBFLAGS } { } if ![runto_main] { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/dtrace-probe.exp b/gdb/testsuite/gdb.base/dtrace-probe.exp index febcf0371d4..c6b58ba2cb0 100644 --- a/gdb/testsuite/gdb.base/dtrace-probe.exp +++ b/gdb/testsuite/gdb.base/dtrace-probe.exp @@ -63,12 +63,8 @@ proc dtrace_test {} { # Since test:progress-counter is disabled we can run to the second # instance of the test:two-locations probe. - if {![runto "-probe-dtrace test:two-locations"]} { - fail "run to the first test:two-locations probe point" - } - if {![runto "-probe-dtrace test:two-locations"]} { - fail "run to the second test:two-locations probe point" - } + runto "-probe-dtrace test:two-locations"] + runto "-probe-dtrace test:two-locations"] # Go back to the breakpoint on main() and enable the # test:progress-counter probe. Set a breakpoint on it and see diff --git a/gdb/testsuite/gdb.base/duplicate-bp.exp b/gdb/testsuite/gdb.base/duplicate-bp.exp index 5516925b8b4..b5e69054196 100644 --- a/gdb/testsuite/gdb.base/duplicate-bp.exp +++ b/gdb/testsuite/gdb.base/duplicate-bp.exp @@ -27,7 +27,6 @@ proc test_setup { count } { clean_restart ${binfile} if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/ena-dis-br.exp b/gdb/testsuite/gdb.base/ena-dis-br.exp index 964b1523b5c..a4adc8f7479 100644 --- a/gdb/testsuite/gdb.base/ena-dis-br.exp +++ b/gdb/testsuite/gdb.base/ena-dis-br.exp @@ -34,7 +34,9 @@ set bp_location14 [gdb_get_line_number "set breakpoint 14 here" $srcfile2] set bp_location15 [gdb_get_line_number "set breakpoint 15 here" $srcfile2] set bp_location17 [gdb_get_line_number "set breakpoint 17 here" $srcfile2] -if ![runto_main] then { fail "enable/disable break tests suppressed" } +if ![runto_main] then { + return +} # Verify that we can set a breakpoint (the location is irrelevant), # then enable it (yes, it's already enabled by default), then hit it. @@ -115,7 +117,7 @@ gdb_continue_to_end "no stop at auto-disabled break marker2" # Verify that we can set a breakpoint to be self-deleting after the # first time it triggers. if ![runto_main] then { - fail "enable/disable break tests suppressed" + return } set bp [break_at "marker3" " line $bp_location17"] @@ -146,7 +148,7 @@ gdb_test "info break $bp" \ "info break marker4" if ![runto_main] then { - fail "enable/disable break tests suppressed" + return } # Test enable count by stopping at a location until it is disabled @@ -185,7 +187,7 @@ gdb_test "continue" \ # a flavor of enablement/disablement, after all.) if ![runto_main] then { - fail "enable/disable break tests suppressed" + return } with_test_prefix "ignore count" { @@ -246,7 +248,7 @@ gdb_test_multiple "continue" "$test" { # Verify that we can specify both an ignore count and an auto-delete. if ![runto_main] then { - fail "enable/disable break tests suppressed" + return } with_test_prefix "ignore count and auto-delete" { @@ -278,7 +280,7 @@ gdb_test "continue" \ # the bp is encountered. if ![runto_main] then { - fail "enable/disable break tests suppressed" + return } with_test_prefix "disabled breakpoint ignore count" { @@ -306,7 +308,9 @@ gdb_test "info break $bp" \ # (Also verify that GDB gracefully handles the case where the inferior # isn't stopped at a breakpoint.) # -if ![runto_main] then { fail "enable/disable break tests suppressed" } +if ![runto_main] then { + return +} gdb_test "break $bp_location1" \ "Breakpoint \[0-9\]*.*, line $bp_location1.*" \ @@ -332,7 +336,9 @@ gdb_test_multiple "continue 2" "$test" { # Verify that GDB correctly handles the "enable/disable" command # with arguments, that include multiple locations. # -if ![runto_main] then { fail "enable/disable break tests suppressed" } +if ![runto_main] then { + return +} set b1 0 set b2 0 diff --git a/gdb/testsuite/gdb.base/endianity.exp b/gdb/testsuite/gdb.base/endianity.exp index 3489e340ed8..f6ab0befec7 100644 --- a/gdb/testsuite/gdb.base/endianity.exp +++ b/gdb/testsuite/gdb.base/endianity.exp @@ -26,7 +26,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ set bp_location [gdb_get_line_number "START"] if ![runto "endianity.c:$bp_location" ] then { - fail "couldn't run to start" return -1 } diff --git a/gdb/testsuite/gdb.base/examine-backward.exp b/gdb/testsuite/gdb.base/examine-backward.exp index b74e987020f..d4ad4a67ad1 100644 --- a/gdb/testsuite/gdb.base/examine-backward.exp +++ b/gdb/testsuite/gdb.base/examine-backward.exp @@ -23,7 +23,6 @@ if { [prepare_for_testing "failed to prepare for examine-backward" \ } if ![runto_main] { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp b/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp index cd53e385cc0..87de524534f 100644 --- a/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp +++ b/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp @@ -47,7 +47,6 @@ proc do_exec_sysroot_test {} { # Start the program running, and stop at main. # if ![runto_main] then { - fail "couldn't run ${testfile}" return } diff --git a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp index f9cd7e861c4..429d8912e16 100644 --- a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp +++ b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp @@ -55,7 +55,6 @@ if { [gdb_compile $objfile $exec1 executable $opts1_ld] != "" } { clean_restart ${exec1} if ![runto_main] then { - fail "couldn't run to main" return -1 } @@ -70,7 +69,6 @@ gdb_test_multiple "p/x &main" $test { clean_restart ${exec2} if ![runto_main] then { - fail "couldn't run to main" return -1 } @@ -103,7 +101,6 @@ proc test { always_inserted } { gdb_test_no_output "set breakpoint always-inserted $always_inserted" if ![runto_main] then { - fail "couldn't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/execution-termios.exp b/gdb/testsuite/gdb.base/execution-termios.exp index 5dc76fba619..7a9dcea58d5 100644 --- a/gdb/testsuite/gdb.base/execution-termios.exp +++ b/gdb/testsuite/gdb.base/execution-termios.exp @@ -25,7 +25,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { proc test { prefix body } { with_test_prefix $prefix { if ![runto_main] { - fail "can't run to main" return 0 } uplevel 1 $body diff --git a/gdb/testsuite/gdb.base/finish-pretty.exp b/gdb/testsuite/gdb.base/finish-pretty.exp index b2a40cec0ff..f480bfb7e9f 100644 --- a/gdb/testsuite/gdb.base/finish-pretty.exp +++ b/gdb/testsuite/gdb.base/finish-pretty.exp @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { proc finish_pretty { } { if ![runto foo] { - fail "can't run to foo" return } gdb_test_no_output "set print pretty" \ diff --git a/gdb/testsuite/gdb.base/finish.exp b/gdb/testsuite/gdb.base/finish.exp index 03baa869eca..3a9af1bb15e 100644 --- a/gdb/testsuite/gdb.base/finish.exp +++ b/gdb/testsuite/gdb.base/finish.exp @@ -77,7 +77,6 @@ proc finish_void { } { proc finish_abbreviation { abbrev } { if { ! [ runto "int_func" ] } then { - fail "running to int_func" return -1 } @@ -91,7 +90,6 @@ proc finish_no_print {} { global decimal if {![runto "int_func"]} { - untested "couldn't run to main" return } gdb_test_no_output "set print finish off" @@ -105,7 +103,6 @@ proc finish_tests { } { global gdb_prompt skip_float_test if { ! [ runto_main ] } then { - untested "couldn't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/fixsection.exp b/gdb/testsuite/gdb.base/fixsection.exp index 7a9f39dc873..934e473aa2c 100644 --- a/gdb/testsuite/gdb.base/fixsection.exp +++ b/gdb/testsuite/gdb.base/fixsection.exp @@ -47,7 +47,6 @@ gdb_load ${binfile} gdb_load_shlib ${lib_sl} if ![runto_main] then { - fail "can't run to main" return 1 } diff --git a/gdb/testsuite/gdb.base/foll-exec-mode.exp b/gdb/testsuite/gdb.base/foll-exec-mode.exp index 9087c8baf2c..7b7ce3acb15 100644 --- a/gdb/testsuite/gdb.base/foll-exec-mode.exp +++ b/gdb/testsuite/gdb.base/foll-exec-mode.exp @@ -69,7 +69,6 @@ proc do_catch_exec_test { } { # Start the program running, and stop at main. # if ![runto_main] then { - fail "couldn't run ${testfile}" return } @@ -109,7 +108,6 @@ proc do_follow_exec_mode_tests { mode cmd infswitch } { # Start the program running, and stop at main. # if ![runto_main] then { - fail "couldn't run ${testfile}" return } diff --git a/gdb/testsuite/gdb.base/foll-exec.exp b/gdb/testsuite/gdb.base/foll-exec.exp index 6d5e21f54de..26c81780cf7 100644 --- a/gdb/testsuite/gdb.base/foll-exec.exp +++ b/gdb/testsuite/gdb.base/foll-exec.exp @@ -48,7 +48,6 @@ proc do_exec_tests {} { # Start the program running, and stop at main. # if ![runto_main] then { - fail "couldn't run ${testfile}" return } @@ -75,7 +74,6 @@ proc do_exec_tests {} { # Start the program running, and stop at main. # if ![runto_main] then { - fail "couldn't run ${testfile}" return } @@ -165,7 +163,6 @@ proc do_exec_tests {} { # Start the program running, and stop at main. # if ![runto_main] then { - fail "couldn't run ${testfile} (2nd try)" return } @@ -234,7 +231,6 @@ proc do_exec_tests {} { # Start the program running, and stop at main. # if ![runto_main] then { - fail "couldn't run ${testfile} (3rd try)" return } @@ -302,7 +298,6 @@ proc do_exec_tests {} { # Start the program running, and stop at main. # if ![runto_main] then { - fail "couldn't run ${testfile} (4th try)" return } @@ -364,7 +359,6 @@ proc do_exec_tests {} { # Start the program running, and stop at main. # if ![runto_main] then { - fail "couldn't run ${testfile} (5th try)" return } diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp index d6d32f63121..21993c5f2a5 100644 --- a/gdb/testsuite/gdb.base/foll-fork.exp +++ b/gdb/testsuite/gdb.base/foll-fork.exp @@ -32,7 +32,6 @@ proc setup {} { clean_restart $::testfile if { ![runto_main] } { - fail "could not run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/fork-running-state.exp b/gdb/testsuite/gdb.base/fork-running-state.exp index 2c362b0f029..e7fe5d21ce8 100644 --- a/gdb/testsuite/gdb.base/fork-running-state.exp +++ b/gdb/testsuite/gdb.base/fork-running-state.exp @@ -36,7 +36,6 @@ proc do_test { detach_on_fork follow_fork non_stop schedule_multiple } { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/frame-info-consistent.exp b/gdb/testsuite/gdb.base/frame-info-consistent.exp index 0ff269aefe9..93d804af4fc 100644 --- a/gdb/testsuite/gdb.base/frame-info-consistent.exp +++ b/gdb/testsuite/gdb.base/frame-info-consistent.exp @@ -98,7 +98,6 @@ proc test {dwarf_unwinder} { gdb_test_no_output "maint set dwarf unwinder $dwarf_unwinder" if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/frameapply.exp b/gdb/testsuite/gdb.base/frameapply.exp index 346d2296c5d..9abbd48dbc9 100644 --- a/gdb/testsuite/gdb.base/frameapply.exp +++ b/gdb/testsuite/gdb.base/frameapply.exp @@ -25,7 +25,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile}] } { } if ![runto setup_done] then { - fail "can't run to setup_done" return 0 } diff --git a/gdb/testsuite/gdb.base/func-ptr.exp b/gdb/testsuite/gdb.base/func-ptr.exp index fda359eb704..a84ce1bc8e5 100644 --- a/gdb/testsuite/gdb.base/func-ptr.exp +++ b/gdb/testsuite/gdb.base/func-ptr.exp @@ -22,7 +22,6 @@ if { [prepare_for_testing "failed to prepare" "func-ptr" {func-ptr.c} {debug}] } } if ![runto_main] { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/func-ptrs.exp b/gdb/testsuite/gdb.base/func-ptrs.exp index ff1337f9427..b62a91683e4 100644 --- a/gdb/testsuite/gdb.base/func-ptrs.exp +++ b/gdb/testsuite/gdb.base/func-ptrs.exp @@ -20,7 +20,6 @@ if { [prepare_for_testing "failed to prepare" ${testname} ${srcfile}] } { } if { ![runto_main] } { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp b/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp index ca0d5e36cca..df9e5f33df0 100644 --- a/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp +++ b/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp @@ -35,7 +35,6 @@ gdb_test_no_output "set args ${pattern}" \ "set buffer exceeding arguments" if { ! [ runto_main ] } then { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/gcore-relro-pie.exp b/gdb/testsuite/gdb.base/gcore-relro-pie.exp index 6c2bfc37d85..da657ac72af 100644 --- a/gdb/testsuite/gdb.base/gcore-relro-pie.exp +++ b/gdb/testsuite/gdb.base/gcore-relro-pie.exp @@ -42,7 +42,6 @@ clean_restart ${stripped_binfile} # The binary is stripped of debug info, but not minsyms. if ![runto break_here] { - fail "can't run to break_here" return -1 } diff --git a/gdb/testsuite/gdb.base/gcore-tls-pie.exp b/gdb/testsuite/gdb.base/gcore-tls-pie.exp index bb635cb1045..df93d88a161 100644 --- a/gdb/testsuite/gdb.base/gcore-tls-pie.exp +++ b/gdb/testsuite/gdb.base/gcore-tls-pie.exp @@ -46,7 +46,6 @@ clean_restart ${stripped_binfile} # The binary is stripped of debug info, but not minsyms. if ![runto break_here] { - fail "can't run to break_here" return -1 } diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp index 22b46cef878..42a1bae89a4 100644 --- a/gdb/testsuite/gdb.base/gcore.exp +++ b/gdb/testsuite/gdb.base/gcore.exp @@ -24,7 +24,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if { ! [ runto_main ] } then { - untested "couldn't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/gdb1090.exp b/gdb/testsuite/gdb.base/gdb1090.exp index 2bc2293e9d1..ae3805fef88 100644 --- a/gdb/testsuite/gdb.base/gdb1090.exp +++ b/gdb/testsuite/gdb.base/gdb1090.exp @@ -29,7 +29,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "can't run to main" return 1 } diff --git a/gdb/testsuite/gdb.base/gdb11530.exp b/gdb/testsuite/gdb.base/gdb11530.exp index bf125d77954..19743783b82 100644 --- a/gdb/testsuite/gdb.base/gdb11530.exp +++ b/gdb/testsuite/gdb.base/gdb11530.exp @@ -37,7 +37,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $testfile.c {debug}] } { 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 31b9be70e23..35b5f9e439b 100644 --- a/gdb/testsuite/gdb.base/gdb11531.exp +++ b/gdb/testsuite/gdb.base/gdb11531.exp @@ -32,7 +32,6 @@ if [target_info exists gdb,no_hardware_watchpoints] { } if { ![runto_main] } then { - fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/gdb1555.exp b/gdb/testsuite/gdb.base/gdb1555.exp index c6fafe3abb0..21e8fd72138 100644 --- a/gdb/testsuite/gdb.base/gdb1555.exp +++ b/gdb/testsuite/gdb.base/gdb1555.exp @@ -45,7 +45,6 @@ clean_restart ${binfile} gdb_load_shlib $libobj if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/gnu-ifunc.exp b/gdb/testsuite/gdb.base/gnu-ifunc.exp index 4ec529130ce..c822fc3c2fb 100644 --- a/gdb/testsuite/gdb.base/gnu-ifunc.exp +++ b/gdb/testsuite/gdb.base/gnu-ifunc.exp @@ -110,7 +110,6 @@ proc_with_prefix set-break {resolver_attr resolver_debug final_debug} { gdb_load_shlib ${lib_so} if ![runto_main] then { - fail "can't run to main" return 1 } @@ -233,7 +232,6 @@ proc misc_tests {resolver_attr resolver_debug final_debug} { gdb_load_shlib ${lib_so} if ![runto_main] then { - fail "can't run to main" return 1 } diff --git a/gdb/testsuite/gdb.base/gnu_vector.exp b/gdb/testsuite/gdb.base/gnu_vector.exp index 5254a3988c1..83b3ceb50b5 100644 --- a/gdb/testsuite/gdb.base/gnu_vector.exp +++ b/gdb/testsuite/gdb.base/gnu_vector.exp @@ -43,7 +43,6 @@ if { [do_compile {-mcpu=native}] != "" clean_restart ${binfile} if { ![runto_main] } { - fail "runto main" return -1 } diff --git a/gdb/testsuite/gdb.base/gold-gdb-index.exp b/gdb/testsuite/gdb.base/gold-gdb-index.exp index 1af756ac0ec..723cf480246 100644 --- a/gdb/testsuite/gdb.base/gold-gdb-index.exp +++ b/gdb/testsuite/gdb.base/gold-gdb-index.exp @@ -35,7 +35,6 @@ if { [have_index $binfile] != "gdb_index" } { gdb_test_no_output "set auto-solib-add off" if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp b/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp index 9bf4d9931f2..182a649b6ed 100644 --- a/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp +++ b/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp @@ -44,7 +44,6 @@ clean_restart $binfile gdb_load_shlib $lib_so if ![runto_main] then { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/hbreak-unmapped.exp b/gdb/testsuite/gdb.base/hbreak-unmapped.exp index 29be3e1c054..22a4f7254d4 100644 --- a/gdb/testsuite/gdb.base/hbreak-unmapped.exp +++ b/gdb/testsuite/gdb.base/hbreak-unmapped.exp @@ -24,7 +24,6 @@ if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} { } if ![runto_main] { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/hbreak.exp b/gdb/testsuite/gdb.base/hbreak.exp index f152f27f7f8..bc4f51e4879 100644 --- a/gdb/testsuite/gdb.base/hbreak.exp +++ b/gdb/testsuite/gdb.base/hbreak.exp @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${test} ${srcfile}] } { } if ![runto_main] { - untested ${test}.exp return -1 } diff --git a/gdb/testsuite/gdb.base/hbreak2.exp b/gdb/testsuite/gdb.base/hbreak2.exp index cedc151027c..fa339aae038 100644 --- a/gdb/testsuite/gdb.base/hbreak2.exp +++ b/gdb/testsuite/gdb.base/hbreak2.exp @@ -25,7 +25,10 @@ if { [prepare_for_testing "failed to prepare" "hbreak2" {break.c break1.c} {debu set srcfile break.c set srcfile1 break1.c -if ![runto_main] then { fail "break tests suppressed" } +if ![runto_main] then { + return +} + delete_breakpoints # @@ -284,7 +287,9 @@ gdb_test "info break" \ #*********** -if ![runto_main] then { fail "break tests suppressed" } +if ![runto_main] then { + return +} # Verify that GDB responds gracefully when asked to set a breakpoint # on a nonexistent source line. @@ -310,7 +315,9 @@ gdb_test "hbreak" "Hardware assisted breakpoint \[0-9\]*.*" \ # Verify that a "silent" breakpoint can be set, and that GDB is indeed # "silent" about its triggering. # -if ![runto_main] then { fail "break tests suppressed" } +if ![runto_main] then { + return +} gdb_test_multiple "hbreak $bp_location1" \ "set to-be-silent hardware break bp_location1" { @@ -513,7 +520,10 @@ if { [prepare_for_testing "failed to prepare" "hbreak2o2" {break.c break1.c} {de return -1 } -if ![runto_main] then { fail "break tests suppressed" } +if ![runto_main] then { + return +} + delete_breakpoints # diff --git a/gdb/testsuite/gdb.base/hook-stop.exp b/gdb/testsuite/gdb.base/hook-stop.exp index df090f2186b..28abc90adfc 100644 --- a/gdb/testsuite/gdb.base/hook-stop.exp +++ b/gdb/testsuite/gdb.base/hook-stop.exp @@ -40,7 +40,6 @@ proc setup {commands} { clean_restart $binfile if ![runto_main] then { - fail "can't run to main" return -code return } diff --git a/gdb/testsuite/gdb.base/huge.exp b/gdb/testsuite/gdb.base/huge.exp index a93a55acb6b..712ea7a0ee7 100644 --- a/gdb/testsuite/gdb.base/huge.exp +++ b/gdb/testsuite/gdb.base/huge.exp @@ -43,7 +43,6 @@ set prev_timeout $timeout set timeout 30 if { ! [ runto_main ] } then { - untested "couldn't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/hw-sw-break-same-address.exp b/gdb/testsuite/gdb.base/hw-sw-break-same-address.exp index faca5fd2728..dca0bdd76f6 100644 --- a/gdb/testsuite/gdb.base/hw-sw-break-same-address.exp +++ b/gdb/testsuite/gdb.base/hw-sw-break-same-address.exp @@ -29,7 +29,6 @@ if { [prepare_for_testing "failed to prepare" ${test} ${srcfile}] } { } if ![runto_main] { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/infcall-exec.exp b/gdb/testsuite/gdb.base/infcall-exec.exp index b19d31cee6c..9502fd21f77 100644 --- a/gdb/testsuite/gdb.base/infcall-exec.exp +++ b/gdb/testsuite/gdb.base/infcall-exec.exp @@ -35,7 +35,6 @@ if {[gdb_compile $srcdir/$subdir/$srcfile2 $binfile2 executable debug] != ""} { clean_restart $binfile if {![runto_main]} { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/infcall-input.exp b/gdb/testsuite/gdb.base/infcall-input.exp index fec0eb2a4d8..f85a37bb36d 100644 --- a/gdb/testsuite/gdb.base/infcall-input.exp +++ b/gdb/testsuite/gdb.base/infcall-input.exp @@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "couldn't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/infcall-nested-structs.exp.tcl b/gdb/testsuite/gdb.base/infcall-nested-structs.exp.tcl index 0b44340ce03..b267606c563 100644 --- a/gdb/testsuite/gdb.base/infcall-nested-structs.exp.tcl +++ b/gdb/testsuite/gdb.base/infcall-nested-structs.exp.tcl @@ -90,7 +90,6 @@ proc start_nested_structs_test { lang types } { # Advance to main if { ![runto_main] } then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/inferior-args.exp b/gdb/testsuite/gdb.base/inferior-args.exp index 3422995e2cc..0a5346c8aba 100644 --- a/gdb/testsuite/gdb.base/inferior-args.exp +++ b/gdb/testsuite/gdb.base/inferior-args.exp @@ -103,7 +103,6 @@ proc do_test { method } { gdb_test_no_output "set args $inferior_args" if { ![runto_main] } { - fail "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/inferior-noarg.exp b/gdb/testsuite/gdb.base/inferior-noarg.exp index 65d23fe46e8..93af66c3824 100644 --- a/gdb/testsuite/gdb.base/inferior-noarg.exp +++ b/gdb/testsuite/gdb.base/inferior-noarg.exp @@ -26,7 +26,6 @@ if { [prepare_for_testing "failed to prepare" \ gdb_test "inferior" "\[Current inferior is 1 \[<null>\] (.*)\]" "inferior not running" if { ![runto_main] } { - untested "could not run to main" return } diff --git a/gdb/testsuite/gdb.base/info-fun.exp b/gdb/testsuite/gdb.base/info-fun.exp index 39d6b0652f8..e610ec961a0 100644 --- a/gdb/testsuite/gdb.base/info-fun.exp +++ b/gdb/testsuite/gdb.base/info-fun.exp @@ -58,7 +58,6 @@ foreach_with_prefix n_flag { 0 1 } { clean_restart $executable if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/info-locals-unused-static-var.exp b/gdb/testsuite/gdb.base/info-locals-unused-static-var.exp index b703bae405c..d97be0e6794 100644 --- a/gdb/testsuite/gdb.base/info-locals-unused-static-var.exp +++ b/gdb/testsuite/gdb.base/info-locals-unused-static-var.exp @@ -33,7 +33,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/info-macros.exp b/gdb/testsuite/gdb.base/info-macros.exp index f1d912a75cf..57ed037caab 100644 --- a/gdb/testsuite/gdb.base/info-macros.exp +++ b/gdb/testsuite/gdb.base/info-macros.exp @@ -38,7 +38,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $options] } } if ![runto_main] { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/info-os.exp b/gdb/testsuite/gdb.base/info-os.exp index c33b47692b5..4b57efd5885 100644 --- a/gdb/testsuite/gdb.base/info-os.exp +++ b/gdb/testsuite/gdb.base/info-os.exp @@ -33,7 +33,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads } if ![runto_main] then { - fail "cannot run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/info-proc.exp b/gdb/testsuite/gdb.base/info-proc.exp index 9b0266a9b8d..074adbcd6b7 100644 --- a/gdb/testsuite/gdb.base/info-proc.exp +++ b/gdb/testsuite/gdb.base/info-proc.exp @@ -49,7 +49,6 @@ if { ! [use_gdb_stub] } { } if { ! [ runto_main ] } then { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/info-program.exp b/gdb/testsuite/gdb.base/info-program.exp index ae059e3bf7d..bf946498fb5 100644 --- a/gdb/testsuite/gdb.base/info-program.exp +++ b/gdb/testsuite/gdb.base/info-program.exp @@ -20,7 +20,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { } if { ![runto_main] } { - fail "can't run to main" return -1 } @@ -35,7 +34,6 @@ gdb_test "info program" "Program stopped at $hex\.\r\nIt stopped after being ste "info program after next" if { ![runto_main] } then { - fail "can't restart program" return -1 } diff --git a/gdb/testsuite/gdb.base/info-types.exp.tcl b/gdb/testsuite/gdb.base/info-types.exp.tcl index 20b54dad299..42dccf60473 100644 --- a/gdb/testsuite/gdb.base/info-types.exp.tcl +++ b/gdb/testsuite/gdb.base/info-types.exp.tcl @@ -34,7 +34,6 @@ proc run_test { lang } { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/info_qt.exp b/gdb/testsuite/gdb.base/info_qt.exp index c6f242b9d03..8f81cd271fe 100644 --- a/gdb/testsuite/gdb.base/info_qt.exp +++ b/gdb/testsuite/gdb.base/info_qt.exp @@ -28,7 +28,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile}] } { } if ![runto setup_done] then { - fail "can't run to setup_done" return 0 } diff --git a/gdb/testsuite/gdb.base/info_sources.exp b/gdb/testsuite/gdb.base/info_sources.exp index a4f7d1966e6..21752b842f0 100644 --- a/gdb/testsuite/gdb.base/info_sources.exp +++ b/gdb/testsuite/gdb.base/info_sources.exp @@ -57,7 +57,6 @@ proc test_info_sources {args expect_seen_info_sources expect_seen_info_sources_b } if ![runto_main] { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/inline-frame-cycle-unwind.exp b/gdb/testsuite/gdb.base/inline-frame-cycle-unwind.exp index 2801b683a03..df04ea0fe24 100644 --- a/gdb/testsuite/gdb.base/inline-frame-cycle-unwind.exp +++ b/gdb/testsuite/gdb.base/inline-frame-cycle-unwind.exp @@ -59,7 +59,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} { if { [skip_python_tests] } { continue } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/interp.exp b/gdb/testsuite/gdb.base/interp.exp index 6d485b65443..fc95ee113c2 100644 --- a/gdb/testsuite/gdb.base/interp.exp +++ b/gdb/testsuite/gdb.base/interp.exp @@ -85,7 +85,6 @@ gdb_test_multiple $cmd $cmd { } if ![runto_main] then { - fail "run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/interrupt-daemon.exp b/gdb/testsuite/gdb.base/interrupt-daemon.exp index 2270ab0cbc2..0ff859cd576 100644 --- a/gdb/testsuite/gdb.base/interrupt-daemon.exp +++ b/gdb/testsuite/gdb.base/interrupt-daemon.exp @@ -33,7 +33,6 @@ proc do_test {} { gdb_test "set follow-fork-mode child" ".*" if ![runto "daemon_main"] { - fail "can't run to daemon_main function" return } diff --git a/gdb/testsuite/gdb.base/interrupt-noterm.exp b/gdb/testsuite/gdb.base/interrupt-noterm.exp index 5cfc6171dd4..3ba32801257 100644 --- a/gdb/testsuite/gdb.base/interrupt-noterm.exp +++ b/gdb/testsuite/gdb.base/interrupt-noterm.exp @@ -24,7 +24,6 @@ if [prepare_for_testing "failed to prepare for testing" \ gdb_test_no_output "set interactive-mode off" if ![runto_main] { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/jit-elf-fork.exp b/gdb/testsuite/gdb.base/jit-elf-fork.exp index 18eed27d5ac..cfdec5921ad 100644 --- a/gdb/testsuite/gdb.base/jit-elf-fork.exp +++ b/gdb/testsuite/gdb.base/jit-elf-fork.exp @@ -67,7 +67,6 @@ proc do_setup { detach-on-fork follow-fork-mode } { gdb_test_no_output "set follow-fork-mode ${follow-fork-mode}" if { ![runto_main] } { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/jit-elf-so.exp b/gdb/testsuite/gdb.base/jit-elf-so.exp index 2a3b8255bb1..6ee9c0071ec 100644 --- a/gdb/testsuite/gdb.base/jit-elf-so.exp +++ b/gdb/testsuite/gdb.base/jit-elf-so.exp @@ -89,7 +89,6 @@ proc one_jit_test {solib_binfiles_target match_str} { } if { ![runto_main] } { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/jit-elf.exp b/gdb/testsuite/gdb.base/jit-elf.exp index 7e13f6ae9be..62490816f8e 100644 --- a/gdb/testsuite/gdb.base/jit-elf.exp +++ b/gdb/testsuite/gdb.base/jit-elf.exp @@ -96,7 +96,6 @@ proc one_jit_test {jit_solibs_target match_str reattach} { } if { ![runto_main] } { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/jit-reader-exec.exp b/gdb/testsuite/gdb.base/jit-reader-exec.exp index 997f66ecb35..b4965676d3a 100644 --- a/gdb/testsuite/gdb.base/jit-reader-exec.exp +++ b/gdb/testsuite/gdb.base/jit-reader-exec.exp @@ -44,7 +44,6 @@ if {[gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" \ clean_restart $binfile if {![runto_main]} { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/jit-reader-simple.exp b/gdb/testsuite/gdb.base/jit-reader-simple.exp index 2210d75d486..f3d6c2b9cfd 100644 --- a/gdb/testsuite/gdb.base/jit-reader-simple.exp +++ b/gdb/testsuite/gdb.base/jit-reader-simple.exp @@ -181,7 +181,6 @@ with_test_prefix "two JITers" { clean_restart $binfile_dl2 if {![runto_main]} { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/label-without-address.exp b/gdb/testsuite/gdb.base/label-without-address.exp index 0813467d0b4..d4013793dd1 100644 --- a/gdb/testsuite/gdb.base/label-without-address.exp +++ b/gdb/testsuite/gdb.base/label-without-address.exp @@ -20,7 +20,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/label.exp b/gdb/testsuite/gdb.base/label.exp index be2d6c7435e..8b63ef217d5 100644 --- a/gdb/testsuite/gdb.base/label.exp +++ b/gdb/testsuite/gdb.base/label.exp @@ -25,7 +25,6 @@ if { [prepare_for_testing "failed to prepare" $testfile ${srcfile} debug] } { if {![runto_main]} { - fail "label tests suppressed" return -1 } diff --git a/gdb/testsuite/gdb.base/large-frame.exp b/gdb/testsuite/gdb.base/large-frame.exp index a15edee9b2b..1532a9a4bae 100644 --- a/gdb/testsuite/gdb.base/large-frame.exp +++ b/gdb/testsuite/gdb.base/large-frame.exp @@ -36,7 +36,6 @@ proc run_test { opt_level } { } if { ![runto_main] } then { - unsupported "runto main" return } diff --git a/gdb/testsuite/gdb.base/ldbl_e308.exp b/gdb/testsuite/gdb.base/ldbl_e308.exp index ba04be07c45..306e3b5625a 100644 --- a/gdb/testsuite/gdb.base/ldbl_e308.exp +++ b/gdb/testsuite/gdb.base/ldbl_e308.exp @@ -20,7 +20,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { } if ![runto_main] { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/line-symtabs.exp b/gdb/testsuite/gdb.base/line-symtabs.exp index 2c28dff388b..fb7204b3fb3 100644 --- a/gdb/testsuite/gdb.base/line-symtabs.exp +++ b/gdb/testsuite/gdb.base/line-symtabs.exp @@ -21,7 +21,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { } if ![runto_main] { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/list-missing-source.exp b/gdb/testsuite/gdb.base/list-missing-source.exp index a487fb139e4..d6677fc0a5e 100644 --- a/gdb/testsuite/gdb.base/list-missing-source.exp +++ b/gdb/testsuite/gdb.base/list-missing-source.exp @@ -46,7 +46,6 @@ remote_file host delete $srcfile clean_restart ${binfile} if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp index 6844b87084e..bba56adce36 100644 --- a/gdb/testsuite/gdb.base/list.exp +++ b/gdb/testsuite/gdb.base/list.exp @@ -492,7 +492,6 @@ proc test_list {command listsize1 listsize2 linerange1 linerange2} { clean_restart $binfile if ![runto_main] then { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/load-command.exp b/gdb/testsuite/gdb.base/load-command.exp index 944dc39c155..8efaf7771db 100644 --- a/gdb/testsuite/gdb.base/load-command.exp +++ b/gdb/testsuite/gdb.base/load-command.exp @@ -27,7 +27,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] { } if ![runto_main] { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/long-inferior-output.exp b/gdb/testsuite/gdb.base/long-inferior-output.exp index 294786ffff2..6a30f1de7a6 100644 --- a/gdb/testsuite/gdb.base/long-inferior-output.exp +++ b/gdb/testsuite/gdb.base/long-inferior-output.exp @@ -40,7 +40,6 @@ if [prepare_for_testing "failed to prepare" $testfile {} {debug}] { } if { ![runto_main] } then { - fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp index f7fdceb05e0..5c1853a1ac4 100644 --- a/gdb/testsuite/gdb.base/long_long.exp +++ b/gdb/testsuite/gdb.base/long_long.exp @@ -41,7 +41,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [con clean_restart ${binfile} if { ![runto known_types] } then { - fail "run to known_types" return } diff --git a/gdb/testsuite/gdb.base/longjmp.exp b/gdb/testsuite/gdb.base/longjmp.exp index 753bd501e11..8dc6ace9ee7 100644 --- a/gdb/testsuite/gdb.base/longjmp.exp +++ b/gdb/testsuite/gdb.base/longjmp.exp @@ -32,7 +32,6 @@ if [get_compiler_info] { clean_restart ${binfile} if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp index 9d295ad20de..03ee5330872 100644 --- a/gdb/testsuite/gdb.base/macscp.exp +++ b/gdb/testsuite/gdb.base/macscp.exp @@ -341,7 +341,6 @@ proc maybe_kfail { func test_name } { # Start the program running. if {! [runto_main]} { - fail "macro tests suppressed: couldn't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/maint-info-sections.exp b/gdb/testsuite/gdb.base/maint-info-sections.exp index 06508de366d..52deedd31d1 100644 --- a/gdb/testsuite/gdb.base/maint-info-sections.exp +++ b/gdb/testsuite/gdb.base/maint-info-sections.exp @@ -26,7 +26,6 @@ if {[prepare_for_testing "failed to prepare" $testfile \ } if ![runto_main] then { - untested "maint info sections" return -1 } diff --git a/gdb/testsuite/gdb.base/maint-target-async-off.exp b/gdb/testsuite/gdb.base/maint-target-async-off.exp index 6d0c2faa791..d82c2df0d55 100644 --- a/gdb/testsuite/gdb.base/maint-target-async-off.exp +++ b/gdb/testsuite/gdb.base/maint-target-async-off.exp @@ -34,7 +34,6 @@ save_vars { GDBFLAGS } { gdb_test "maintenance show target-async" "Controlling the inferior in asynchronous mode is off\\." if { ![runto_main] } { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/many-completions.exp b/gdb/testsuite/gdb.base/many-completions.exp index 3440f44a4f4..050cf476b79 100644 --- a/gdb/testsuite/gdb.base/many-completions.exp +++ b/gdb/testsuite/gdb.base/many-completions.exp @@ -72,7 +72,6 @@ if {[prepare_for_testing "failed to prepare" "$testfile" $srcfile \ # Start the test. if {![runto_main]} { - fail "couldn't run to main" return } diff --git a/gdb/testsuite/gdb.base/max-depth.exp.tcl b/gdb/testsuite/gdb.base/max-depth.exp.tcl index e6f6792ff42..b63e6b1ad91 100644 --- a/gdb/testsuite/gdb.base/max-depth.exp.tcl +++ b/gdb/testsuite/gdb.base/max-depth.exp.tcl @@ -36,7 +36,6 @@ proc compile_and_run_tests { lang } { # Advance to main. if { ![runto_main] } then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/max-value-size.exp b/gdb/testsuite/gdb.base/max-value-size.exp index a029a8bd7b7..3a39be66b01 100644 --- a/gdb/testsuite/gdb.base/max-value-size.exp +++ b/gdb/testsuite/gdb.base/max-value-size.exp @@ -20,7 +20,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/memtag.exp b/gdb/testsuite/gdb.base/memtag.exp index aa21f7f3654..7938488bd0c 100644 --- a/gdb/testsuite/gdb.base/memtag.exp +++ b/gdb/testsuite/gdb.base/memtag.exp @@ -40,7 +40,6 @@ with_test_prefix "before program execution" { clean_restart $testfile if ![runto_main] { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/msym-bp-shl.exp b/gdb/testsuite/gdb.base/msym-bp-shl.exp index 34a8bd12cf8..cf7091dada1 100644 --- a/gdb/testsuite/gdb.base/msym-bp-shl.exp +++ b/gdb/testsuite/gdb.base/msym-bp-shl.exp @@ -77,7 +77,6 @@ proc test {debug} { } if ![runto_main] { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/msym-bp.exp b/gdb/testsuite/gdb.base/msym-bp.exp index dd5a684f764..ed1563dcb75 100644 --- a/gdb/testsuite/gdb.base/msym-bp.exp +++ b/gdb/testsuite/gdb.base/msym-bp.exp @@ -69,7 +69,6 @@ proc test {debug} { test_break "before run" if ![runto_main] { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/new-ui.exp b/gdb/testsuite/gdb.base/new-ui.exp index 64ad9471c4c..41bc70304d5 100644 --- a/gdb/testsuite/gdb.base/new-ui.exp +++ b/gdb/testsuite/gdb.base/new-ui.exp @@ -82,7 +82,6 @@ proc_with_prefix do_test {} { clean_restart $testfile if ![runto_main] { - untested "could not run to main" return -1 } @@ -186,7 +185,7 @@ proc_with_prefix do_test_invalid_args {} { # Test that we can continue working normally. if ![runto_main] { - fail "could not run to main" + return } } diff --git a/gdb/testsuite/gdb.base/noreturn-finish.exp b/gdb/testsuite/gdb.base/noreturn-finish.exp index 34db7c02a6a..5e1abe55ad6 100644 --- a/gdb/testsuite/gdb.base/noreturn-finish.exp +++ b/gdb/testsuite/gdb.base/noreturn-finish.exp @@ -23,7 +23,6 @@ proc noreturn_finish_test { } { global gdb_prompt if { ! [ runto_main ] } then { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/noreturn-return.exp b/gdb/testsuite/gdb.base/noreturn-return.exp index 294223988aa..7810d353643 100644 --- a/gdb/testsuite/gdb.base/noreturn-return.exp +++ b/gdb/testsuite/gdb.base/noreturn-return.exp @@ -23,7 +23,6 @@ proc noreturn_test { } { global gdb_prompt if { ! [ runto_main ] } then { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/options.exp b/gdb/testsuite/gdb.base/options.exp index 6b48a0f4a4b..94372aa9fc7 100644 --- a/gdb/testsuite/gdb.base/options.exp +++ b/gdb/testsuite/gdb.base/options.exp @@ -183,7 +183,6 @@ proc_with_prefix test-print {{prefix ""}} { clean_restart $binfile if ![runto_main] { - fail "cannot run to main" return } @@ -296,7 +295,6 @@ proc_with_prefix test-backtrace {} { clean_restart $binfile if ![runto_main] { - fail "cannot run to main" return } diff --git a/gdb/testsuite/gdb.base/overlays.exp b/gdb/testsuite/gdb.base/overlays.exp index 7f380e2ff48..aeebd4697a6 100644 --- a/gdb/testsuite/gdb.base/overlays.exp +++ b/gdb/testsuite/gdb.base/overlays.exp @@ -55,7 +55,6 @@ gdb_load ${binfile} # if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp b/gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp index eba4066b238..81b36ca12a9 100644 --- a/gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp +++ b/gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp @@ -37,7 +37,6 @@ proc test_ctrlc_while_target_running_does_not_paginate {} { clean_restart $binfile if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/paginate-bg-execution.exp b/gdb/testsuite/gdb.base/paginate-bg-execution.exp index fbecb2b4ea1..cfebafe6b89 100644 --- a/gdb/testsuite/gdb.base/paginate-bg-execution.exp +++ b/gdb/testsuite/gdb.base/paginate-bg-execution.exp @@ -33,7 +33,6 @@ proc test_bg_execution_pagination_return {} { clean_restart $binfile if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/paginate-inferior-exit.exp b/gdb/testsuite/gdb.base/paginate-inferior-exit.exp index 3cf2e34fc6e..577555295d4 100644 --- a/gdb/testsuite/gdb.base/paginate-inferior-exit.exp +++ b/gdb/testsuite/gdb.base/paginate-inferior-exit.exp @@ -32,7 +32,6 @@ proc test_paginate_inferior_exited {} { clean_restart $binfile if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/pie-fork.exp b/gdb/testsuite/gdb.base/pie-fork.exp index 5ab65213003..2bbdaa48be9 100644 --- a/gdb/testsuite/gdb.base/pie-fork.exp +++ b/gdb/testsuite/gdb.base/pie-fork.exp @@ -30,7 +30,6 @@ proc setup_test {detach_on_fork {follow_fork_mode "parent"}} { clean_restart ${binfile} if ![runto_main] { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/pr10179.exp b/gdb/testsuite/gdb.base/pr10179.exp index fdc61997336..b3a996903b0 100644 --- a/gdb/testsuite/gdb.base/pr10179.exp +++ b/gdb/testsuite/gdb.base/pr10179.exp @@ -23,7 +23,6 @@ if {[build_executable ${testname}.exp $testname $sources {debug}] == -1} { clean_restart ${testname} if ![runto_main] { - untested pr10179 return -1 } diff --git a/gdb/testsuite/gdb.base/pr11022.exp b/gdb/testsuite/gdb.base/pr11022.exp index e05b8f2bfe2..8a5c5b06d67 100644 --- a/gdb/testsuite/gdb.base/pr11022.exp +++ b/gdb/testsuite/gdb.base/pr11022.exp @@ -29,7 +29,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb clean_restart ${binfile} if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/pretty-array.exp b/gdb/testsuite/gdb.base/pretty-array.exp index 00f875cf638..4a29a361b32 100644 --- a/gdb/testsuite/gdb.base/pretty-array.exp +++ b/gdb/testsuite/gdb.base/pretty-array.exp @@ -23,7 +23,6 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { } if ![runto_main] { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/pretty-print.exp b/gdb/testsuite/gdb.base/pretty-print.exp index 3dddbe2d379..bb574291893 100644 --- a/gdb/testsuite/gdb.base/pretty-print.exp +++ b/gdb/testsuite/gdb.base/pretty-print.exp @@ -23,7 +23,6 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { } if ![runto_main] { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/print-file-var.exp b/gdb/testsuite/gdb.base/print-file-var.exp index 156fecb9629..054ab23011b 100644 --- a/gdb/testsuite/gdb.base/print-file-var.exp +++ b/gdb/testsuite/gdb.base/print-file-var.exp @@ -82,7 +82,6 @@ proc test {hidden dlopen version_id_main lang} { gdb_load_shlib $libobj2 if ![runto_main] { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp index 8967de3e948..b2f90aaff10 100644 --- a/gdb/testsuite/gdb.base/printcmds.exp +++ b/gdb/testsuite/gdb.base/printcmds.exp @@ -1035,7 +1035,6 @@ gdb_test "p ctable1\[120\]" "120 'x'" "p ctable1\[120\] #1" gdb_load ${binfile} if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/quit-live.exp b/gdb/testsuite/gdb.base/quit-live.exp index 703f0005860..a7e945a2f0f 100644 --- a/gdb/testsuite/gdb.base/quit-live.exp +++ b/gdb/testsuite/gdb.base/quit-live.exp @@ -102,7 +102,6 @@ proc quit_with_live_inferior {appear_how extra_inferior quit_how} { if {$appear_how == "run"} { if ![runto_main] then { - fail "can't run to main" return } } elseif {$appear_how == "attach" || $appear_how == "attach-nofile"} { diff --git a/gdb/testsuite/gdb.base/range-stepping.exp b/gdb/testsuite/gdb.base/range-stepping.exp index c1ba8ef71cb..d1e419c2f79 100644 --- a/gdb/testsuite/gdb.base/range-stepping.exp +++ b/gdb/testsuite/gdb.base/range-stepping.exp @@ -23,7 +23,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] } { } if ![runto_main] { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/recpar.exp b/gdb/testsuite/gdb.base/recpar.exp index cf535378875..107a2506e2c 100644 --- a/gdb/testsuite/gdb.base/recpar.exp +++ b/gdb/testsuite/gdb.base/recpar.exp @@ -20,7 +20,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { } if ![runto_main] { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/reggroups.exp b/gdb/testsuite/gdb.base/reggroups.exp index 87b69dd0330..f106e361ebb 100644 --- a/gdb/testsuite/gdb.base/reggroups.exp +++ b/gdb/testsuite/gdb.base/reggroups.exp @@ -24,7 +24,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/remote.exp b/gdb/testsuite/gdb.base/remote.exp index 8f92ea71fa8..e9bcb8a3a47 100644 --- a/gdb/testsuite/gdb.base/remote.exp +++ b/gdb/testsuite/gdb.base/remote.exp @@ -159,7 +159,6 @@ set sizeof_random_data [get_sizeof "random_data" 48*1024] # Part THREE: Check the upload behavour # if ![runto_main] then { - fail "cannot run to main" return } diff --git a/gdb/testsuite/gdb.base/return2.exp b/gdb/testsuite/gdb.base/return2.exp index 86b14d74799..5f4393b4848 100644 --- a/gdb/testsuite/gdb.base/return2.exp +++ b/gdb/testsuite/gdb.base/return2.exp @@ -82,7 +82,6 @@ proc return2_tests { } { global gdb_prompt skip_float_test if { ! [ runto_main ] } then { - untested "couldn't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/run-attach-while-running.exp b/gdb/testsuite/gdb.base/run-attach-while-running.exp index 1cc754a87ee..581fc484997 100644 --- a/gdb/testsuite/gdb.base/run-attach-while-running.exp +++ b/gdb/testsuite/gdb.base/run-attach-while-running.exp @@ -64,7 +64,6 @@ proc_with_prefix test { non-stop threaded run-or-attach } { } if { ![runto_main] } { - untested "could not run to main" return } diff --git a/gdb/testsuite/gdb.base/save-bp.exp b/gdb/testsuite/gdb.base/save-bp.exp index 20e1243f892..14db3aa6758 100644 --- a/gdb/testsuite/gdb.base/save-bp.exp +++ b/gdb/testsuite/gdb.base/save-bp.exp @@ -20,7 +20,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } { } if ![runto_main] { - untested "could not run to main" return -1 } # Delete all breakpoints so that the "runto_main" breakpoint above @@ -63,7 +62,6 @@ gdb_test "save breakpoint $bps" "" "save breakpoint bps" # Now start a new debugger session... clean_restart $testfile if ![runto_main] { - fail "cannot restart program" return -1 } # Delete all breakpoints so that the "runto_main" breakpoint above diff --git a/gdb/testsuite/gdb.base/savedregs.exp b/gdb/testsuite/gdb.base/savedregs.exp index 4ed9b572a1a..c8325e35fcc 100644 --- a/gdb/testsuite/gdb.base/savedregs.exp +++ b/gdb/testsuite/gdb.base/savedregs.exp @@ -42,7 +42,6 @@ clean_restart ${binfile} # Advance to main if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/sect-cmd.exp b/gdb/testsuite/gdb.base/sect-cmd.exp index 387198d3732..8856747239a 100644 --- a/gdb/testsuite/gdb.base/sect-cmd.exp +++ b/gdb/testsuite/gdb.base/sect-cmd.exp @@ -23,7 +23,6 @@ set srcfile break.c set srcfile1 break1.c if ![runto_main] then { - fail "couldn't run to main" return } diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp index be36cc90cbf..2c8c9b5c68a 100644 --- a/gdb/testsuite/gdb.base/sepdebug.exp +++ b/gdb/testsuite/gdb.base/sepdebug.exp @@ -278,7 +278,9 @@ gdb_test "info break" "Num Type.*Disp Enb Address.*What.*\[\r\n\] # inappropriately. (There are no calls to those system functions # in this test program.) # -if ![runto_main] then { fail "sepdebug tests suppressed" } +if ![runto_main] then { + return +} gdb_test "catch fork" "Catchpoint \[0-9\]+ \\(fork\\)" \ "set catch fork, never expected to trigger" @@ -327,7 +329,9 @@ gdb_test "break" \ # Verify that a "silent" breakpoint can be set, and that GDB is indeed # "silent" about its triggering. # -if ![runto_main] then { fail "sepdebug tests suppressed" } +if ![runto_main] then { + return +} gdb_test_multiple "break $bp_location1" \ "set to-be-silent break bp_location1" { @@ -447,7 +451,9 @@ gdb_test_multiple "finish" "finish from called function" { # Verify that GDB responds gracefully to a "finish" command with # arguments. # -if ![runto_main] then { fail "sepdebug tests suppressed" } +if ![runto_main] then { + return +} gdb_test "finish 123" \ "The \"finish\" command does not take any arguments.*" \ diff --git a/gdb/testsuite/gdb.base/set-cwd.exp b/gdb/testsuite/gdb.base/set-cwd.exp index b3d115ab87f..eb8835b29bb 100644 --- a/gdb/testsuite/gdb.base/set-cwd.exp +++ b/gdb/testsuite/gdb.base/set-cwd.exp @@ -34,7 +34,6 @@ proc_with_prefix test_tilde_expansion { } { gdb_test_no_output "set cwd ~/" "set inferior cwd to ~/ dir" if { ![runto_main] } { - untested "could not run to main" return -1 } @@ -105,7 +104,6 @@ proc_with_prefix test_cd_into_dir { } { gdb_test_no_output "set cwd $tmpdir" "set inferior cwd to temp dir" if { ![runto_main] } { - untested "could not run to main" return -1 } @@ -162,7 +160,6 @@ proc_with_prefix test_cwd_reset { } { with_test_prefix "running with set cwd" { if { ![runto_main] } { - untested "could not run to main" return -1 } } @@ -178,7 +175,6 @@ proc_with_prefix test_cwd_reset { } { with_test_prefix "running without set cwd" { if { ![runto_main] } { - untested "could not run to main" return -1 } } diff --git a/gdb/testsuite/gdb.base/set-noassign.exp b/gdb/testsuite/gdb.base/set-noassign.exp index bc41705a012..87f9c921e44 100644 --- a/gdb/testsuite/gdb.base/set-noassign.exp +++ b/gdb/testsuite/gdb.base/set-noassign.exp @@ -19,7 +19,6 @@ if { [prepare_for_testing "failed to prepare" "set-noassign" start.c {debug nowa } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/setshow.exp b/gdb/testsuite/gdb.base/setshow.exp index 6e09361c9d7..bc9aaa8fab8 100644 --- a/gdb/testsuite/gdb.base/setshow.exp +++ b/gdb/testsuite/gdb.base/setshow.exp @@ -32,7 +32,6 @@ proc_with_prefix test_setshow_annotate {} { clean_restart $::binfile if ![runto_main] then { - fail "can't run to main" return } @@ -82,7 +81,6 @@ proc_with_prefix test_setshow_args {} { clean_restart $::binfile if ![runto_main] then { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/share-psymtabs-bt.exp b/gdb/testsuite/gdb.base/share-psymtabs-bt.exp index 549325dcffc..87e20360cc4 100644 --- a/gdb/testsuite/gdb.base/share-psymtabs-bt.exp +++ b/gdb/testsuite/gdb.base/share-psymtabs-bt.exp @@ -42,7 +42,6 @@ if { [gdb_file_cmd $binfile] != 0 } { gdb_breakpoint "bar" if { ![runto "bar"] } { - fail "failed to run to bar" return -1 } diff --git a/gdb/testsuite/gdb.base/shreloc.exp b/gdb/testsuite/gdb.base/shreloc.exp index 8cc9adb123e..228c0ec5925 100644 --- a/gdb/testsuite/gdb.base/shreloc.exp +++ b/gdb/testsuite/gdb.base/shreloc.exp @@ -77,7 +77,6 @@ gdb_load_shlib $lib2_sl # Load up the shared objects 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 61a1fcc4b1d..f8580743340 100644 --- a/gdb/testsuite/gdb.base/sigaltstack.exp +++ b/gdb/testsuite/gdb.base/sigaltstack.exp @@ -45,7 +45,6 @@ gdb_test "handle SIGPROF print pass nostop" # Advance to main if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp index 1bb0fd998ef..5a14707e436 100644 --- a/gdb/testsuite/gdb.base/sigbpt.exp +++ b/gdb/testsuite/gdb.base/sigbpt.exp @@ -45,7 +45,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { # if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/siginfo-addr.exp b/gdb/testsuite/gdb.base/siginfo-addr.exp index 97742520cdc..7b52a0191ee 100644 --- a/gdb/testsuite/gdb.base/siginfo-addr.exp +++ b/gdb/testsuite/gdb.base/siginfo-addr.exp @@ -35,7 +35,6 @@ gdb_test "display/i \$pc" # Advance to main if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/siginfo-obj.exp b/gdb/testsuite/gdb.base/siginfo-obj.exp index a98013ddc7a..1f7b4e4691d 100644 --- a/gdb/testsuite/gdb.base/siginfo-obj.exp +++ b/gdb/testsuite/gdb.base/siginfo-obj.exp @@ -40,7 +40,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { # Advance to main if ![runto_main] then { - fail "can't run to main" return 0 } @@ -101,7 +100,6 @@ with_test_prefix "validate siginfo fields" { # Advance to main if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/siginfo-thread.exp b/gdb/testsuite/gdb.base/siginfo-thread.exp index 1b43e15dfeb..d809b55888f 100644 --- a/gdb/testsuite/gdb.base/siginfo-thread.exp +++ b/gdb/testsuite/gdb.base/siginfo-thread.exp @@ -37,7 +37,6 @@ clean_restart $binfile # Advance to main if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/siginfo.exp b/gdb/testsuite/gdb.base/siginfo.exp index f6bed9f8344..ae9c7731eb7 100644 --- a/gdb/testsuite/gdb.base/siginfo.exp +++ b/gdb/testsuite/gdb.base/siginfo.exp @@ -39,7 +39,6 @@ gdb_test "display/i \$pc" # Advance to main if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/signals-state-child.exp b/gdb/testsuite/gdb.base/signals-state-child.exp index 0984033811b..ce143b1509a 100644 --- a/gdb/testsuite/gdb.base/signals-state-child.exp +++ b/gdb/testsuite/gdb.base/signals-state-child.exp @@ -80,7 +80,6 @@ remote_close target clean_restart $binfile if { ! [ runto_main ] } then { - untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/signest.exp b/gdb/testsuite/gdb.base/signest.exp index 4042d169af4..cc23388f000 100644 --- a/gdb/testsuite/gdb.base/signest.exp +++ b/gdb/testsuite/gdb.base/signest.exp @@ -27,7 +27,6 @@ if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug}] { } if ![runto_main] then { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/signull.exp b/gdb/testsuite/gdb.base/signull.exp index f5654967173..9d4268ae31f 100644 --- a/gdb/testsuite/gdb.base/signull.exp +++ b/gdb/testsuite/gdb.base/signull.exp @@ -47,7 +47,6 @@ clean_restart ${binfile} # if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/sigrepeat.exp b/gdb/testsuite/gdb.base/sigrepeat.exp index eb11c10dcb3..b0303a869c2 100644 --- a/gdb/testsuite/gdb.base/sigrepeat.exp +++ b/gdb/testsuite/gdb.base/sigrepeat.exp @@ -37,7 +37,6 @@ clean_restart ${binfile} # Advance to main if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/skip-inline.exp b/gdb/testsuite/gdb.base/skip-inline.exp index fb15928a091..3d5fdc0bddd 100644 --- a/gdb/testsuite/gdb.base/skip-inline.exp +++ b/gdb/testsuite/gdb.base/skip-inline.exp @@ -25,7 +25,6 @@ set srcfile skip-inline.c set srcfile1 skip1.c if ![runto_main] { - fail "can't run to main" return } @@ -48,7 +47,6 @@ gdb_test "step" ".*" "step back to main, again" gdb_test "bt" "\\s*\\#0\\s+main.*" "again back to main" if ![runto_main] { - fail "can't run to main" return } @@ -65,7 +63,6 @@ with_test_prefix "double step" { } if ![runto_main] { - fail "can't run to main" return } @@ -78,7 +75,6 @@ with_test_prefix "triple step" { } if ![runto_main] { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/skip-solib.exp b/gdb/testsuite/gdb.base/skip-solib.exp index a66272aeffb..98198157ab3 100644 --- a/gdb/testsuite/gdb.base/skip-solib.exp +++ b/gdb/testsuite/gdb.base/skip-solib.exp @@ -74,7 +74,9 @@ with_test_prefix "ignoring solib file" { "Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s*" \ "1\\s+y\\s+n\\s+${srcfile_lib}\\s+n\\s+<none>\\s*"] - if ![runto_main] { fail "skip tests suppressed" } + if ![runto_main] { + return + } # # We shouldn't step into square(), since we skipped skip-solib-lib.c. @@ -93,7 +95,9 @@ with_test_prefix "ignoring solib function" { "Function multiply will be skipped when stepping\\." \ "skip function" - if ![runto_main] { fail "skip tests suppressed" } + if ![runto_main] { + return + } # # Our first step should take us into square. diff --git a/gdb/testsuite/gdb.base/skip.exp b/gdb/testsuite/gdb.base/skip.exp index 7414103a157..076954fa4bf 100644 --- a/gdb/testsuite/gdb.base/skip.exp +++ b/gdb/testsuite/gdb.base/skip.exp @@ -50,7 +50,6 @@ gdb_test "skip -x" "Invalid skip option: -x" gdb_test "skip -rfu foo.* xyzzy" "Invalid argument: xyzzy" if ![runto_main] { - fail "can't run to main" return } @@ -95,7 +94,6 @@ gdb_test "info skip" \ # right over it and go to the second line of main(). if ![runto_main] { - fail "can't run to main" return } @@ -116,7 +114,6 @@ with_test_prefix "step after deleting 1" { "info skip (delete 1)" if ![runto_main] { - fail "can't run to main" return } @@ -136,7 +133,6 @@ with_test_prefix "step after disabling 3" { "info skip shows entry as disabled" if ![runto_main] { - fail "can't run to main" return } @@ -160,7 +156,6 @@ with_test_prefix "step after enable 3" { "info skip shows entry as enabled" if ![runto_main] { - fail "can't run to main" return } @@ -230,7 +225,6 @@ gdb_test "skip -rfu ^b.z$" "Function\\(s\\) \\^b\\.z\\$ will be skipped when ste with_test_prefix "step using -fi" { if ![runto_main] { - fail "can't run to main" return } @@ -243,7 +237,6 @@ with_test_prefix "step using -fi" { with_test_prefix "step using -gfi" { if ![runto_main] { - fail "can't run to main" return } @@ -256,7 +249,6 @@ with_test_prefix "step using -gfi" { with_test_prefix "step using -fu for baz" { if ![runto_main] { - fail "can't run to main" return } @@ -274,7 +266,6 @@ with_test_prefix "step using -fu for baz" { with_test_prefix "step using -rfu for baz" { if ![runto_main] { - fail "can't run to main" return } @@ -295,8 +286,7 @@ with_test_prefix "step using -rfu for baz" { with_test_prefix "step using -fi + -fu" { gdb_test_no_output "skip delete" - if ![runto test_skip_file_and_function no-message] { - fail "can't run to test_skip_file_and_function" + if ![runto test_skip_file_and_function] { return } @@ -314,7 +304,6 @@ with_test_prefix "skip delete completion" { global binfile clean_restart "${binfile}" if ![runto_main] { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/skipcxx.exp b/gdb/testsuite/gdb.base/skipcxx.exp index 6215f0f084c..eca7651d356 100644 --- a/gdb/testsuite/gdb.base/skipcxx.exp +++ b/gdb/testsuite/gdb.base/skipcxx.exp @@ -20,7 +20,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/so-impl-ld.exp b/gdb/testsuite/gdb.base/so-impl-ld.exp index f7d5adbd145..efe94635b76 100644 --- a/gdb/testsuite/gdb.base/so-impl-ld.exp +++ b/gdb/testsuite/gdb.base/so-impl-ld.exp @@ -44,7 +44,9 @@ gdb_load_shlib $lib_sl # This program implicitly loads SOM shared libraries. # -if ![runto_main] then { fail "implicit solibs tests suppressed" } +if ![runto_main] then { + return +} # Verify that we can step over the first shlib call. # diff --git a/gdb/testsuite/gdb.base/solib-corrupted.exp b/gdb/testsuite/gdb.base/solib-corrupted.exp index 7a32a209688..a8cc172faad 100644 --- a/gdb/testsuite/gdb.base/solib-corrupted.exp +++ b/gdb/testsuite/gdb.base/solib-corrupted.exp @@ -31,7 +31,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { } if ![runto_main] { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/solib-disc.exp b/gdb/testsuite/gdb.base/solib-disc.exp index dfce4c91745..31fcb815e96 100644 --- a/gdb/testsuite/gdb.base/solib-disc.exp +++ b/gdb/testsuite/gdb.base/solib-disc.exp @@ -56,7 +56,6 @@ gdb_load ${binfile} gdb_load_shlib $libobj if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/solib-display.exp b/gdb/testsuite/gdb.base/solib-display.exp index 67b57cbde3c..54de334357f 100644 --- a/gdb/testsuite/gdb.base/solib-display.exp +++ b/gdb/testsuite/gdb.base/solib-display.exp @@ -90,7 +90,6 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" { clean_restart $executable if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/solib-search.exp b/gdb/testsuite/gdb.base/solib-search.exp index a2e3ffe0de6..e004f5a4ad7 100644 --- a/gdb/testsuite/gdb.base/solib-search.exp +++ b/gdb/testsuite/gdb.base/solib-search.exp @@ -85,7 +85,6 @@ if { [gdb_compile $srcdir/$subdir/${srcfile} ${binfile} \ clean_restart $testfile if { ![runto_main] } { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/solib-symbol.exp b/gdb/testsuite/gdb.base/solib-symbol.exp index 90a856236fb..5e6beb106fc 100644 --- a/gdb/testsuite/gdb.base/solib-symbol.exp +++ b/gdb/testsuite/gdb.base/solib-symbol.exp @@ -54,7 +54,6 @@ gdb_test "br foo2" \ delete_breakpoints if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/solib-vanish.exp b/gdb/testsuite/gdb.base/solib-vanish.exp index 846a2aa96d9..f007af39f9d 100644 --- a/gdb/testsuite/gdb.base/solib-vanish.exp +++ b/gdb/testsuite/gdb.base/solib-vanish.exp @@ -86,7 +86,6 @@ if { [gdb_compile_shlib ${srcfile_lib2} ${binfile_lib2} $lib2_flags] != "" clean_restart $testfile if { ![runto_main] } { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/source-dir.exp b/gdb/testsuite/gdb.base/source-dir.exp index eff683199be..cf8f19ab833 100644 --- a/gdb/testsuite/gdb.base/source-dir.exp +++ b/gdb/testsuite/gdb.base/source-dir.exp @@ -123,7 +123,6 @@ proc test_truncated_comp_dir {} { "\r\nSource directories searched: \\\$cdir\[:;\]\\\$cwd" if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/source-execution.exp b/gdb/testsuite/gdb.base/source-execution.exp index c3b9acd428e..42e5233bdc7 100644 --- a/gdb/testsuite/gdb.base/source-execution.exp +++ b/gdb/testsuite/gdb.base/source-execution.exp @@ -24,7 +24,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp b/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp index f902adf260b..c27a7c74813 100644 --- a/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp +++ b/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp @@ -45,7 +45,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp b/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp index ceee2d2c2de..c6ba38cabb3 100644 --- a/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp +++ b/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp @@ -25,7 +25,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/stack-checking.exp b/gdb/testsuite/gdb.base/stack-checking.exp index 04d4296ff56..ca66617009f 100644 --- a/gdb/testsuite/gdb.base/stack-checking.exp +++ b/gdb/testsuite/gdb.base/stack-checking.exp @@ -24,7 +24,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [con clean_restart ${binfile} if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/stack-protector.exp b/gdb/testsuite/gdb.base/stack-protector.exp index 5181ce89383..b7fed3b8ca7 100644 --- a/gdb/testsuite/gdb.base/stack-protector.exp +++ b/gdb/testsuite/gdb.base/stack-protector.exp @@ -45,7 +45,6 @@ proc simple_func_break_test { protection } { } if { ![runto_main] } then { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/step-break.exp b/gdb/testsuite/gdb.base/step-break.exp index 3721d1df09b..10f64f0131c 100644 --- a/gdb/testsuite/gdb.base/step-break.exp +++ b/gdb/testsuite/gdb.base/step-break.exp @@ -22,7 +22,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/step-indirect-call-thunk.exp b/gdb/testsuite/gdb.base/step-indirect-call-thunk.exp index d84a0232265..e919d31cfc3 100644 --- a/gdb/testsuite/gdb.base/step-indirect-call-thunk.exp +++ b/gdb/testsuite/gdb.base/step-indirect-call-thunk.exp @@ -22,7 +22,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile \ } if { ![runto_main] } { - untested "failed to run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/step-line.exp b/gdb/testsuite/gdb.base/step-line.exp index a3b822f14e2..bd753df5e10 100644 --- a/gdb/testsuite/gdb.base/step-line.exp +++ b/gdb/testsuite/gdb.base/step-line.exp @@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/step-over-exit.exp b/gdb/testsuite/gdb.base/step-over-exit.exp index d9a47d36d73..76c7823641f 100644 --- a/gdb/testsuite/gdb.base/step-over-exit.exp +++ b/gdb/testsuite/gdb.base/step-over-exit.exp @@ -36,7 +36,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/step-over-no-symbols.exp b/gdb/testsuite/gdb.base/step-over-no-symbols.exp index 74755b9f2f6..643794ec070 100644 --- a/gdb/testsuite/gdb.base/step-over-no-symbols.exp +++ b/gdb/testsuite/gdb.base/step-over-no-symbols.exp @@ -50,8 +50,6 @@ proc test_step_over { displaced } { clean_restart $binfile if ![runto_main] { - fail "couldn't run to main" - untested "stepping over breakpoint with displaced=$displaced" return -1 } diff --git a/gdb/testsuite/gdb.base/step-over-syscall.exp b/gdb/testsuite/gdb.base/step-over-syscall.exp index 5d4a75f810b..a55ed97102f 100644 --- a/gdb/testsuite/gdb.base/step-over-syscall.exp +++ b/gdb/testsuite/gdb.base/step-over-syscall.exp @@ -116,7 +116,6 @@ proc setup { syscall } { clean_restart $testfile if { ![runto_main] } then { - fail "run to main ($syscall)" return -1 } @@ -388,7 +387,6 @@ step_over_syscall "clone" set testfile "step-over-fork" clean_restart $testfile if { ![runto_main] } then { - fail "run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/step-test.exp b/gdb/testsuite/gdb.base/step-test.exp index 8664b3eda22..0cde9e218bf 100644 --- a/gdb/testsuite/gdb.base/step-test.exp +++ b/gdb/testsuite/gdb.base/step-test.exp @@ -27,7 +27,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debu clean_restart ${binfile} if ![runto_main] then { - fail "can't run to main" return 0 } @@ -143,11 +142,9 @@ gdb_test_multiple "finish" "$test" { -re ".*(Program received|$inferior_exited_re).*$gdb_prompt $" { # Oops... We ran to the end of the program... Better reset if {![runto_main]} then { - fail "$test (Can't run to main)" return 0 } if {![runto step-test.c:45]} { - fail "$test (Can't run to line 45)" return 0 } fail "$test" diff --git a/gdb/testsuite/gdb.base/structs2.exp b/gdb/testsuite/gdb.base/structs2.exp index 9af04dee548..9f2824340f1 100644 --- a/gdb/testsuite/gdb.base/structs2.exp +++ b/gdb/testsuite/gdb.base/structs2.exp @@ -26,7 +26,6 @@ if { [prepare_for_testing "failed to prepare" $binfile $srcfile {debug}] } { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/structs3.exp b/gdb/testsuite/gdb.base/structs3.exp index c141a23f635..f07f86b5011 100644 --- a/gdb/testsuite/gdb.base/structs3.exp +++ b/gdb/testsuite/gdb.base/structs3.exp @@ -22,7 +22,6 @@ if { [prepare_for_testing "failed to prepare" "structs3" "" {debug}] } { } if ![runto_main] { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/style-interp-exec-mi.exp b/gdb/testsuite/gdb.base/style-interp-exec-mi.exp index f92eb893ee4..6fb75cb068a 100644 --- a/gdb/testsuite/gdb.base/style-interp-exec-mi.exp +++ b/gdb/testsuite/gdb.base/style-interp-exec-mi.exp @@ -33,7 +33,6 @@ save_vars { env(TERM) } { } if { ![runto_main] } { - untested "could not run to main" return } diff --git a/gdb/testsuite/gdb.base/style-logging.exp b/gdb/testsuite/gdb.base/style-logging.exp index e5d1a510a66..cd0c99aeba8 100644 --- a/gdb/testsuite/gdb.base/style-logging.exp +++ b/gdb/testsuite/gdb.base/style-logging.exp @@ -37,7 +37,6 @@ save_vars { env(TERM) } { } if {![runto_main]} { - fail "style tests failed" return } diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp index d804853a504..91d3059612d 100644 --- a/gdb/testsuite/gdb.base/style.exp +++ b/gdb/testsuite/gdb.base/style.exp @@ -87,7 +87,6 @@ proc run_style_tests { } { set readnow [readnow] if {![runto_main]} { - fail "style tests failed" return } diff --git a/gdb/testsuite/gdb.base/sym-file.exp b/gdb/testsuite/gdb.base/sym-file.exp index 463645b1e14..fc4c358f8bf 100644 --- a/gdb/testsuite/gdb.base/sym-file.exp +++ b/gdb/testsuite/gdb.base/sym-file.exp @@ -76,7 +76,6 @@ if {[prepare_for_testing "failed to prepare" $binfile "$srcfile $srcfile2" $exe gdb_load_shlib ${lib_so} if ![runto_main] then { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/symbol-alias.exp b/gdb/testsuite/gdb.base/symbol-alias.exp index f221b636269..9b254896e83 100644 --- a/gdb/testsuite/gdb.base/symbol-alias.exp +++ b/gdb/testsuite/gdb.base/symbol-alias.exp @@ -21,7 +21,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} [list $srcfile $srcfil } if ![runto_main] then { - fail "can't run to main" continue } diff --git a/gdb/testsuite/gdb.base/symlink-sourcefile.exp b/gdb/testsuite/gdb.base/symlink-sourcefile.exp index 0540707510d..2003f4145dd 100644 --- a/gdb/testsuite/gdb.base/symlink-sourcefile.exp +++ b/gdb/testsuite/gdb.base/symlink-sourcefile.exp @@ -36,7 +36,6 @@ if {[prepare_for_testing $testfile $testfile $srcfilelink]} { } if {![runto_main]} { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/symtab-search-order.exp b/gdb/testsuite/gdb.base/symtab-search-order.exp index 859f2dacd48..180e6a239c4 100644 --- a/gdb/testsuite/gdb.base/symtab-search-order.exp +++ b/gdb/testsuite/gdb.base/symtab-search-order.exp @@ -43,7 +43,6 @@ clean_restart $binfile gdb_load_shlib $lib1 if ![runto_main] { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/template.exp b/gdb/testsuite/gdb.base/template.exp index 694be12be59..d685333e2c4 100644 --- a/gdb/testsuite/gdb.base/template.exp +++ b/gdb/testsuite/gdb.base/template.exp @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" \ } if { ![runto_main] } { - untested "could not run to main" return } diff --git a/gdb/testsuite/gdb.base/term.exp b/gdb/testsuite/gdb.base/term.exp index 1a83099ca5a..152e6a178d9 100644 --- a/gdb/testsuite/gdb.base/term.exp +++ b/gdb/testsuite/gdb.base/term.exp @@ -26,7 +26,6 @@ gdb_test "info terminal" \ "test info terminal pre-execution" if ![runto break_here] then { - fail "can't run to break_here" return 0 } diff --git a/gdb/testsuite/gdb.base/type-opaque.exp b/gdb/testsuite/gdb.base/type-opaque.exp index 9801542f1a5..ec2dcae8248 100644 --- a/gdb/testsuite/gdb.base/type-opaque.exp +++ b/gdb/testsuite/gdb.base/type-opaque.exp @@ -43,7 +43,6 @@ clean_restart ${binfile} gdb_load_shlib ${libobj} if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/ui-redirect.exp b/gdb/testsuite/gdb.base/ui-redirect.exp index cb0749b80c2..363c563a5a1 100644 --- a/gdb/testsuite/gdb.base/ui-redirect.exp +++ b/gdb/testsuite/gdb.base/ui-redirect.exp @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ui-redirect start.c] } { } if ![runto_main] { - fail "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/until-nodebug.exp b/gdb/testsuite/gdb.base/until-nodebug.exp index fb68ebee93d..0bcc7c3ca62 100644 --- a/gdb/testsuite/gdb.base/until-nodebug.exp +++ b/gdb/testsuite/gdb.base/until-nodebug.exp @@ -23,7 +23,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile nodebug]} { } if ![runto_main] { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/until.exp b/gdb/testsuite/gdb.base/until.exp index 446d71276e1..619d8390217 100644 --- a/gdb/testsuite/gdb.base/until.exp +++ b/gdb/testsuite/gdb.base/until.exp @@ -26,7 +26,6 @@ set bp_location20 [gdb_get_line_number "set breakpoint 20 here"] set bp_location21 [gdb_get_line_number "set breakpoint 21 here"] if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/unwindonsignal.exp b/gdb/testsuite/gdb.base/unwindonsignal.exp index 15d4f181292..ac67c210cb0 100644 --- a/gdb/testsuite/gdb.base/unwindonsignal.exp +++ b/gdb/testsuite/gdb.base/unwindonsignal.exp @@ -33,7 +33,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if { ![runto_main] } { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/utf8-identifiers.exp b/gdb/testsuite/gdb.base/utf8-identifiers.exp index 39d5c9f11b3..c1c07dcd763 100644 --- a/gdb/testsuite/gdb.base/utf8-identifiers.exp +++ b/gdb/testsuite/gdb.base/utf8-identifiers.exp @@ -31,7 +31,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} [list $srcfile]] } { } if ![runto done] { - fail "couldn't run to done" return } diff --git a/gdb/testsuite/gdb.base/vla-optimized-out.exp b/gdb/testsuite/gdb.base/vla-optimized-out.exp index 82c21eb47e1..97a33c35bbf 100644 --- a/gdb/testsuite/gdb.base/vla-optimized-out.exp +++ b/gdb/testsuite/gdb.base/vla-optimized-out.exp @@ -33,7 +33,6 @@ proc vla_optimized_out {exe_suffix options} { } if ![runto f1] { - fail "can't run to f1" return } diff --git a/gdb/testsuite/gdb.base/watch-cond-infcall.exp b/gdb/testsuite/gdb.base/watch-cond-infcall.exp index d250af37ddb..2cd3e2571de 100644 --- a/gdb/testsuite/gdb.base/watch-cond-infcall.exp +++ b/gdb/testsuite/gdb.base/watch-cond-infcall.exp @@ -34,7 +34,6 @@ proc test_watchpoint { hw } { clean_restart ${testfile} if { ![runto_main] } then { - fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/watch-cond.exp b/gdb/testsuite/gdb.base/watch-cond.exp index 4cb88940153..be1d5407dcd 100644 --- a/gdb/testsuite/gdb.base/watch-cond.exp +++ b/gdb/testsuite/gdb.base/watch-cond.exp @@ -29,7 +29,6 @@ if [target_info exists gdb,no_hardware_watchpoints] { } if ![runto_main] then { - fail "can't run to main" return } @@ -49,7 +48,6 @@ if [target_info exists gdb,no_hardware_watchpoints] { } if ![runto_main] then { - fail "can't run to main" return } @@ -69,7 +67,6 @@ if [target_info exists gdb,no_hardware_watchpoints] { } if ![runto_main] then { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/watch-non-mem.exp b/gdb/testsuite/gdb.base/watch-non-mem.exp index d53d7fe1cef..c3b0646a170 100644 --- a/gdb/testsuite/gdb.base/watch-non-mem.exp +++ b/gdb/testsuite/gdb.base/watch-non-mem.exp @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { } if ![runto_main] then { - fail "can't run to main" return } diff --git a/gdb/testsuite/gdb.base/watch-read.exp b/gdb/testsuite/gdb.base/watch-read.exp index 51b45a9a7bc..38a1cd32821 100644 --- a/gdb/testsuite/gdb.base/watch-read.exp +++ b/gdb/testsuite/gdb.base/watch-read.exp @@ -33,7 +33,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { } 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 b051e660663..15a6239d969 100644 --- a/gdb/testsuite/gdb.base/watch-vfork.exp +++ b/gdb/testsuite/gdb.base/watch-vfork.exp @@ -28,7 +28,6 @@ proc test_watchpoint_across_vfork { hw teststr } { clean_restart ${testfile} 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 cbfc9560c2b..e1936b0c46f 100644 --- a/gdb/testsuite/gdb.base/watch_thread_num.exp +++ b/gdb/testsuite/gdb.base/watch_thread_num.exp @@ -42,7 +42,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab clean_restart ${binfile} if { ![runto_main] } then { - fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp b/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp index 33adda7b5f8..879d76212e3 100644 --- a/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp +++ b/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp @@ -31,7 +31,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] { - untested "can't run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp b/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp index b4a56d07088..df03b9e6bab 100644 --- a/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp +++ b/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp @@ -29,7 +29,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { } if ![runto_main] then { - fail "can't run to main" return 0 } 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 fa3db3fcbf6..74a98c5ef6f 100644 --- a/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp +++ b/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp @@ -80,7 +80,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { } if { ![runto_main] } then { - fail "run to main" return } @@ -135,7 +134,6 @@ proc test {always_inserted} { clean_restart $binfile if { ![runto_main] } then { - fail "run to main" return } diff --git a/gdb/testsuite/gdb.base/watchpoint-unaligned.exp b/gdb/testsuite/gdb.base/watchpoint-unaligned.exp index 4a747b9a3fa..af54b74d374 100644 --- a/gdb/testsuite/gdb.base/watchpoint-unaligned.exp +++ b/gdb/testsuite/gdb.base/watchpoint-unaligned.exp @@ -27,7 +27,6 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { } if ![runto_main] { - untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp index e763839a4b3..75ba65dcc79 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/gdb/testsuite/gdb.base/watchpoint.exp @@ -805,7 +805,9 @@ proc test_no_hw_watchpoints {} { # (This proves rather little on kernels that don't support # fast watchpoints, but still...) # - if ![runto_main] then { fail "watch tests suppressed" } + if ![runto_main] then { + return + } gdb_test_no_output "set can-use-hw-watchpoints 0" "disable fast watches" diff --git a/gdb/testsuite/gdb.base/whatis-ptype-typedefs.exp b/gdb/testsuite/gdb.base/whatis-ptype-typedefs.exp index 2fe89fea953..ec6f3a6c6fc 100644 --- a/gdb/testsuite/gdb.base/whatis-ptype-typedefs.exp +++ b/gdb/testsuite/gdb.base/whatis-ptype-typedefs.exp @@ -49,7 +49,6 @@ proc prepare {lang} { } if ![runto_main] then { - fail "can't run to main" return 0 } diff --git a/gdb/testsuite/gdb.base/with.exp b/gdb/testsuite/gdb.base/with.exp index 0d53dbebba3..3a21ab8868a 100644 --- a/gdb/testsuite/gdb.base/with.exp +++ b/gdb/testsuite/gdb.base/with.exp @@ -209,7 +209,6 @@ with_test_prefix "run control" { clean_restart $binfile if ![runto_main] { - fail "cannot run to main" return } |