public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] gdb/testsuite: make runto_main not pass no-message to runto
@ 2021-09-30 15:52 Simon Marchi
  2021-09-30 17:19 ` Tom de Vries
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Simon Marchi @ 2021-09-30 15:52 UTC (permalink / raw)
  To: gdb-patches

From: Simon Marchi <simon.marchi@polymtl.ca>

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
---
 gdb/testsuite/gdb.ada/array_return.exp        |  1 -
 gdb/testsuite/gdb.ada/bp_inlined_func.exp     |  1 -
 gdb/testsuite/gdb.ada/catch_assert_if.exp     |  2 --
 gdb/testsuite/gdb.ada/catch_ex.exp            |  3 ---
 gdb/testsuite/gdb.ada/excep_handle.exp        |  1 -
 gdb/testsuite/gdb.ada/info_auto_lang.exp      |  1 -
 gdb/testsuite/gdb.ada/info_exc.exp            |  1 -
 gdb/testsuite/gdb.ada/mi_catch_assert.exp     |  2 --
 gdb/testsuite/gdb.ada/mi_catch_ex.exp         |  3 ---
 gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp    |  3 ---
 gdb/testsuite/gdb.ada/mi_dyn_arr.exp          |  1 -
 gdb/testsuite/gdb.ada/mi_ex_cond.exp          |  1 -
 gdb/testsuite/gdb.ada/mi_exc_info.exp         |  1 -
 gdb/testsuite/gdb.ada/mi_interface.exp        |  1 -
 gdb/testsuite/gdb.ada/mi_prot.exp             |  1 -
 gdb/testsuite/gdb.ada/mi_ref_changeable.exp   |  1 -
 gdb/testsuite/gdb.ada/mi_string_access.exp    |  1 -
 gdb/testsuite/gdb.ada/mi_task_arg.exp         |  1 -
 gdb/testsuite/gdb.ada/mi_task_info.exp        |  1 -
 gdb/testsuite/gdb.ada/mi_var_access.exp       |  1 -
 gdb/testsuite/gdb.ada/mi_var_array.exp        |  1 -
 gdb/testsuite/gdb.ada/mi_var_union.exp        |  1 -
 gdb/testsuite/gdb.ada/mi_variant.exp          |  1 -
 .../gdb.arch/aarch64-atomic-inst.exp          |  1 -
 .../gdb.arch/aarch64-brk-patterns.exp         |  1 -
 gdb/testsuite/gdb.arch/aarch64-fp.exp         |  1 -
 gdb/testsuite/gdb.arch/aarch64-mte.exp        |  2 --
 gdb/testsuite/gdb.arch/aarch64-pauth.exp      |  1 -
 gdb/testsuite/gdb.arch/aarch64-prologue.exp   |  1 -
 .../gdb.arch/aarch64-sighandler-regs.exp      |  1 -
 .../gdb.arch/aarch64-tagged-pointer.exp       |  1 -
 gdb/testsuite/gdb.arch/alpha-step.exp         |  1 -
 gdb/testsuite/gdb.arch/altivec-abi.exp        |  1 -
 gdb/testsuite/gdb.arch/altivec-regs.exp       |  1 -
 .../gdb.arch/amd64-break-on-asm-line.exp      |  1 -
 gdb/testsuite/gdb.arch/amd64-byte.exp         |  1 -
 .../gdb.arch/amd64-disp-step-avx.exp          |  1 -
 gdb/testsuite/gdb.arch/amd64-disp-step.exp    |  1 -
 gdb/testsuite/gdb.arch/amd64-dword.exp        |  1 -
 gdb/testsuite/gdb.arch/amd64-gs_base.exp      |  1 -
 .../gdb.arch/amd64-init-x87-values.exp        |  3 ---
 .../gdb.arch/amd64-stap-special-operands.exp  |  1 -
 .../gdb.arch/amd64-stap-wrong-subexp.exp      |  1 -
 gdb/testsuite/gdb.arch/amd64-word.exp         |  1 -
 .../gdb.arch/arc-analyze-prologue.exp         |  1 -
 gdb/testsuite/gdb.arch/arc-decode-insn.exp    |  1 -
 gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp   |  1 -
 gdb/testsuite/gdb.arch/arm-disp-step.exp      |  1 -
 gdb/testsuite/gdb.arch/arm-neon.exp           |  1 -
 .../gdb.arch/disp-step-insn-reloc.exp         |  1 -
 gdb/testsuite/gdb.arch/e500-abi.exp           |  1 -
 gdb/testsuite/gdb.arch/e500-regs.exp          |  2 --
 gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp  |  2 --
 gdb/testsuite/gdb.arch/gdb1291.exp            |  1 -
 gdb/testsuite/gdb.arch/gdb1431.exp            |  1 -
 gdb/testsuite/gdb.arch/i386-avx.exp           |  2 --
 gdb/testsuite/gdb.arch/i386-avx512.exp        |  1 -
 gdb/testsuite/gdb.arch/i386-byte.exp          |  1 -
 gdb/testsuite/gdb.arch/i386-disp-step.exp     |  1 -
 gdb/testsuite/gdb.arch/i386-dr3-watch.exp     |  1 -
 gdb/testsuite/gdb.arch/i386-float.exp         |  1 -
 gdb/testsuite/gdb.arch/i386-mpx-call.exp      |  1 -
 gdb/testsuite/gdb.arch/i386-mpx-map.exp       |  1 -
 gdb/testsuite/gdb.arch/i386-mpx-sigsegv.exp   |  1 -
 .../gdb.arch/i386-mpx-simple_segv.exp         |  5 -----
 gdb/testsuite/gdb.arch/i386-mpx.exp           |  1 -
 gdb/testsuite/gdb.arch/i386-pkru.exp          |  1 -
 gdb/testsuite/gdb.arch/i386-prologue.exp      |  1 -
 gdb/testsuite/gdb.arch/i386-sse.exp           |  1 -
 gdb/testsuite/gdb.arch/i386-word.exp          |  1 -
 .../gdb.arch/ia64-breakpoint-shadow.exp       |  1 -
 gdb/testsuite/gdb.arch/iwmmxt-regs.exp        |  1 -
 gdb/testsuite/gdb.arch/mips16-thunks.exp      |  1 -
 gdb/testsuite/gdb.arch/pa-nullify.exp         |  3 ---
 gdb/testsuite/gdb.arch/powerpc-d128-regs.exp  |  1 -
 .../gdb.arch/powerpc-fpscr-gcore.exp          |  1 -
 gdb/testsuite/gdb.arch/powerpc-prologue.exp   |  1 -
 gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp  |  1 -
 gdb/testsuite/gdb.arch/powerpc64-prologue.exp |  1 -
 gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp  |  1 -
 .../gdb.arch/ppc64-isa207-atomic-inst.exp     |  1 -
 gdb/testsuite/gdb.arch/riscv-bp-infcall.exp   |  1 -
 gdb/testsuite/gdb.arch/riscv-reg-aliases.exp  |  1 -
 gdb/testsuite/gdb.arch/riscv-tdesc-regs.exp   |  1 -
 .../gdb.arch/riscv-unwind-long-insn.exp       |  1 -
 .../riscv64-unwind-prologue-with-ld-lw.exp    |  1 -
 gdb/testsuite/gdb.arch/s390-tdbregs.exp       |  1 -
 gdb/testsuite/gdb.arch/s390-vregs.exp         |  1 -
 gdb/testsuite/gdb.arch/sparc64-adi.exp        |  1 -
 gdb/testsuite/gdb.arch/sparc64-regs.exp       |  1 -
 gdb/testsuite/gdb.arch/thumb-bx-pc.exp        |  1 -
 gdb/testsuite/gdb.arch/thumb-prologue.exp     |  1 -
 gdb/testsuite/gdb.arch/thumb-singlestep.exp   |  1 -
 gdb/testsuite/gdb.arch/thumb2-it.exp          |  1 -
 gdb/testsuite/gdb.arch/vsx-regs.exp           |  1 -
 gdb/testsuite/gdb.arch/vsx-vsr-float28.exp    |  1 -
 gdb/testsuite/gdb.arch/x86-avx512bf16.exp     |  1 -
 gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp |  1 -
 gdb/testsuite/gdb.arch/x86-avx512fp16.exp     |  1 -
 gdb/testsuite/gdb.asm/asm-source.exp          |  1 -
 .../advance-until-multiple-locations.exp      |  5 -----
 gdb/testsuite/gdb.base/advance.exp            |  1 -
 .../gdb.base/annota-input-while-running.exp   |  1 -
 gdb/testsuite/gdb.base/annota1.exp            |  1 -
 gdb/testsuite/gdb.base/annotate-symlink.exp   |  1 -
 gdb/testsuite/gdb.base/anon.exp               |  1 -
 gdb/testsuite/gdb.base/argv0-symlink.exp      |  2 --
 gdb/testsuite/gdb.base/asmlabel.exp           |  1 -
 gdb/testsuite/gdb.base/attach-wait-input.exp  |  1 -
 gdb/testsuite/gdb.base/attach.exp             |  1 -
 .../gdb.base/auto-connect-native-target.exp   |  1 -
 gdb/testsuite/gdb.base/auxv.exp               |  1 -
 gdb/testsuite/gdb.base/backtrace.exp          |  1 -
 gdb/testsuite/gdb.base/bigcore.exp            |  1 -
 gdb/testsuite/gdb.base/break-idempotent.exp   |  1 -
 .../gdb.base/break-main-file-remove-fail.exp  |  1 -
 gdb/testsuite/gdb.base/break-unload-file.exp  |  1 -
 gdb/testsuite/gdb.base/break.exp              | 12 +++++++---
 gdb/testsuite/gdb.base/breakpoint-shadow.exp  |  1 -
 .../gdb.base/bt-on-error-and-warning.exp      |  1 -
 gdb/testsuite/gdb.base/bt-on-fatal-signal.exp |  1 -
 gdb/testsuite/gdb.base/bt-selected-frame.exp  |  1 -
 gdb/testsuite/gdb.base/call-signal-resume.exp |  1 -
 gdb/testsuite/gdb.base/callexit.exp           |  1 -
 gdb/testsuite/gdb.base/cast-call.exp          |  1 -
 gdb/testsuite/gdb.base/catch-follow-exec.exp  |  1 -
 gdb/testsuite/gdb.base/catch-fork-kill.exp    |  1 -
 .../gdb.base/catch-gdb-caused-signals.exp     |  1 -
 gdb/testsuite/gdb.base/catch-load.exp         |  1 -
 .../gdb.base/catch-signal-siginfo-cond.exp    |  1 -
 gdb/testsuite/gdb.base/catch-syscall.exp      |  1 -
 gdb/testsuite/gdb.base/commands.exp           |  1 -
 gdb/testsuite/gdb.base/compare-sections.exp   |  1 -
 gdb/testsuite/gdb.base/complex-parts.exp      |  1 -
 gdb/testsuite/gdb.base/cond-eval-mode.exp     |  1 -
 gdb/testsuite/gdb.base/condbreak-bad.exp      |  3 ---
 .../gdb.base/condbreak-call-false.exp         |  1 -
 .../gdb.base/consecutive-step-over.exp        |  1 -
 .../continue-after-aborted-step-over.exp      |  1 -
 .../gdb.base/continue-all-already-running.exp |  1 -
 .../gdb.base/coredump-filter-build-id.exp     |  1 -
 gdb/testsuite/gdb.base/coredump-filter.exp    |  1 -
 gdb/testsuite/gdb.base/corefile2.exp          |  1 -
 gdb/testsuite/gdb.base/ctxobj.exp             |  1 -
 gdb/testsuite/gdb.base/debug-expr.exp         |  1 -
 gdb/testsuite/gdb.base/decl-before-def.exp    |  1 -
 gdb/testsuite/gdb.base/define.exp             |  4 +++-
 .../gdb.base/detach-sysroot-target.exp        |  1 -
 gdb/testsuite/gdb.base/disabled-location.exp  |  1 -
 gdb/testsuite/gdb.base/display.exp            |  3 +--
 .../gdb.base/dprintf-bp-same-addr.exp         |  1 -
 gdb/testsuite/gdb.base/dprintf-detach.exp     |  1 -
 gdb/testsuite/gdb.base/dprintf-next.exp       |  1 -
 gdb/testsuite/gdb.base/dprintf-non-stop.exp   |  1 -
 gdb/testsuite/gdb.base/dtrace-probe.exp       |  8 ++-----
 gdb/testsuite/gdb.base/duplicate-bp.exp       |  1 -
 gdb/testsuite/gdb.base/ena-dis-br.exp         | 22 ++++++++++++-------
 gdb/testsuite/gdb.base/endianity.exp          |  1 -
 gdb/testsuite/gdb.base/examine-backward.exp   |  1 -
 .../gdb.base/exec-invalid-sysroot.exp         |  1 -
 .../gdb.base/execl-update-breakpoints.exp     |  3 ---
 gdb/testsuite/gdb.base/execution-termios.exp  |  1 -
 gdb/testsuite/gdb.base/finish-pretty.exp      |  1 -
 gdb/testsuite/gdb.base/finish.exp             |  3 ---
 gdb/testsuite/gdb.base/fixsection.exp         |  1 -
 gdb/testsuite/gdb.base/foll-exec-mode.exp     |  2 --
 gdb/testsuite/gdb.base/foll-exec.exp          |  6 -----
 gdb/testsuite/gdb.base/foll-fork.exp          |  1 -
 gdb/testsuite/gdb.base/fork-running-state.exp |  1 -
 .../gdb.base/frame-info-consistent.exp        |  1 -
 gdb/testsuite/gdb.base/frameapply.exp         |  1 -
 gdb/testsuite/gdb.base/func-ptr.exp           |  1 -
 gdb/testsuite/gdb.base/func-ptrs.exp          |  1 -
 .../gdb.base/gcore-buffer-overflow.exp        |  1 -
 gdb/testsuite/gdb.base/gcore-relro-pie.exp    |  1 -
 gdb/testsuite/gdb.base/gcore-tls-pie.exp      |  1 -
 gdb/testsuite/gdb.base/gcore.exp              |  1 -
 gdb/testsuite/gdb.base/gdb1090.exp            |  1 -
 gdb/testsuite/gdb.base/gdb11530.exp           |  1 -
 gdb/testsuite/gdb.base/gdb11531.exp           |  1 -
 gdb/testsuite/gdb.base/gdb1555.exp            |  1 -
 gdb/testsuite/gdb.base/gnu-ifunc.exp          |  2 --
 gdb/testsuite/gdb.base/gnu_vector.exp         |  1 -
 gdb/testsuite/gdb.base/gold-gdb-index.exp     |  1 -
 .../gdb.base/hbreak-in-shr-unsupported.exp    |  1 -
 gdb/testsuite/gdb.base/hbreak-unmapped.exp    |  1 -
 gdb/testsuite/gdb.base/hbreak.exp             |  1 -
 gdb/testsuite/gdb.base/hbreak2.exp            | 18 +++++++++++----
 gdb/testsuite/gdb.base/hook-stop.exp          |  1 -
 gdb/testsuite/gdb.base/huge.exp               |  1 -
 .../gdb.base/hw-sw-break-same-address.exp     |  1 -
 gdb/testsuite/gdb.base/infcall-exec.exp       |  1 -
 gdb/testsuite/gdb.base/infcall-input.exp      |  1 -
 .../gdb.base/infcall-nested-structs.exp.tcl   |  1 -
 gdb/testsuite/gdb.base/inferior-args.exp      |  1 -
 gdb/testsuite/gdb.base/inferior-noarg.exp     |  1 -
 gdb/testsuite/gdb.base/info-fun.exp           |  1 -
 .../info-locals-unused-static-var.exp         |  1 -
 gdb/testsuite/gdb.base/info-macros.exp        |  1 -
 gdb/testsuite/gdb.base/info-os.exp            |  1 -
 gdb/testsuite/gdb.base/info-proc.exp          |  1 -
 gdb/testsuite/gdb.base/info-program.exp       |  2 --
 gdb/testsuite/gdb.base/info-types.exp.tcl     |  1 -
 gdb/testsuite/gdb.base/info_qt.exp            |  1 -
 gdb/testsuite/gdb.base/info_sources.exp       |  1 -
 .../gdb.base/inline-frame-cycle-unwind.exp    |  1 -
 gdb/testsuite/gdb.base/interp.exp             |  1 -
 gdb/testsuite/gdb.base/interrupt-daemon.exp   |  1 -
 gdb/testsuite/gdb.base/interrupt-noterm.exp   |  1 -
 gdb/testsuite/gdb.base/jit-elf-fork.exp       |  1 -
 gdb/testsuite/gdb.base/jit-elf-so.exp         |  1 -
 gdb/testsuite/gdb.base/jit-elf.exp            |  1 -
 gdb/testsuite/gdb.base/jit-reader-exec.exp    |  1 -
 gdb/testsuite/gdb.base/jit-reader-simple.exp  |  1 -
 .../gdb.base/label-without-address.exp        |  1 -
 gdb/testsuite/gdb.base/label.exp              |  1 -
 gdb/testsuite/gdb.base/large-frame.exp        |  1 -
 gdb/testsuite/gdb.base/ldbl_e308.exp          |  1 -
 gdb/testsuite/gdb.base/line-symtabs.exp       |  1 -
 .../gdb.base/list-missing-source.exp          |  1 -
 gdb/testsuite/gdb.base/list.exp               |  1 -
 gdb/testsuite/gdb.base/load-command.exp       |  1 -
 .../gdb.base/long-inferior-output.exp         |  1 -
 gdb/testsuite/gdb.base/long_long.exp          |  1 -
 gdb/testsuite/gdb.base/longjmp.exp            |  1 -
 gdb/testsuite/gdb.base/macscp.exp             |  1 -
 .../gdb.base/maint-info-sections.exp          |  1 -
 .../gdb.base/maint-target-async-off.exp       |  1 -
 gdb/testsuite/gdb.base/many-completions.exp   |  1 -
 gdb/testsuite/gdb.base/max-depth.exp.tcl      |  1 -
 gdb/testsuite/gdb.base/max-value-size.exp     |  1 -
 gdb/testsuite/gdb.base/memtag.exp             |  1 -
 gdb/testsuite/gdb.base/msym-bp-shl.exp        |  1 -
 gdb/testsuite/gdb.base/msym-bp.exp            |  1 -
 gdb/testsuite/gdb.base/new-ui.exp             |  3 +--
 gdb/testsuite/gdb.base/noreturn-finish.exp    |  1 -
 gdb/testsuite/gdb.base/noreturn-return.exp    |  1 -
 gdb/testsuite/gdb.base/options.exp            |  2 --
 gdb/testsuite/gdb.base/overlays.exp           |  1 -
 .../paginate-after-ctrl-c-running.exp         |  1 -
 .../gdb.base/paginate-bg-execution.exp        |  1 -
 .../gdb.base/paginate-inferior-exit.exp       |  1 -
 gdb/testsuite/gdb.base/pie-fork.exp           |  1 -
 gdb/testsuite/gdb.base/pr10179.exp            |  1 -
 gdb/testsuite/gdb.base/pr11022.exp            |  1 -
 gdb/testsuite/gdb.base/pretty-array.exp       |  1 -
 gdb/testsuite/gdb.base/pretty-print.exp       |  1 -
 gdb/testsuite/gdb.base/print-file-var.exp     |  1 -
 gdb/testsuite/gdb.base/printcmds.exp          |  1 -
 gdb/testsuite/gdb.base/quit-live.exp          |  1 -
 gdb/testsuite/gdb.base/range-stepping.exp     |  1 -
 gdb/testsuite/gdb.base/recpar.exp             |  1 -
 gdb/testsuite/gdb.base/reggroups.exp          |  1 -
 gdb/testsuite/gdb.base/remote.exp             |  1 -
 gdb/testsuite/gdb.base/return2.exp            |  1 -
 .../gdb.base/run-attach-while-running.exp     |  1 -
 gdb/testsuite/gdb.base/save-bp.exp            |  2 --
 gdb/testsuite/gdb.base/savedregs.exp          |  1 -
 gdb/testsuite/gdb.base/sect-cmd.exp           |  1 -
 gdb/testsuite/gdb.base/sepdebug.exp           | 12 +++++++---
 gdb/testsuite/gdb.base/set-cwd.exp            |  4 ----
 gdb/testsuite/gdb.base/set-noassign.exp       |  1 -
 gdb/testsuite/gdb.base/setshow.exp            |  2 --
 gdb/testsuite/gdb.base/share-psymtabs-bt.exp  |  1 -
 gdb/testsuite/gdb.base/shreloc.exp            |  1 -
 gdb/testsuite/gdb.base/sigaltstack.exp        |  1 -
 gdb/testsuite/gdb.base/sigbpt.exp             |  1 -
 gdb/testsuite/gdb.base/siginfo-addr.exp       |  1 -
 gdb/testsuite/gdb.base/siginfo-obj.exp        |  2 --
 gdb/testsuite/gdb.base/siginfo-thread.exp     |  1 -
 gdb/testsuite/gdb.base/siginfo.exp            |  1 -
 .../gdb.base/signals-state-child.exp          |  1 -
 gdb/testsuite/gdb.base/signest.exp            |  1 -
 gdb/testsuite/gdb.base/signull.exp            |  1 -
 gdb/testsuite/gdb.base/sigrepeat.exp          |  1 -
 gdb/testsuite/gdb.base/skip-inline.exp        |  4 ----
 gdb/testsuite/gdb.base/skip-solib.exp         |  8 +++++--
 gdb/testsuite/gdb.base/skip.exp               | 13 +----------
 gdb/testsuite/gdb.base/skipcxx.exp            |  1 -
 gdb/testsuite/gdb.base/so-impl-ld.exp         |  4 +++-
 gdb/testsuite/gdb.base/solib-corrupted.exp    |  1 -
 gdb/testsuite/gdb.base/solib-disc.exp         |  1 -
 gdb/testsuite/gdb.base/solib-display.exp      |  1 -
 gdb/testsuite/gdb.base/solib-search.exp       |  1 -
 gdb/testsuite/gdb.base/solib-symbol.exp       |  1 -
 gdb/testsuite/gdb.base/solib-vanish.exp       |  1 -
 gdb/testsuite/gdb.base/source-dir.exp         |  1 -
 gdb/testsuite/gdb.base/source-execution.exp   |  1 -
 .../gdb.base/sss-bp-on-user-bp-2.exp          |  1 -
 gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp  |  1 -
 gdb/testsuite/gdb.base/stack-checking.exp     |  1 -
 gdb/testsuite/gdb.base/stack-protector.exp    |  1 -
 gdb/testsuite/gdb.base/step-break.exp         |  1 -
 .../gdb.base/step-indirect-call-thunk.exp     |  1 -
 gdb/testsuite/gdb.base/step-line.exp          |  1 -
 gdb/testsuite/gdb.base/step-over-exit.exp     |  1 -
 .../gdb.base/step-over-no-symbols.exp         |  2 --
 gdb/testsuite/gdb.base/step-over-syscall.exp  |  2 --
 gdb/testsuite/gdb.base/step-test.exp          |  3 ---
 gdb/testsuite/gdb.base/structs2.exp           |  1 -
 gdb/testsuite/gdb.base/structs3.exp           |  1 -
 .../gdb.base/style-interp-exec-mi.exp         |  1 -
 gdb/testsuite/gdb.base/style-logging.exp      |  1 -
 gdb/testsuite/gdb.base/style.exp              |  1 -
 gdb/testsuite/gdb.base/sym-file.exp           |  1 -
 gdb/testsuite/gdb.base/symbol-alias.exp       |  1 -
 gdb/testsuite/gdb.base/symlink-sourcefile.exp |  1 -
 .../gdb.base/symtab-search-order.exp          |  1 -
 gdb/testsuite/gdb.base/template.exp           |  1 -
 gdb/testsuite/gdb.base/term.exp               |  1 -
 gdb/testsuite/gdb.base/type-opaque.exp        |  1 -
 gdb/testsuite/gdb.base/ui-redirect.exp        |  1 -
 gdb/testsuite/gdb.base/until-nodebug.exp      |  1 -
 gdb/testsuite/gdb.base/until.exp              |  1 -
 gdb/testsuite/gdb.base/unwindonsignal.exp     |  1 -
 gdb/testsuite/gdb.base/utf8-identifiers.exp   |  1 -
 gdb/testsuite/gdb.base/vla-optimized-out.exp  |  1 -
 gdb/testsuite/gdb.base/watch-cond-infcall.exp |  1 -
 gdb/testsuite/gdb.base/watch-cond.exp         |  3 ---
 gdb/testsuite/gdb.base/watch-non-mem.exp      |  1 -
 gdb/testsuite/gdb.base/watch-read.exp         |  1 -
 gdb/testsuite/gdb.base/watch-vfork.exp        |  1 -
 gdb/testsuite/gdb.base/watch_thread_num.exp   |  1 -
 .../gdb.base/watchpoint-hw-attach.exp         |  1 -
 .../gdb.base/watchpoint-reuse-slot.exp        |  1 -
 .../watchpoint-stops-at-right-insn.exp        |  2 --
 .../gdb.base/watchpoint-unaligned.exp         |  1 -
 gdb/testsuite/gdb.base/watchpoint.exp         |  4 +++-
 .../gdb.base/whatis-ptype-typedefs.exp        |  1 -
 gdb/testsuite/gdb.base/with.exp               |  1 -
 gdb/testsuite/gdb.btrace/buffer-size.exp      |  1 -
 gdb/testsuite/gdb.btrace/data.exp             |  1 -
 gdb/testsuite/gdb.btrace/delta.exp            |  1 -
 gdb/testsuite/gdb.btrace/dlopen.exp           |  1 -
 .../gdb.btrace/enable-new-thread.exp          |  1 -
 gdb/testsuite/gdb.btrace/enable-running.exp   |  1 -
 gdb/testsuite/gdb.btrace/enable.exp           |  5 -----
 gdb/testsuite/gdb.btrace/exception.exp        |  1 -
 .../gdb.btrace/function_call_history.exp      |  2 --
 gdb/testsuite/gdb.btrace/gcore.exp            |  1 -
 .../gdb.btrace/instruction_history.exp        |  1 -
 gdb/testsuite/gdb.btrace/multi-inferior.exp   |  3 ---
 .../gdb.btrace/multi-thread-step.exp          |  1 -
 gdb/testsuite/gdb.btrace/nohist.exp           |  1 -
 gdb/testsuite/gdb.btrace/non-stop.exp         |  1 -
 gdb/testsuite/gdb.btrace/record_goto-step.exp |  1 -
 gdb/testsuite/gdb.btrace/record_goto.exp      |  1 -
 gdb/testsuite/gdb.btrace/rn-dl-bind.exp       |  1 -
 gdb/testsuite/gdb.btrace/segv.exp             |  1 -
 gdb/testsuite/gdb.btrace/step.exp             |  1 -
 gdb/testsuite/gdb.btrace/stepi.exp            |  1 -
 gdb/testsuite/gdb.btrace/tailcall-only.exp    |  1 -
 gdb/testsuite/gdb.btrace/tailcall.exp         |  1 -
 gdb/testsuite/gdb.btrace/tsx.exp              |  1 -
 .../gdb.btrace/unknown_functions.exp          |  1 -
 gdb/testsuite/gdb.btrace/vdso.exp             |  1 -
 .../gdb.compile/compile-cplus-anonymous.exp   |  1 -
 .../gdb.compile/compile-cplus-array-decay.exp |  1 -
 .../gdb.compile/compile-cplus-inherit.exp     |  1 -
 .../gdb.compile/compile-cplus-member.exp      |  1 -
 .../gdb.compile/compile-cplus-method.exp      |  1 -
 .../gdb.compile/compile-cplus-namespace.exp   |  1 -
 .../gdb.compile/compile-cplus-nested.exp      |  1 -
 .../gdb.compile/compile-cplus-virtual.exp     |  1 -
 gdb/testsuite/gdb.compile/compile-tls.exp     |  1 -
 gdb/testsuite/gdb.cp/abstract-origin.exp      |  1 -
 gdb/testsuite/gdb.cp/baseenum.exp             |  1 -
 gdb/testsuite/gdb.cp/call-method-register.exp |  1 -
 gdb/testsuite/gdb.cp/cplabel.exp              |  1 -
 gdb/testsuite/gdb.cp/destrprint.exp           |  1 -
 gdb/testsuite/gdb.cp/ena-dis-br-range.exp     |  1 -
 .../gdb.cp/except-multi-location.exp          |  1 -
 gdb/testsuite/gdb.cp/infcall-nodebug.exp.tcl  |  1 -
 gdb/testsuite/gdb.cp/local-static.exp         |  1 -
 gdb/testsuite/gdb.cp/mb-inline.exp            |  1 -
 gdb/testsuite/gdb.cp/mb-templates.exp         |  1 -
 gdb/testsuite/gdb.cp/pass-by-ref-2.exp        |  1 -
 gdb/testsuite/gdb.cp/pass-by-ref.exp          |  1 -
 gdb/testsuite/gdb.cp/pr10687.exp              |  1 -
 gdb/testsuite/gdb.cp/pr9167.exp               |  1 -
 gdb/testsuite/gdb.cp/rvalue-ref-casts.exp     |  1 -
 gdb/testsuite/gdb.cp/rvalue-ref-types.exp     |  2 --
 gdb/testsuite/gdb.cp/save-bp-qualified.exp    |  1 -
 gdb/testsuite/gdb.cp/scope-err.exp            |  1 -
 gdb/testsuite/gdb.cp/static-typedef-print.exp |  1 -
 gdb/testsuite/gdb.cp/step-and-next-inline.exp |  2 --
 gdb/testsuite/gdb.cp/typedef-base.exp         |  1 -
 gdb/testsuite/gdb.cp/typeid.exp               |  1 -
 gdb/testsuite/gdb.cp/wide_char_types.exp      |  1 -
 .../dw2-single-line-discriminators.exp        |  1 -
 gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp   |  1 -
 .../gdb.dwarf2/imported-unit-runto-main.exp   |  2 +-
 .../locexpr-data-member-location.exp          |  1 -
 .../gdb.dwarf2/loclists-multiple-cus.exp      |  1 -
 .../gdb.dwarf2/loclists-sec-offset.exp        |  1 -
 .../gdb.dwarf2/loclists-start-end.exp         |  1 -
 gdb/testsuite/gdb.fortran/allocated.exp       |  1 -
 .../gdb.fortran/array-slices-bad.exp          |  1 -
 .../gdb.fortran/array-slices-sub-slices.exp   |  1 -
 gdb/testsuite/gdb.fortran/array-slices.exp    |  1 -
 gdb/testsuite/gdb.fortran/associated.exp      |  1 -
 gdb/testsuite/gdb.fortran/block-data.exp      |  1 -
 gdb/testsuite/gdb.fortran/call-no-debug.exp   |  1 -
 .../gdb.fortran/class-allocatable-array.exp   |  1 -
 gdb/testsuite/gdb.fortran/completion.exp      |  1 -
 gdb/testsuite/gdb.fortran/debug-expr.exp      |  1 -
 gdb/testsuite/gdb.fortran/intvar-array.exp    |  1 -
 .../gdb.fortran/intvar-dynamic-types.exp      |  1 -
 gdb/testsuite/gdb.fortran/lbound-ubound.exp   |  1 -
 .../gdb.fortran/mixed-lang-stack.exp          |  1 -
 .../gdb.fortran/pointer-to-pointer.exp        |  1 -
 gdb/testsuite/gdb.fortran/print-formatted.exp |  1 -
 gdb/testsuite/gdb.fortran/print_type.exp      |  1 -
 gdb/testsuite/gdb.fortran/printing-types.exp  |  1 -
 gdb/testsuite/gdb.fortran/ptr-indentation.exp |  1 -
 gdb/testsuite/gdb.fortran/rank.exp            |  1 -
 gdb/testsuite/gdb.fortran/shape.exp           |  1 -
 gdb/testsuite/gdb.fortran/size.exp            |  1 -
 gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp |  1 -
 gdb/testsuite/gdb.fortran/vla-datatypes.exp   |  1 -
 gdb/testsuite/gdb.fortran/vla-history.exp     |  1 -
 gdb/testsuite/gdb.fortran/vla-ptr-info.exp    |  1 -
 gdb/testsuite/gdb.fortran/vla-ptype-sub.exp   |  1 -
 gdb/testsuite/gdb.fortran/vla-ptype.exp       |  1 -
 gdb/testsuite/gdb.fortran/vla-sizeof.exp      |  1 -
 gdb/testsuite/gdb.fortran/vla-type.exp        |  1 -
 .../gdb.fortran/vla-value-sub-arbitrary.exp   |  1 -
 .../gdb.fortran/vla-value-sub-finish.exp      |  1 -
 gdb/testsuite/gdb.fortran/vla-value-sub.exp   |  1 -
 gdb/testsuite/gdb.fortran/vla-value.exp       |  1 -
 gdb/testsuite/gdb.fortran/whatis_type.exp     |  1 -
 gdb/testsuite/gdb.go/chan.exp                 |  1 -
 .../gdb.go/global-local-var-shadow.exp        |  1 -
 gdb/testsuite/gdb.go/handcall.exp             |  1 -
 gdb/testsuite/gdb.go/hello.exp                |  1 -
 gdb/testsuite/gdb.go/integers.exp             |  1 -
 gdb/testsuite/gdb.go/max-depth.exp            |  1 -
 gdb/testsuite/gdb.go/methods.exp              |  1 -
 gdb/testsuite/gdb.go/package.exp              |  1 -
 gdb/testsuite/gdb.go/strings.exp              |  1 -
 gdb/testsuite/gdb.go/types.exp                |  1 -
 gdb/testsuite/gdb.go/unsafe.exp               |  1 -
 gdb/testsuite/gdb.guile/scm-breakpoint.exp    |  1 -
 gdb/testsuite/gdb.guile/scm-cmd.exp           |  1 -
 gdb/testsuite/gdb.guile/scm-frame-inline.exp  |  1 -
 gdb/testsuite/gdb.guile/scm-lazy-string.exp   |  1 -
 gdb/testsuite/gdb.guile/scm-objfile.exp       |  1 -
 gdb/testsuite/gdb.guile/scm-value.exp         |  2 --
 gdb/testsuite/gdb.linespec/keywords.exp       |  1 -
 gdb/testsuite/gdb.linespec/ls-errs.exp        |  1 -
 gdb/testsuite/gdb.linespec/thread.exp         |  1 -
 gdb/testsuite/gdb.mi/mi-var-create-rtti.exp   |  1 -
 .../gdb.mi/user-selected-context-sync.exp     |  1 -
 gdb/testsuite/gdb.modula2/max-depth.exp       |  1 -
 gdb/testsuite/gdb.multi/bkpt-multi-exec.exp   |  1 -
 .../gdb.multi/dummy-frame-restore.exp         |  2 --
 gdb/testsuite/gdb.multi/multi-arch-exec.exp   |  1 -
 gdb/testsuite/gdb.multi/multi-arch.exp        |  4 ++--
 gdb/testsuite/gdb.multi/multi-re-run.exp      |  5 ++---
 .../gdb.multi/multi-term-settings.exp         |  1 -
 gdb/testsuite/gdb.multi/remove-inferiors.exp  |  1 -
 gdb/testsuite/gdb.multi/stop-all-on-exit.exp  |  2 --
 gdb/testsuite/gdb.multi/tids-gid-reset.exp    |  1 -
 .../gdb.multi/watchpoint-multi-exit.exp       |  1 -
 .../gdb.opt/clobbered-registers-O2.exp        |  1 -
 gdb/testsuite/gdb.opt/inline-break.exp        |  5 -----
 gdb/testsuite/gdb.perf/backtrace.exp          |  1 -
 gdb/testsuite/gdb.perf/single-step.exp        |  1 -
 gdb/testsuite/gdb.perf/skip-command.exp       |  1 -
 gdb/testsuite/gdb.perf/skip-prologue.exp      |  1 -
 gdb/testsuite/gdb.perf/solib.exp              |  1 -
 .../gdb.perf/template-breakpoints.exp         |  1 -
 gdb/testsuite/gdb.python/lib-types.exp        |  1 -
 gdb/testsuite/gdb.python/py-as-string.exp     |  1 -
 ...ed-pretty-printers-in-newobjfile-event.exp |  1 -
 gdb/testsuite/gdb.python/py-bad-printers.exp  |  1 -
 gdb/testsuite/gdb.python/py-block.exp         |  1 -
 .../gdb.python/py-breakpoint-create-fail.exp  |  3 +--
 gdb/testsuite/gdb.python/py-breakpoint.exp    | 14 ------------
 gdb/testsuite/gdb.python/py-cmd.exp           |  1 -
 .../gdb.python/py-finish-breakpoint.exp       | 10 +--------
 .../gdb.python/py-finish-breakpoint2.exp      |  1 -
 gdb/testsuite/gdb.python/py-frame-inline.exp  |  1 -
 gdb/testsuite/gdb.python/py-frame.exp         |  1 -
 gdb/testsuite/gdb.python/py-inferior.exp      |  1 -
 gdb/testsuite/gdb.python/py-infthread.exp     |  1 -
 gdb/testsuite/gdb.python/py-objfile.exp       |  2 --
 .../gdb.python/py-pending-frame-level.exp     |  1 -
 gdb/testsuite/gdb.python/py-pp-maint.exp      |  1 -
 .../gdb.python/py-pp-registration.exp         |  3 +--
 gdb/testsuite/gdb.python/py-progspace.exp     |  1 -
 gdb/testsuite/gdb.python/py-rbreak.exp        |  1 -
 .../gdb.python/py-record-btrace-threads.exp   |  1 -
 gdb/testsuite/gdb.python/py-record-btrace.exp |  1 -
 gdb/testsuite/gdb.python/py-record-full.exp   |  1 -
 .../gdb.python/py-recurse-unwind.exp          |  1 -
 .../gdb.python/py-rvalue-ref-value-cc.exp     |  1 -
 gdb/testsuite/gdb.python/py-shared.exp        |  1 -
 gdb/testsuite/gdb.python/py-symbol.exp        |  3 ---
 gdb/testsuite/gdb.python/py-symtab.exp        |  1 -
 gdb/testsuite/gdb.python/py-unwind-inline.exp |  1 -
 gdb/testsuite/gdb.python/py-unwind-maint.exp  |  1 -
 .../gdb.python/py-unwind-user-regs.exp        |  1 -
 gdb/testsuite/gdb.python/py-unwind.exp        |  1 -
 gdb/testsuite/gdb.python/py-value.exp         |  1 -
 gdb/testsuite/gdb.python/python.exp           |  3 ---
 .../gdb.reverse/finish-reverse-bkpt.exp       |  1 -
 gdb/testsuite/gdb.reverse/insn-reverse.exp    |  1 -
 .../gdb.reverse/next-reverse-bkpt-over-sr.exp |  1 -
 .../gdb.reverse/step-indirect-call-thunk.exp  |  1 -
 .../gdb.server/extended-remote-restart.exp    |  1 -
 gdb/testsuite/gdb.stabs/gdb11479.exp          |  1 -
 .../access-mem-running-thread-exit.exp        |  2 --
 gdb/testsuite/gdb.threads/async.exp           |  1 -
 .../gdb.threads/clone-new-thread-event.exp    |  1 -
 gdb/testsuite/gdb.threads/clone-thread_db.exp |  1 -
 .../gdb.threads/continue-pending-status.exp   |  1 -
 .../gdb.threads/current-lwp-dead.exp          |  1 -
 .../gdb.threads/fork-child-threads.exp        |  1 -
 .../gdb.threads/fork-plus-threads.exp         |  1 -
 .../gdb.threads/fork-thread-pending.exp       |  2 --
 .../forking-threads-plus-breakpoint.exp       |  2 --
 gdb/testsuite/gdb.threads/gcore-thread.exp    |  1 -
 .../gdb.threads/hand-call-in-threads.exp      |  1 -
 .../gdb.threads/interrupt-while-step-over.exp |  2 --
 .../gdb.threads/interrupted-hand-call.exp     |  1 -
 gdb/testsuite/gdb.threads/kill.exp            |  1 -
 .../gdb.threads/local-watch-wrong-thread.exp  |  1 -
 .../multiple-successive-infcall.exp           |  1 -
 .../next-while-other-thread-longjmps.exp      |  1 -
 gdb/testsuite/gdb.threads/non-ldr-exit.exp    |  1 -
 gdb/testsuite/gdb.threads/omp-par-scope.exp   |  1 -
 gdb/testsuite/gdb.threads/pending-step.exp    |  1 -
 .../process-dies-while-detaching.exp          |  3 ---
 .../process-dies-while-handling-bp.exp        |  1 -
 gdb/testsuite/gdb.threads/queue-signal.exp    |  1 -
 .../gdb.threads/reconnect-signal.exp          |  1 -
 .../signal-command-handle-nopass.exp          |  1 -
 ...ignal-command-multiple-signals-pending.exp |  1 -
 .../signal-delivered-right-thread.exp         |  1 -
 gdb/testsuite/gdb.threads/signal-sigtrap.exp  |  1 -
 gdb/testsuite/gdb.threads/sigthread.exp       |  1 -
 .../gdb.threads/stop-with-handle.exp          |  1 -
 .../gdb.threads/thread-specific-bp.exp        |  1 -
 .../gdb.threads/thread-unwindonsignal.exp     |  1 -
 gdb/testsuite/gdb.threads/thread_check.exp    |  1 -
 gdb/testsuite/gdb.threads/thread_events.exp   |  1 -
 gdb/testsuite/gdb.threads/threadapply.exp     |  2 --
 gdb/testsuite/gdb.threads/tid-reuse.exp       |  1 -
 gdb/testsuite/gdb.threads/tls-nodebug.exp     |  1 -
 gdb/testsuite/gdb.threads/tls-shared.exp      |  1 -
 gdb/testsuite/gdb.threads/tls-so_extern.exp   |  1 -
 gdb/testsuite/gdb.threads/tls.exp             |  1 -
 .../gdb.threads/vfork-follow-child-exec.exp   |  1 -
 .../gdb.threads/vfork-follow-child-exit.exp   |  1 -
 gdb/testsuite/gdb.threads/watchthreads.exp    |  1 -
 gdb/testsuite/gdb.threads/watchthreads2.exp   |  1 -
 gdb/testsuite/gdb.threads/wp-replication.exp  |  1 -
 gdb/testsuite/gdb.trace/actions-changed.exp   |  1 -
 gdb/testsuite/gdb.trace/actions.exp           |  1 -
 gdb/testsuite/gdb.trace/backtrace.exp         |  1 -
 gdb/testsuite/gdb.trace/change-loc.exp        |  3 ---
 gdb/testsuite/gdb.trace/circ.exp              |  4 ----
 .../gdb.trace/disconnected-tracing.exp        |  3 ---
 gdb/testsuite/gdb.trace/entry-values.exp      |  2 --
 gdb/testsuite/gdb.trace/ftrace-lock.exp       |  2 --
 gdb/testsuite/gdb.trace/ftrace.exp            |  2 --
 gdb/testsuite/gdb.trace/infotrace.exp         |  1 -
 .../gdb.trace/mi-trace-frame-collected.exp    |  1 -
 .../gdb.trace/mi-trace-unavailable.exp        |  1 -
 .../gdb.trace/mi-traceframe-changed.exp       |  1 -
 .../gdb.trace/mi-tracepoint-changed.exp       |  2 --
 gdb/testsuite/gdb.trace/mi-tsv-changed.exp    |  3 ---
 gdb/testsuite/gdb.trace/no-attach-trace.exp   |  1 -
 gdb/testsuite/gdb.trace/pending.exp           |  6 -----
 gdb/testsuite/gdb.trace/pr16508.exp           |  1 -
 gdb/testsuite/gdb.trace/qtro.exp              |  1 -
 gdb/testsuite/gdb.trace/range-stepping.exp    |  2 --
 gdb/testsuite/gdb.trace/read-memory.exp       |  2 --
 gdb/testsuite/gdb.trace/signal.exp            |  2 --
 gdb/testsuite/gdb.trace/status-stop.exp       |  4 ----
 gdb/testsuite/gdb.trace/strace.exp            |  6 -----
 gdb/testsuite/gdb.trace/trace-break.exp       |  8 -------
 gdb/testsuite/gdb.trace/trace-buffer-size.exp |  1 -
 gdb/testsuite/gdb.trace/trace-condition.exp   |  3 ---
 .../gdb.trace/trace-enable-disable.exp        |  2 --
 gdb/testsuite/gdb.trace/trace-mt.exp          |  4 ----
 .../gdb.trace/tracefile-pseudo-reg.exp        |  1 -
 gdb/testsuite/gdb.trace/tspeed.exp            |  1 -
 gdb/testsuite/gdb.trace/tstatus.exp           |  1 -
 gdb/testsuite/gdb.trace/tsv.exp               |  1 -
 gdb/testsuite/gdb.trace/while-stepping.exp    |  1 -
 gdb/testsuite/gdb.tui/corefile-run.exp        |  1 -
 gdb/testsuite/gdb.tui/tui-layout.exp          |  1 -
 gdb/testsuite/gdb.xml/tdesc-reload.exp        |  2 --
 gdb/testsuite/lib/ada.exp                     |  1 -
 gdb/testsuite/lib/gdb-guile.exp               |  1 -
 gdb/testsuite/lib/gdb.exp                     |  2 +-
 598 files changed, 75 insertions(+), 784 deletions(-)

diff --git a/gdb/testsuite/gdb.ada/array_return.exp b/gdb/testsuite/gdb.ada/array_return.exp
index aceb5fd2c00..9b2800d16ab 100644
--- a/gdb/testsuite/gdb.ada/array_return.exp
+++ b/gdb/testsuite/gdb.ada/array_return.exp
@@ -28,7 +28,6 @@ clean_restart ${testfile}
 # Start the inferior
 
 if ![runto_main] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/bp_inlined_func.exp b/gdb/testsuite/gdb.ada/bp_inlined_func.exp
index 4d304236fb1..bc253970fac 100644
--- a/gdb/testsuite/gdb.ada/bp_inlined_func.exp
+++ b/gdb/testsuite/gdb.ada/bp_inlined_func.exp
@@ -26,7 +26,6 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
 clean_restart ${testfile}
 
 if ![runto_main] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/catch_assert_if.exp b/gdb/testsuite/gdb.ada/catch_assert_if.exp
index e6f4d2dbb1b..f4696582809 100644
--- a/gdb/testsuite/gdb.ada/catch_assert_if.exp
+++ b/gdb/testsuite/gdb.ada/catch_assert_if.exp
@@ -33,7 +33,6 @@ set eol "\[\r\n\]+"
 set sp "\[ \t\]*"
 
 if ![runto_main] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
@@ -62,7 +61,6 @@ gdb_test_multiple "catch exception" $msg {
 #  - continue, the program exits.
 
 if ![runto_main] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/catch_ex.exp b/gdb/testsuite/gdb.ada/catch_ex.exp
index 12e0f6808e5..736e490e9c0 100644
--- a/gdb/testsuite/gdb.ada/catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/catch_ex.exp
@@ -41,7 +41,6 @@ set catch_exception_info \
 ####################################
 
 if ![runto_main] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
@@ -90,7 +89,6 @@ gdb_test "continue" \
 #  - continue, the program exits.
 
 if ![runto_main] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
@@ -151,7 +149,6 @@ gdb_test "continue" \
 #     the program.
 
 if ![runto_main] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/excep_handle.exp b/gdb/testsuite/gdb.ada/excep_handle.exp
index 990585cb140..5760c531d65 100644
--- a/gdb/testsuite/gdb.ada/excep_handle.exp
+++ b/gdb/testsuite/gdb.ada/excep_handle.exp
@@ -45,7 +45,6 @@ set catchpoint_storage_error_msg \
 ############################################
 
 if ![runto_main] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/info_auto_lang.exp b/gdb/testsuite/gdb.ada/info_auto_lang.exp
index 0ff10537b7c..41c4d7cf569 100644
--- a/gdb/testsuite/gdb.ada/info_auto_lang.exp
+++ b/gdb/testsuite/gdb.ada/info_auto_lang.exp
@@ -46,7 +46,6 @@ clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/some_c.c]
 if ![runto "some_c.c:$bp_location"] then {
-    fail "can't run to some_c.c STOP location"
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/info_exc.exp b/gdb/testsuite/gdb.ada/info_exc.exp
index 56e527f6f03..c8dc0741730 100644
--- a/gdb/testsuite/gdb.ada/info_exc.exp
+++ b/gdb/testsuite/gdb.ada/info_exc.exp
@@ -26,7 +26,6 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
 clean_restart ${testfile}
 
 if ![runto_main] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_catch_assert.exp b/gdb/testsuite/gdb.ada/mi_catch_assert.exp
index d00573af140..0803d1917b0 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_assert.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_assert.exp
@@ -35,7 +35,6 @@ set sp "\[ \t\]*"
 clean_restart ${testfile}
 
 if ![runto_main] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
@@ -71,7 +70,6 @@ mi_clean_restart $binfile
 #  - continue, the program exits.
 
 if {[mi_runto_main] < 0} {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex.exp b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
index a4c58fbb3e0..1b7c5808d96 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
@@ -35,7 +35,6 @@ set eol "\[\r\n\]+"
 clean_restart ${testfile}
 
 if ![runto_main] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
@@ -66,7 +65,6 @@ mi_clean_restart $binfile
 
 with_test_prefix "scenario 1" {
     if {[mi_runto_main] < 0} {
-	fail "cannot run to main, testcase aborted"
 	return 0
     }
 }
@@ -125,7 +123,6 @@ continue_to_exception \
 with_test_prefix "scenario 2" {
     mi_delete_breakpoints
     if {[mi_runto_main] < 0} {
-	fail "cannot run to main, testcase aborted"
 	return 0
     }
 }
diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
index 57ec628d183..655b087d5e3 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
@@ -34,7 +34,6 @@ set eol "\[\r\n\]+"
 clean_restart ${testfile}
 
 if ![runto_main] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
@@ -65,7 +64,6 @@ mi_clean_restart $binfile
 
 with_test_prefix "scenario 1" {
     if {[mi_runto_main] < 0} {
-	fail "cannot run to main, testcase aborted"
 	return 0
     }
 }
@@ -118,7 +116,6 @@ continue_to_exception_handler \
 with_test_prefix "scenario 2" {
     mi_delete_breakpoints
     if {[mi_runto_main] < 0} {
-	fail "cannot run to main, testcase aborted"
 	return 0
     }
 }
diff --git a/gdb/testsuite/gdb.ada/mi_dyn_arr.exp b/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
index 34cfbe65064..d796f554f59 100644
--- a/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
+++ b/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
@@ -29,7 +29,6 @@ set MIFLAGS "-i=mi"
 mi_clean_restart $binfile
 
 if {[mi_runto_main] < 0} {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_ex_cond.exp b/gdb/testsuite/gdb.ada/mi_ex_cond.exp
index 3390354272e..8aa9eb99517 100644
--- a/gdb/testsuite/gdb.ada/mi_ex_cond.exp
+++ b/gdb/testsuite/gdb.ada/mi_ex_cond.exp
@@ -35,7 +35,6 @@ set eol "\[\r\n\]+"
 clean_restart ${testfile}
 
 if ![runto_main] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_exc_info.exp b/gdb/testsuite/gdb.ada/mi_exc_info.exp
index c9290c52b9f..af471cfcca4 100644
--- a/gdb/testsuite/gdb.ada/mi_exc_info.exp
+++ b/gdb/testsuite/gdb.ada/mi_exc_info.exp
@@ -29,7 +29,6 @@ set MIFLAGS "-i=mi"
 mi_clean_restart $binfile
 
 if {[mi_runto_main] < 0} {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_interface.exp b/gdb/testsuite/gdb.ada/mi_interface.exp
index 13e0d8df40e..df3858261ad 100644
--- a/gdb/testsuite/gdb.ada/mi_interface.exp
+++ b/gdb/testsuite/gdb.ada/mi_interface.exp
@@ -29,7 +29,6 @@ set MIFLAGS "-i=mi"
 mi_clean_restart $binfile
 
 if {[mi_runto_main] < 0} {
-    fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_prot.exp b/gdb/testsuite/gdb.ada/mi_prot.exp
index 8936a6c5584..57f54dcb992 100644
--- a/gdb/testsuite/gdb.ada/mi_prot.exp
+++ b/gdb/testsuite/gdb.ada/mi_prot.exp
@@ -33,7 +33,6 @@ set MIFLAGS "-i=mi"
 mi_clean_restart $binfile
 
 if {[mi_runto_main] < 0} {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_ref_changeable.exp b/gdb/testsuite/gdb.ada/mi_ref_changeable.exp
index 0fd5899cc7d..09f7c026be4 100644
--- a/gdb/testsuite/gdb.ada/mi_ref_changeable.exp
+++ b/gdb/testsuite/gdb.ada/mi_ref_changeable.exp
@@ -29,7 +29,6 @@ set MIFLAGS "-i=mi"
 mi_clean_restart $binfile
 
 if {[mi_runto_main] < 0} {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_string_access.exp b/gdb/testsuite/gdb.ada/mi_string_access.exp
index 89026e307ec..75e5d5b6417 100644
--- a/gdb/testsuite/gdb.ada/mi_string_access.exp
+++ b/gdb/testsuite/gdb.ada/mi_string_access.exp
@@ -32,7 +32,6 @@ foreach_with_prefix scenario {all minimal} {
     mi_clean_restart $binfile
 
     if {[mi_runto_main] < 0} {
-	fail "cannot run to main, testcase aborted"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.ada/mi_task_arg.exp b/gdb/testsuite/gdb.ada/mi_task_arg.exp
index c8a74651866..754d93f8eeb 100644
--- a/gdb/testsuite/gdb.ada/mi_task_arg.exp
+++ b/gdb/testsuite/gdb.ada/mi_task_arg.exp
@@ -39,7 +39,6 @@ mi_gdb_load ${binfile}
 mi_gdb_test "-gdb-set debug-file-directory \"\"" ".*"
 
 if ![mi_runto "task_switch.break_me"] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_task_info.exp b/gdb/testsuite/gdb.ada/mi_task_info.exp
index a7d97b01aff..83ecb826be9 100644
--- a/gdb/testsuite/gdb.ada/mi_task_info.exp
+++ b/gdb/testsuite/gdb.ada/mi_task_info.exp
@@ -40,7 +40,6 @@ mi_gdb_load ${binfile}
 ####################################
 
 if ![mi_runto "task_switch.break_me"] then {
-   fail "cannot run to main, testcase aborted"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_var_access.exp b/gdb/testsuite/gdb.ada/mi_var_access.exp
index 92b51f91770..c4899491e7b 100644
--- a/gdb/testsuite/gdb.ada/mi_var_access.exp
+++ b/gdb/testsuite/gdb.ada/mi_var_access.exp
@@ -31,7 +31,6 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != "" } {
 mi_clean_restart $binfile
 
 if {[mi_runto_main] < 0} {
-    fail "cannot run to main, testcase aborted"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_var_array.exp b/gdb/testsuite/gdb.ada/mi_var_array.exp
index e0529fb5101..f9f3e3f1010 100644
--- a/gdb/testsuite/gdb.ada/mi_var_array.exp
+++ b/gdb/testsuite/gdb.ada/mi_var_array.exp
@@ -35,7 +35,6 @@ foreach_with_prefix scenario {none all minimal} {
     mi_clean_restart $binfile
 
     if {[mi_runto_main] < 0} {
-	fail "cannot run to main, testcase aborted"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.ada/mi_var_union.exp b/gdb/testsuite/gdb.ada/mi_var_union.exp
index c550f29a960..bb32dc81ea5 100644
--- a/gdb/testsuite/gdb.ada/mi_var_union.exp
+++ b/gdb/testsuite/gdb.ada/mi_var_union.exp
@@ -37,7 +37,6 @@ foreach_with_prefix scenario {none all minimal} {
     mi_clean_restart $binfile
 
     if {[mi_runto_main] < 0} {
-	fail "cannot run to main, testcase aborted"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.ada/mi_variant.exp b/gdb/testsuite/gdb.ada/mi_variant.exp
index a9d5d8ae577..850abf91ebc 100644
--- a/gdb/testsuite/gdb.ada/mi_variant.exp
+++ b/gdb/testsuite/gdb.ada/mi_variant.exp
@@ -36,7 +36,6 @@ foreach_with_prefix scenario {none all minimal} {
     mi_clean_restart $binfile
 
     if {[mi_runto_main] < 0} {
-	fail "cannot run to main, testcase aborted"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp b/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
index 1a35cef2760..01d6871c632 100644
--- a/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
@@ -29,7 +29,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.arch/aarch64-brk-patterns.exp b/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
index 235f12ea879..3097fdf4182 100644
--- a/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
@@ -29,7 +29,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.arch/aarch64-fp.exp b/gdb/testsuite/gdb.arch/aarch64-fp.exp
index 4fb8e343c49..5e44b2a7d84 100644
--- a/gdb/testsuite/gdb.arch/aarch64-fp.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-fp.exp
@@ -29,7 +29,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.arch/aarch64-mte.exp b/gdb/testsuite/gdb.arch/aarch64-mte.exp
index 62dfc863748..21dc9b6bec6 100644
--- a/gdb/testsuite/gdb.arch/aarch64-mte.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-mte.exp
@@ -54,7 +54,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 }
 
 if ![runto_main] {
-    untested "could not run to main"
     return -1
 }
 
@@ -339,7 +338,6 @@ gdb_test "continue" \
 # Restart to execute the async tag fault test.
 with_test_prefix "async" {
     if ![runto_main] {
-	untested "could not run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.arch/aarch64-pauth.exp b/gdb/testsuite/gdb.arch/aarch64-pauth.exp
index 6fbf6fad304..9a76b6187ca 100644
--- a/gdb/testsuite/gdb.arch/aarch64-pauth.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-pauth.exp
@@ -32,7 +32,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} ${compile_f
 }
 
 if ![runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/aarch64-prologue.exp b/gdb/testsuite/gdb.arch/aarch64-prologue.exp
index e871cc0acf6..dd55b30dec7 100644
--- a/gdb/testsuite/gdb.arch/aarch64-prologue.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-prologue.exp
@@ -26,7 +26,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}]} {
 }
 
 if ![runto_main] {
-   untested "could not run to main"
    return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp b/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
index ea1c5685406..29f23e7b7f2 100644
--- a/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
@@ -36,7 +36,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} ${compile_f
 }
 
 if ![runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp b/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
index d8620c09f5c..c9bc9cca10c 100644
--- a/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
@@ -26,7 +26,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.arch/alpha-step.exp b/gdb/testsuite/gdb.arch/alpha-step.exp
index 6f2d78bdd66..a5385d10fe4 100644
--- a/gdb/testsuite/gdb.arch/alpha-step.exp
+++ b/gdb/testsuite/gdb.arch/alpha-step.exp
@@ -38,7 +38,6 @@ proc test_stepi {function } {
     # of the previous tests, this makes sure that it doesn't affect
     # this series of tests.
     if ![runto_main] then {
-        fail "can't run to main"
         return 0
     }
 
diff --git a/gdb/testsuite/gdb.arch/altivec-abi.exp b/gdb/testsuite/gdb.arch/altivec-abi.exp
index f1306994055..24e3eb35010 100644
--- a/gdb/testsuite/gdb.arch/altivec-abi.exp
+++ b/gdb/testsuite/gdb.arch/altivec-abi.exp
@@ -62,7 +62,6 @@ proc altivec_abi_tests { extra_flags force_abi } {
 
     # Run to `main' where we begin our tests.
     if ![runto_main] then {
-	untested "could not run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.arch/altivec-regs.exp b/gdb/testsuite/gdb.arch/altivec-regs.exp
index 620b0f730c1..d0f27e26944 100644
--- a/gdb/testsuite/gdb.arch/altivec-regs.exp
+++ b/gdb/testsuite/gdb.arch/altivec-regs.exp
@@ -58,7 +58,6 @@ gdb_load ${binfile}
 #
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp b/gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp
index 5a902b558a2..852eca0a09d 100644
--- a/gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp
+++ b/gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp
@@ -26,7 +26,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.arch/amd64-byte.exp b/gdb/testsuite/gdb.arch/amd64-byte.exp
index 91c4c976083..7187c21f457 100644
--- a/gdb/testsuite/gdb.arch/amd64-byte.exp
+++ b/gdb/testsuite/gdb.arch/amd64-byte.exp
@@ -38,7 +38,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 clean_restart ${binfile}
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
index 469c6f4cd70..73bbd1bc842 100644
--- a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
+++ b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
@@ -43,7 +43,6 @@ gdb_test "set displaced-stepping on" ""
 gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step.exp b/gdb/testsuite/gdb.arch/amd64-disp-step.exp
index 7984d91789f..f30f29ea578 100644
--- a/gdb/testsuite/gdb.arch/amd64-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/amd64-disp-step.exp
@@ -36,7 +36,6 @@ gdb_test "set displaced-stepping on" ""
 gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/amd64-dword.exp b/gdb/testsuite/gdb.arch/amd64-dword.exp
index 3d60f0714c3..920ec5aa5ef 100644
--- a/gdb/testsuite/gdb.arch/amd64-dword.exp
+++ b/gdb/testsuite/gdb.arch/amd64-dword.exp
@@ -38,7 +38,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 clean_restart ${binfile}
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/amd64-gs_base.exp b/gdb/testsuite/gdb.arch/amd64-gs_base.exp
index 07192697404..136b95acc9e 100644
--- a/gdb/testsuite/gdb.arch/amd64-gs_base.exp
+++ b/gdb/testsuite/gdb.arch/amd64-gs_base.exp
@@ -26,7 +26,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.arch/amd64-init-x87-values.exp b/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
index 1a748694e37..195cc01a455 100644
--- a/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
+++ b/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
@@ -46,7 +46,6 @@ proc_with_prefix check_x87_regs_around_init {} {
 
     # Get things started.
     if ![runto_main] then {
-	fail "can't run to main"
 	return 0
     }
 
@@ -121,7 +120,6 @@ proc_with_prefix check_setting_mxcsr_before_enable {} {
     clean_restart ${binfile}
 
     if ![runto_main] then {
-	fail "can't run to main"
 	return 0
     }
 
@@ -156,7 +154,6 @@ proc_with_prefix check_setting_x87_regs_before_enable {} {
     clean_restart ${binfile}
 
     if ![runto_main] then {
-	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp b/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
index 7338dfe019e..d7e74db11e3 100644
--- a/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
+++ b/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
@@ -21,7 +21,6 @@ if { ![istarget "x86_64-*-*"] || ![is_lp64_target] } {
 proc test_probe { probe_name } {
     with_test_prefix "probe: ${probe_name}" {
 	if { ![runto "-pstap $probe_name"] } {
-	    fail "run to probe $probe_name"
 	    return
 	}
 
diff --git a/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp b/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp
index 3009b5c1b03..62bd488093a 100644
--- a/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp
+++ b/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp
@@ -26,7 +26,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
 
 proc goto_probe { probe_name } {
     if { ![runto "-pstap $probe_name"] } {
-	fail "run to probe $probe_name"
 	return
     }
 }
diff --git a/gdb/testsuite/gdb.arch/amd64-word.exp b/gdb/testsuite/gdb.arch/amd64-word.exp
index 02978640e85..ed7f0f319ac 100644
--- a/gdb/testsuite/gdb.arch/amd64-word.exp
+++ b/gdb/testsuite/gdb.arch/amd64-word.exp
@@ -38,7 +38,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 clean_restart ${binfile}
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/arc-analyze-prologue.exp b/gdb/testsuite/gdb.arch/arc-analyze-prologue.exp
index abc3487b7b2..3794f9914ec 100644
--- a/gdb/testsuite/gdb.arch/arc-analyze-prologue.exp
+++ b/gdb/testsuite/gdb.arch/arc-analyze-prologue.exp
@@ -27,7 +27,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
 }
 
 if ![runto_main] {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/arc-decode-insn.exp b/gdb/testsuite/gdb.arch/arc-decode-insn.exp
index 73d3fc4b146..17b11f3f097 100644
--- a/gdb/testsuite/gdb.arch/arc-decode-insn.exp
+++ b/gdb/testsuite/gdb.arch/arc-decode-insn.exp
@@ -43,7 +43,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
 }
 
 if ![runto_main] {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp b/gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp
index eb013b97d9c..14121bc0815 100644
--- a/gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp
+++ b/gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp
@@ -25,7 +25,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.arch/arm-disp-step.exp b/gdb/testsuite/gdb.arch/arm-disp-step.exp
index b082bb3923f..f4cd26a65c8 100644
--- a/gdb/testsuite/gdb.arch/arm-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/arm-disp-step.exp
@@ -410,7 +410,6 @@ proc test_add_rn_pc {} {
 gdb_test_no_output "set displaced-stepping off"
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/arm-neon.exp b/gdb/testsuite/gdb.arch/arm-neon.exp
index ed34f5d7655..75ccd2743f9 100644
--- a/gdb/testsuite/gdb.arch/arm-neon.exp
+++ b/gdb/testsuite/gdb.arch/arm-neon.exp
@@ -32,7 +32,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug quie
 }
 
 if ![runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp b/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp
index 44e9dd906b8..49208e8e2bd 100644
--- a/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp
+++ b/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp
@@ -30,7 +30,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/e500-abi.exp b/gdb/testsuite/gdb.arch/e500-abi.exp
index cbe9e9b326a..21333b67df1 100644
--- a/gdb/testsuite/gdb.arch/e500-abi.exp
+++ b/gdb/testsuite/gdb.arch/e500-abi.exp
@@ -46,7 +46,6 @@ gdb_load ${binfile}
 #
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/e500-regs.exp b/gdb/testsuite/gdb.arch/e500-regs.exp
index 59926f58784..c3d4038bf61 100644
--- a/gdb/testsuite/gdb.arch/e500-regs.exp
+++ b/gdb/testsuite/gdb.arch/e500-regs.exp
@@ -45,7 +45,6 @@ gdb_load ${binfile}
 #
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
@@ -146,7 +145,6 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
index 8f4e34b5aed..00c7acced19 100644
--- a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
+++ b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
@@ -27,7 +27,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -51,7 +50,6 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 clean_restart ${executable}
 
 if ![runto_main] {
-    fail "can't run to main for ftrace tests"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/gdb1291.exp b/gdb/testsuite/gdb.arch/gdb1291.exp
index ea151627abd..a6097b8869b 100644
--- a/gdb/testsuite/gdb.arch/gdb1291.exp
+++ b/gdb/testsuite/gdb.arch/gdb1291.exp
@@ -47,7 +47,6 @@ gdb_load ${binfile}
 #
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/gdb1431.exp b/gdb/testsuite/gdb.arch/gdb1431.exp
index 01cbea82826..464a8880820 100644
--- a/gdb/testsuite/gdb.arch/gdb1431.exp
+++ b/gdb/testsuite/gdb.arch/gdb1431.exp
@@ -49,7 +49,6 @@ gdb_load ${binfile}
 #
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-avx.exp b/gdb/testsuite/gdb.arch/i386-avx.exp
index 93e86eeb23e..1b61a65d605 100644
--- a/gdb/testsuite/gdb.arch/i386-avx.exp
+++ b/gdb/testsuite/gdb.arch/i386-avx.exp
@@ -48,7 +48,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 clean_restart ${binfile}
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
@@ -101,7 +100,6 @@ with_test_prefix "force-disable xml descriptions" {
 	}
 
 	if ![runto_main] then {
-	    fail "run to main"
 	    return
 	}
 
diff --git a/gdb/testsuite/gdb.arch/i386-avx512.exp b/gdb/testsuite/gdb.arch/i386-avx512.exp
index c801206805c..74ad9a168d6 100644
--- a/gdb/testsuite/gdb.arch/i386-avx512.exp
+++ b/gdb/testsuite/gdb.arch/i386-avx512.exp
@@ -34,7 +34,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.arch/i386-byte.exp b/gdb/testsuite/gdb.arch/i386-byte.exp
index aa1096ad975..4b68f020600 100644
--- a/gdb/testsuite/gdb.arch/i386-byte.exp
+++ b/gdb/testsuite/gdb.arch/i386-byte.exp
@@ -38,7 +38,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 clean_restart ${binfile}
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-disp-step.exp b/gdb/testsuite/gdb.arch/i386-disp-step.exp
index 560bf96d147..f48f3b228a4 100644
--- a/gdb/testsuite/gdb.arch/i386-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/i386-disp-step.exp
@@ -33,7 +33,6 @@ gdb_test "set displaced-stepping on" ""
 gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
index 22d98c34c9b..a3745b773fa 100644
--- a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
+++ b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
@@ -30,7 +30,6 @@ if [prepare_for_testing "failed to prepare" ${binfile} ${srcfile} {debug $additi
 }
 
 if ![runto_main] then {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-float.exp b/gdb/testsuite/gdb.arch/i386-float.exp
index 0860269423d..b96ff2ba13e 100644
--- a/gdb/testsuite/gdb.arch/i386-float.exp
+++ b/gdb/testsuite/gdb.arch/i386-float.exp
@@ -33,7 +33,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile [list debug nop
 }
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-mpx-call.exp b/gdb/testsuite/gdb.arch/i386-mpx-call.exp
index 360cc68295a..6798079d1dd 100644
--- a/gdb/testsuite/gdb.arch/i386-mpx-call.exp
+++ b/gdb/testsuite/gdb.arch/i386-mpx-call.exp
@@ -38,7 +38,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.arch/i386-mpx-map.exp b/gdb/testsuite/gdb.arch/i386-mpx-map.exp
index 55b70d1de0f..96631743ab6 100644
--- a/gdb/testsuite/gdb.arch/i386-mpx-map.exp
+++ b/gdb/testsuite/gdb.arch/i386-mpx-map.exp
@@ -40,7 +40,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.arch/i386-mpx-sigsegv.exp b/gdb/testsuite/gdb.arch/i386-mpx-sigsegv.exp
index ef8fd68486b..43d18a602b5 100644
--- a/gdb/testsuite/gdb.arch/i386-mpx-sigsegv.exp
+++ b/gdb/testsuite/gdb.arch/i386-mpx-sigsegv.exp
@@ -40,7 +40,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.arch/i386-mpx-simple_segv.exp b/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp
index e5b2a890f3c..a5d9946522c 100644
--- a/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp
+++ b/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp
@@ -46,7 +46,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 }
 
 if ![runto_main] {
-    untested "could not run to main"
     return -1
 }
 
@@ -64,7 +63,6 @@ set segv_with_exit "Program received signal SIGSEGV,\
 set parameters "print pass stop"
 with_test_prefix "$parameters" {
     if ![runto_main] {
-        fail "could not run to main"
         return -1
     }
 
@@ -84,7 +82,6 @@ with_test_prefix "$parameters" {
 set parameters "print pass nostop"
 with_test_prefix "$parameters" {
     if ![runto_main] {
-        fail "could not run to main"
         return -1
     }
 
@@ -103,7 +100,6 @@ with_test_prefix "$parameters" {
 set parameters "print nopass stop"
 with_test_prefix "$parameters" {
     if ![runto_main] {
-        fail "could not run to main"
         return -1
     }
 
@@ -123,7 +119,6 @@ with_test_prefix "$parameters" {
 set parameters "noprint pass nostop"
 with_test_prefix "$parameters" {
     if ![runto_main] {
-        fail "could not run to main"
         return -1
     }
 
diff --git a/gdb/testsuite/gdb.arch/i386-mpx.exp b/gdb/testsuite/gdb.arch/i386-mpx.exp
index a6b74ceda6b..520fd10a240 100644
--- a/gdb/testsuite/gdb.arch/i386-mpx.exp
+++ b/gdb/testsuite/gdb.arch/i386-mpx.exp
@@ -44,7 +44,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.arch/i386-pkru.exp b/gdb/testsuite/gdb.arch/i386-pkru.exp
index 5732bba6e97..f15e8ce89b0 100644
--- a/gdb/testsuite/gdb.arch/i386-pkru.exp
+++ b/gdb/testsuite/gdb.arch/i386-pkru.exp
@@ -29,7 +29,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.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp
index 053c6d3dbe2..b3428eaf9e5 100644
--- a/gdb/testsuite/gdb.arch/i386-prologue.exp
+++ b/gdb/testsuite/gdb.arch/i386-prologue.exp
@@ -66,7 +66,6 @@ gdb_load ${binfile}
 #
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-sse.exp b/gdb/testsuite/gdb.arch/i386-sse.exp
index fca90256505..1ee3a8444b3 100644
--- a/gdb/testsuite/gdb.arch/i386-sse.exp
+++ b/gdb/testsuite/gdb.arch/i386-sse.exp
@@ -43,7 +43,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 clean_restart ${binfile}
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-word.exp b/gdb/testsuite/gdb.arch/i386-word.exp
index fc27c6b3866..101b75d0abb 100644
--- a/gdb/testsuite/gdb.arch/i386-word.exp
+++ b/gdb/testsuite/gdb.arch/i386-word.exp
@@ -38,7 +38,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 clean_restart ${binfile}
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp b/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
index 2ecbac0450a..7be220534e1 100644
--- a/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
+++ b/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
@@ -33,7 +33,6 @@ gdb_load ${binfile}
 
 # 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.arch/iwmmxt-regs.exp b/gdb/testsuite/gdb.arch/iwmmxt-regs.exp
index 92629d09ae8..75ab890a2d0 100644
--- a/gdb/testsuite/gdb.arch/iwmmxt-regs.exp
+++ b/gdb/testsuite/gdb.arch/iwmmxt-regs.exp
@@ -41,7 +41,6 @@ gdb_load ${binfile}
 #
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/mips16-thunks.exp b/gdb/testsuite/gdb.arch/mips16-thunks.exp
index bfa6b244dff..794942a0ab0 100644
--- a/gdb/testsuite/gdb.arch/mips16-thunks.exp
+++ b/gdb/testsuite/gdb.arch/mips16-thunks.exp
@@ -190,7 +190,6 @@ set options [list debug nowarnings]
 gdb_compile ${objfiles} ${binfile} executable ${options}
 clean_restart ${testname}
 if ![runto_main] then {
-    fail "running test program, MIPS16 thunk tests aborted"
     return
 }
 
diff --git a/gdb/testsuite/gdb.arch/pa-nullify.exp b/gdb/testsuite/gdb.arch/pa-nullify.exp
index 229206efeaa..3e5ce14a6ea 100644
--- a/gdb/testsuite/gdb.arch/pa-nullify.exp
+++ b/gdb/testsuite/gdb.arch/pa-nullify.exp
@@ -89,7 +89,6 @@ proc get_addr_of_sym { sym } {
 }
 
 if  ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
@@ -126,7 +125,6 @@ proc test_core_bt { test } {
 
 set test "core at last insn in foo"
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 gdb_breakpoint "*$foo_last"
@@ -137,7 +135,6 @@ if [gen_core $test] {
 
 set test "core at nullified insn"
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 gdb_breakpoint "*$foo_last"
diff --git a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
index 97335a55d10..bb9d55f133e 100644
--- a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
@@ -40,7 +40,6 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
 if { ![runto_main] } then {
-   fail "run to main"
    return
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp b/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp
index 5a72e61d341..76ae9b24908 100644
--- a/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp
@@ -40,7 +40,6 @@ if {[build_executable "compile" $binfile $gen_src] == -1} {
 clean_restart $binfile
 
 if ![runto_main] then {
-    fail "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-prologue.exp b/gdb/testsuite/gdb.arch/powerpc-prologue.exp
index dcf56b2f16f..a428ea21205 100644
--- a/gdb/testsuite/gdb.arch/powerpc-prologue.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-prologue.exp
@@ -44,7 +44,6 @@ gdb_load ${binfile}
 #
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp b/gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp
index 7c4668e285c..7b01822f7e0 100644
--- a/gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp
@@ -40,7 +40,6 @@ if {[build_executable "compile" $binfile $gen_src] == -1} {
 clean_restart $binfile
 
 if ![runto_main] then {
-    fail "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc64-prologue.exp b/gdb/testsuite/gdb.arch/powerpc64-prologue.exp
index 4b01dec9ac6..ad962e20d09 100644
--- a/gdb/testsuite/gdb.arch/powerpc64-prologue.exp
+++ b/gdb/testsuite/gdb.arch/powerpc64-prologue.exp
@@ -38,7 +38,6 @@ if { [prepare_for_testing "failed to prepare" $testfile "$srcfile" \
 
 # Run to `main' where we begin our tests.
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp b/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
index 0a73660bf39..36150e9fce5 100644
--- a/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
+++ b/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
@@ -37,7 +37,6 @@ proc do_test { displaced } {
     global decimal hex
 
     if ![runto_main] then {
-	untested "could not run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp b/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
index acda961380d..b9d3c6591e5 100644
--- a/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
+++ b/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
@@ -41,7 +41,6 @@ proc do_test { displaced } {
     global gdb_prompt inferior_exited_re srcfile srcfile2
 
     if ![runto_main] then {
-	untested "could not run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.arch/riscv-bp-infcall.exp b/gdb/testsuite/gdb.arch/riscv-bp-infcall.exp
index b90eb28517a..b70a1fb002a 100644
--- a/gdb/testsuite/gdb.arch/riscv-bp-infcall.exp
+++ b/gdb/testsuite/gdb.arch/riscv-bp-infcall.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.arch/riscv-reg-aliases.exp b/gdb/testsuite/gdb.arch/riscv-reg-aliases.exp
index 65f68d6c6a5..74b9145a9fe 100644
--- a/gdb/testsuite/gdb.arch/riscv-reg-aliases.exp
+++ b/gdb/testsuite/gdb.arch/riscv-reg-aliases.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.arch/riscv-tdesc-regs.exp b/gdb/testsuite/gdb.arch/riscv-tdesc-regs.exp
index 63721aee178..369d20964b4 100644
--- a/gdb/testsuite/gdb.arch/riscv-tdesc-regs.exp
+++ b/gdb/testsuite/gdb.arch/riscv-tdesc-regs.exp
@@ -31,7 +31,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 }
 
 if { ![runto_main] } {
-    untested "failed to runto main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/riscv-unwind-long-insn.exp b/gdb/testsuite/gdb.arch/riscv-unwind-long-insn.exp
index ee5dea05636..7bb100fd70c 100644
--- a/gdb/testsuite/gdb.arch/riscv-unwind-long-insn.exp
+++ b/gdb/testsuite/gdb.arch/riscv-unwind-long-insn.exp
@@ -38,7 +38,6 @@ foreach_with_prefix {insn_size} {6 8} {
     }
 
     if ![runto_main] then {
-	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-ld-lw.exp b/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-ld-lw.exp
index f559c3ff4bc..b129704121b 100644
--- a/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-ld-lw.exp
+++ b/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-ld-lw.exp
@@ -29,7 +29,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.arch/s390-tdbregs.exp b/gdb/testsuite/gdb.arch/s390-tdbregs.exp
index 4b7704a9879..1ea7ca2b2be 100644
--- a/gdb/testsuite/gdb.arch/s390-tdbregs.exp
+++ b/gdb/testsuite/gdb.arch/s390-tdbregs.exp
@@ -36,7 +36,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.arch/s390-vregs.exp b/gdb/testsuite/gdb.arch/s390-vregs.exp
index 97d11e08d76..2ef55dfb611 100644
--- a/gdb/testsuite/gdb.arch/s390-vregs.exp
+++ b/gdb/testsuite/gdb.arch/s390-vregs.exp
@@ -35,7 +35,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.arch/sparc64-adi.exp b/gdb/testsuite/gdb.arch/sparc64-adi.exp
index 13abc0f0460..5c9b5379290 100644
--- a/gdb/testsuite/gdb.arch/sparc64-adi.exp
+++ b/gdb/testsuite/gdb.arch/sparc64-adi.exp
@@ -31,7 +31,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 }
 
 if ![runto_main] then {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/sparc64-regs.exp b/gdb/testsuite/gdb.arch/sparc64-regs.exp
index b5688895634..bf5dcb9c31b 100644
--- a/gdb/testsuite/gdb.arch/sparc64-regs.exp
+++ b/gdb/testsuite/gdb.arch/sparc64-regs.exp
@@ -30,7 +30,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 }
 
 if ![runto_main] then {
-    untested "could not run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
index cc818390a8b..8980a41f04a 100644
--- a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
+++ b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
@@ -29,7 +29,6 @@ if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] {
 }
 
 if ![runto_main] then {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/thumb-prologue.exp b/gdb/testsuite/gdb.arch/thumb-prologue.exp
index 5cd92839eb4..f8b1b610710 100644
--- a/gdb/testsuite/gdb.arch/thumb-prologue.exp
+++ b/gdb/testsuite/gdb.arch/thumb-prologue.exp
@@ -40,7 +40,6 @@ gdb_load ${binfile}
 #
 
 if ![runto_main] then {
-    untested "ARM prologue tests"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/thumb-singlestep.exp b/gdb/testsuite/gdb.arch/thumb-singlestep.exp
index 2cc79ed973f..3f0ed125ad6 100644
--- a/gdb/testsuite/gdb.arch/thumb-singlestep.exp
+++ b/gdb/testsuite/gdb.arch/thumb-singlestep.exp
@@ -29,7 +29,6 @@ if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} [list debug $
 }
 
 if ![runto_main] then {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/thumb2-it.exp b/gdb/testsuite/gdb.arch/thumb2-it.exp
index 1fa037fd38f..6d34126e688 100644
--- a/gdb/testsuite/gdb.arch/thumb2-it.exp
+++ b/gdb/testsuite/gdb.arch/thumb2-it.exp
@@ -33,7 +33,6 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
 if ![runto_main] then {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/vsx-regs.exp b/gdb/testsuite/gdb.arch/vsx-regs.exp
index 44ed993f127..1cdf92dc2c3 100644
--- a/gdb/testsuite/gdb.arch/vsx-regs.exp
+++ b/gdb/testsuite/gdb.arch/vsx-regs.exp
@@ -53,7 +53,6 @@ gdb_load ${binfile}
 # Run to `main' where we begin our tests.
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp b/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp
index cefe43ccab7..0eaddce5e4a 100644
--- a/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp
+++ b/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp
@@ -53,7 +53,6 @@ gdb_load ${binfile}
 # Run to `main' where we begin our tests.
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/x86-avx512bf16.exp b/gdb/testsuite/gdb.arch/x86-avx512bf16.exp
index 528e79f02df..25a8c8079c6 100644
--- a/gdb/testsuite/gdb.arch/x86-avx512bf16.exp
+++ b/gdb/testsuite/gdb.arch/x86-avx512bf16.exp
@@ -30,7 +30,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 }
 
 if { ![runto_main] } {
-    unsupported "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp b/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp
index 61cd189a3dd..a156cba5c09 100644
--- a/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp
+++ b/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp
@@ -28,7 +28,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 }
 
 if { ![runto_main] } {
-    unsupported "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/x86-avx512fp16.exp b/gdb/testsuite/gdb.arch/x86-avx512fp16.exp
index 22575cc2fe8..2e2c255e769 100644
--- a/gdb/testsuite/gdb.arch/x86-avx512fp16.exp
+++ b/gdb/testsuite/gdb.arch/x86-avx512fp16.exp
@@ -27,7 +27,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 }
 
 if { ![runto_main] } {
-    unsupported "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp
index d188c711b83..c4691ee8412 100644
--- a/gdb/testsuite/gdb.asm/asm-source.exp
+++ b/gdb/testsuite/gdb.asm/asm-source.exp
@@ -285,7 +285,6 @@ gdb_load ${binfile}
 #
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
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 b17a7842d5f..c080d60a420 100644
--- a/gdb/testsuite/gdb.base/info-os.exp
+++ b/gdb/testsuite/gdb.base/info-os.exp
@@ -34,7 +34,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
     }
 
diff --git a/gdb/testsuite/gdb.btrace/buffer-size.exp b/gdb/testsuite/gdb.btrace/buffer-size.exp
index ea4e36c1593..04bf523d7cb 100644
--- a/gdb/testsuite/gdb.btrace/buffer-size.exp
+++ b/gdb/testsuite/gdb.btrace/buffer-size.exp
@@ -28,7 +28,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.btrace/data.exp b/gdb/testsuite/gdb.btrace/data.exp
index 170d4bc6210..e12e792e4a2 100644
--- a/gdb/testsuite/gdb.btrace/data.exp
+++ b/gdb/testsuite/gdb.btrace/data.exp
@@ -28,7 +28,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.btrace/delta.exp b/gdb/testsuite/gdb.btrace/delta.exp
index 0d61e9aa54e..5e0ffefd4e0 100644
--- a/gdb/testsuite/gdb.btrace/delta.exp
+++ b/gdb/testsuite/gdb.btrace/delta.exp
@@ -28,7 +28,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.btrace/dlopen.exp b/gdb/testsuite/gdb.btrace/dlopen.exp
index 6e717aa862b..ad77dabe638 100644
--- a/gdb/testsuite/gdb.btrace/dlopen.exp
+++ b/gdb/testsuite/gdb.btrace/dlopen.exp
@@ -42,7 +42,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.btrace/enable-new-thread.exp b/gdb/testsuite/gdb.btrace/enable-new-thread.exp
index 5000ae56212..d718e857312 100644
--- a/gdb/testsuite/gdb.btrace/enable-new-thread.exp
+++ b/gdb/testsuite/gdb.btrace/enable-new-thread.exp
@@ -28,7 +28,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}]
 }
 
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.btrace/enable-running.exp b/gdb/testsuite/gdb.btrace/enable-running.exp
index 08d682e4f70..d8ac675737c 100644
--- a/gdb/testsuite/gdb.btrace/enable-running.exp
+++ b/gdb/testsuite/gdb.btrace/enable-running.exp
@@ -33,7 +33,6 @@ save_vars { GDBFLAGS } {
 }
 
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.btrace/enable.exp b/gdb/testsuite/gdb.btrace/enable.exp
index fdfdce3fc22..ecec5f59dde 100644
--- a/gdb/testsuite/gdb.btrace/enable.exp
+++ b/gdb/testsuite/gdb.btrace/enable.exp
@@ -43,7 +43,6 @@ if [prepare_for_testing "failed to prepare" $testfile {} {debug}] {
 }
 
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 
@@ -86,23 +85,19 @@ if [skip_gdbserver_tests] {
 }
 clean_restart $testfile
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 
 # make sure record-btrace can be enabled after re-run
 clean_restart $testfile
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 gdb_test_no_output "record btrace" "enable after restart"
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 gdb_test_no_output "record btrace" "enable after re-run"
diff --git a/gdb/testsuite/gdb.btrace/exception.exp b/gdb/testsuite/gdb.btrace/exception.exp
index 7b840e41bfc..ea8ccafc2c4 100755
--- a/gdb/testsuite/gdb.btrace/exception.exp
+++ b/gdb/testsuite/gdb.btrace/exception.exp
@@ -31,7 +31,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.btrace/function_call_history.exp b/gdb/testsuite/gdb.btrace/function_call_history.exp
index f995016fafa..284928a9722 100644
--- a/gdb/testsuite/gdb.btrace/function_call_history.exp
+++ b/gdb/testsuite/gdb.btrace/function_call_history.exp
@@ -30,7 +30,6 @@ if [prepare_for_testing "failed to prepare" $testfile {} {nopie debug}] {
 }
 
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 
@@ -231,7 +230,6 @@ gdb_test "record function-call-history /c 21, +11" [multi_line \
 
 # make sure we can handle incomplete trace with respect to indentation
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 # navigate to the fib in line 24 above
diff --git a/gdb/testsuite/gdb.btrace/gcore.exp b/gdb/testsuite/gdb.btrace/gcore.exp
index b0bc32f395d..3d12f6e28a8 100644
--- a/gdb/testsuite/gdb.btrace/gcore.exp
+++ b/gdb/testsuite/gdb.btrace/gcore.exp
@@ -28,7 +28,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.btrace/instruction_history.exp b/gdb/testsuite/gdb.btrace/instruction_history.exp
index 403085c083f..031ed25c06e 100644
--- a/gdb/testsuite/gdb.btrace/instruction_history.exp
+++ b/gdb/testsuite/gdb.btrace/instruction_history.exp
@@ -28,7 +28,6 @@ if [prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" {debu
 }
 
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.btrace/multi-inferior.exp b/gdb/testsuite/gdb.btrace/multi-inferior.exp
index 1e028e1e994..cf02f5f2430 100644
--- a/gdb/testsuite/gdb.btrace/multi-inferior.exp
+++ b/gdb/testsuite/gdb.btrace/multi-inferior.exp
@@ -39,7 +39,6 @@ if [prepare_for_testing "failed to prepare" $testfile {} {debug}] {
 
 with_test_prefix "inferior 1" {
     if ![runto_main] {
-	untested "failed to run to main"
 	return -1
     }
 }
@@ -50,7 +49,6 @@ with_test_prefix "inferior 2" {
     gdb_test "inferior 2" "Switching to inferior 2.*"
 
     if ![runto_main] {
-	untested "inferior 2: failed to run to main"
 	return -1
     }
 
@@ -70,7 +68,6 @@ with_test_prefix "inferior 3" {
     gdb_test "inferior 3" "Switching to inferior 3.*"
 
     if ![runto_main] {
-	untested "inferior 3: failed to run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.btrace/multi-thread-step.exp b/gdb/testsuite/gdb.btrace/multi-thread-step.exp
index 4ab44824ed8..1df27c27ffe 100644
--- a/gdb/testsuite/gdb.btrace/multi-thread-step.exp
+++ b/gdb/testsuite/gdb.btrace/multi-thread-step.exp
@@ -30,7 +30,6 @@ if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable {debu
 clean_restart $testfile
 
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.btrace/nohist.exp b/gdb/testsuite/gdb.btrace/nohist.exp
index 591c721d187..d7eb7af29f3 100644
--- a/gdb/testsuite/gdb.btrace/nohist.exp
+++ b/gdb/testsuite/gdb.btrace/nohist.exp
@@ -28,7 +28,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.btrace/non-stop.exp b/gdb/testsuite/gdb.btrace/non-stop.exp
index e509d65d660..6f762639595 100644
--- a/gdb/testsuite/gdb.btrace/non-stop.exp
+++ b/gdb/testsuite/gdb.btrace/non-stop.exp
@@ -32,7 +32,6 @@ save_vars { GDBFLAGS } {
 }
 
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.btrace/record_goto-step.exp b/gdb/testsuite/gdb.btrace/record_goto-step.exp
index fd3b87f995a..27f4c49bb4e 100644
--- a/gdb/testsuite/gdb.btrace/record_goto-step.exp
+++ b/gdb/testsuite/gdb.btrace/record_goto-step.exp
@@ -28,7 +28,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.btrace/record_goto.exp b/gdb/testsuite/gdb.btrace/record_goto.exp
index 75d76da1c7f..3cde516b82c 100644
--- a/gdb/testsuite/gdb.btrace/record_goto.exp
+++ b/gdb/testsuite/gdb.btrace/record_goto.exp
@@ -51,7 +51,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] {
 }
 
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp b/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
index 204e88093a4..9063f9144dd 100644
--- a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
+++ b/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
@@ -33,7 +33,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.btrace/segv.exp b/gdb/testsuite/gdb.btrace/segv.exp
index a505b347feb..5730697cc6e 100644
--- a/gdb/testsuite/gdb.btrace/segv.exp
+++ b/gdb/testsuite/gdb.btrace/segv.exp
@@ -27,7 +27,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
     return -1
 }
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.btrace/step.exp b/gdb/testsuite/gdb.btrace/step.exp
index 5091867463b..59751c11575 100644
--- a/gdb/testsuite/gdb.btrace/step.exp
+++ b/gdb/testsuite/gdb.btrace/step.exp
@@ -28,7 +28,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.btrace/stepi.exp b/gdb/testsuite/gdb.btrace/stepi.exp
index 480c08c4875..11051b5cef0 100644
--- a/gdb/testsuite/gdb.btrace/stepi.exp
+++ b/gdb/testsuite/gdb.btrace/stepi.exp
@@ -49,7 +49,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.btrace/tailcall-only.exp b/gdb/testsuite/gdb.btrace/tailcall-only.exp
index 510f90c9d5e..2f9c3ed7807 100644
--- a/gdb/testsuite/gdb.btrace/tailcall-only.exp
+++ b/gdb/testsuite/gdb.btrace/tailcall-only.exp
@@ -53,7 +53,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] {
 }
 
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.btrace/tailcall.exp b/gdb/testsuite/gdb.btrace/tailcall.exp
index 07a3ec103f4..95bc8c7d0e5 100644
--- a/gdb/testsuite/gdb.btrace/tailcall.exp
+++ b/gdb/testsuite/gdb.btrace/tailcall.exp
@@ -49,7 +49,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] {
     return -1
 }
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.btrace/tsx.exp b/gdb/testsuite/gdb.btrace/tsx.exp
index 66f6305e50a..401b1fafe93 100644
--- a/gdb/testsuite/gdb.btrace/tsx.exp
+++ b/gdb/testsuite/gdb.btrace/tsx.exp
@@ -31,7 +31,6 @@ if [prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" {debu
 }
 
 if ![runto_main] {
-    untested "failed to run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.btrace/unknown_functions.exp b/gdb/testsuite/gdb.btrace/unknown_functions.exp
index dc52d75c0f3..0226c135583 100644
--- a/gdb/testsuite/gdb.btrace/unknown_functions.exp
+++ b/gdb/testsuite/gdb.btrace/unknown_functions.exp
@@ -34,7 +34,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile \
 }
 
 if ![runto test] {
-    untested "failed to run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.btrace/vdso.exp b/gdb/testsuite/gdb.btrace/vdso.exp
index 245536af0c2..de484f2a03f 100644
--- a/gdb/testsuite/gdb.btrace/vdso.exp
+++ b/gdb/testsuite/gdb.btrace/vdso.exp
@@ -31,7 +31,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.compile/compile-cplus-anonymous.exp b/gdb/testsuite/gdb.compile/compile-cplus-anonymous.exp
index 497c5ceaf9e..572206f5f57 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-anonymous.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-anonymous.exp
@@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
 }
 
 if {![runto_main]} {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp b/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp
index 3c803b78589..27b713b90a0 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp
@@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
 }
 
 if {![runto_main]} {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp b/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp
index e5c9c035962..de7c3511b99 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp
@@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
 }
 
 if {![runto_main]} {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-member.exp b/gdb/testsuite/gdb.compile/compile-cplus-member.exp
index f6f570d7e3b..a702a25250b 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-member.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-member.exp
@@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
 }
 
 if {![runto_main]} {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-method.exp b/gdb/testsuite/gdb.compile/compile-cplus-method.exp
index 5fe026acadd..1c020aa9b10 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-method.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-method.exp
@@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
 }
 
 if {![runto_main]} {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp b/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp
index 9d60290078b..75637843a93 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp
@@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
 }
 
 if {![runto_main]} {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-nested.exp b/gdb/testsuite/gdb.compile/compile-cplus-nested.exp
index d4183324c46..dc8e1d2cb16 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-nested.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-nested.exp
@@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
 }
 
 if {![runto_main]} {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp b/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp
index 745589beeea..b57d59bb0b5 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp
@@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
 }
 
 if {![runto_main]} {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.compile/compile-tls.exp b/gdb/testsuite/gdb.compile/compile-tls.exp
index f65652ffcda..980cfda07e5 100644
--- a/gdb/testsuite/gdb.compile/compile-tls.exp
+++ b/gdb/testsuite/gdb.compile/compile-tls.exp
@@ -22,7 +22,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 
 clean_restart ${binfile}
 if ![runto_main] then {
-   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.cp/abstract-origin.exp b/gdb/testsuite/gdb.cp/abstract-origin.exp
index 4512a79d458..6c5e489d514 100644
--- a/gdb/testsuite/gdb.cp/abstract-origin.exp
+++ b/gdb/testsuite/gdb.cp/abstract-origin.exp
@@ -20,7 +20,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 }
 
 if ![runto_main] {
-    untested abstract-origin
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/baseenum.exp b/gdb/testsuite/gdb.cp/baseenum.exp
index 0ad9ae5ab3e..0fa8ef7704b 100644
--- a/gdb/testsuite/gdb.cp/baseenum.exp
+++ b/gdb/testsuite/gdb.cp/baseenum.exp
@@ -22,7 +22,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 }
 
 if {![runto_main]} {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/call-method-register.exp b/gdb/testsuite/gdb.cp/call-method-register.exp
index bcd8e17f4f0..f3c666e5d8e 100644
--- a/gdb/testsuite/gdb.cp/call-method-register.exp
+++ b/gdb/testsuite/gdb.cp/call-method-register.exp
@@ -30,7 +30,6 @@ proc test_call_register_class {} {
     global gdb_prompt
 
     if ![runto_main] {
-	fail "couldn't run to main"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.cp/cplabel.exp b/gdb/testsuite/gdb.cp/cplabel.exp
index 10ba4010793..e8f9211a410 100644
--- a/gdb/testsuite/gdb.cp/cplabel.exp
+++ b/gdb/testsuite/gdb.cp/cplabel.exp
@@ -24,7 +24,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {c++ debug}]} {
 }
 
 if {![runto_main]} {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/destrprint.exp b/gdb/testsuite/gdb.cp/destrprint.exp
index a4e7b115afd..81ed309d91f 100644
--- a/gdb/testsuite/gdb.cp/destrprint.exp
+++ b/gdb/testsuite/gdb.cp/destrprint.exp
@@ -20,7 +20,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 }
 
 if ![runto_main] {
-    untested destrprint
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/ena-dis-br-range.exp b/gdb/testsuite/gdb.cp/ena-dis-br-range.exp
index f2ccaab6a6e..ced186a46e8 100644
--- a/gdb/testsuite/gdb.cp/ena-dis-br-range.exp
+++ b/gdb/testsuite/gdb.cp/ena-dis-br-range.exp
@@ -30,7 +30,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 }
 
 if ![runto 'marker'] then {
-    fail "run to marker"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/except-multi-location.exp b/gdb/testsuite/gdb.cp/except-multi-location.exp
index 921606b3c43..f79e1c8aa96 100644
--- a/gdb/testsuite/gdb.cp/except-multi-location.exp
+++ b/gdb/testsuite/gdb.cp/except-multi-location.exp
@@ -60,7 +60,6 @@ proc test_multi_libstdcpp {static_bin static_lib} {
     gdb_load_shlib $binfile_lib
 
     if ![runto_main] {
-	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.cp/infcall-nodebug.exp.tcl b/gdb/testsuite/gdb.cp/infcall-nodebug.exp.tcl
index cb4528b97e3..4760bd05497 100644
--- a/gdb/testsuite/gdb.cp/infcall-nodebug.exp.tcl
+++ b/gdb/testsuite/gdb.cp/infcall-nodebug.exp.tcl
@@ -74,7 +74,6 @@ proc build_and_run_test { lang symbols } {
     clean_restart $binfile
 
     if ![runto_main] then {
-	fail "can't run to main"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.cp/local-static.exp b/gdb/testsuite/gdb.cp/local-static.exp
index 335c7e31130..15bb7cf8e10 100644
--- a/gdb/testsuite/gdb.cp/local-static.exp
+++ b/gdb/testsuite/gdb.cp/local-static.exp
@@ -150,7 +150,6 @@ proc do_test {lang} {
     }
 
     if ![runto_main] then {
-	fail "couldn't run to breakpoint"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.cp/mb-inline.exp b/gdb/testsuite/gdb.cp/mb-inline.exp
index e77f139f4e2..19a83302ffa 100644
--- a/gdb/testsuite/gdb.cp/mb-inline.exp
+++ b/gdb/testsuite/gdb.cp/mb-inline.exp
@@ -83,7 +83,6 @@ delete_breakpoints
 set bp_location [gdb_get_line_number "set multi-line breakpoint here" $hdrfile]
 
 if { ![runto_main] } {
-    fail "can't run to main for multi_line_foo tests."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.cp/mb-templates.exp b/gdb/testsuite/gdb.cp/mb-templates.exp
index 0a18000bdfd..3ec71fb1a29 100644
--- a/gdb/testsuite/gdb.cp/mb-templates.exp
+++ b/gdb/testsuite/gdb.cp/mb-templates.exp
@@ -112,7 +112,6 @@ delete_breakpoints
 set bp_location [gdb_get_line_number "set multi-line breakpoint here"]
 
 if { ![runto_main] } {
-    fail "can't run to main for multi_line_foo tests."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.cp/pass-by-ref-2.exp b/gdb/testsuite/gdb.cp/pass-by-ref-2.exp
index 84ee717c265..1435d718dbf 100644
--- a/gdb/testsuite/gdb.cp/pass-by-ref-2.exp
+++ b/gdb/testsuite/gdb.cp/pass-by-ref-2.exp
@@ -38,7 +38,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile $options]} {
 }
 
 if {![runto_main]} {
-    untested "failed to run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/pass-by-ref.exp b/gdb/testsuite/gdb.cp/pass-by-ref.exp
index d4a8825df8f..ff1ec56c58d 100644
--- a/gdb/testsuite/gdb.cp/pass-by-ref.exp
+++ b/gdb/testsuite/gdb.cp/pass-by-ref.exp
@@ -343,7 +343,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile $options]} {
 }
 
 if {![runto_main]} {
-    untested "failed to run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/pr10687.exp b/gdb/testsuite/gdb.cp/pr10687.exp
index 088fde3cf5d..8bc31698bc2 100644
--- a/gdb/testsuite/gdb.cp/pr10687.exp
+++ b/gdb/testsuite/gdb.cp/pr10687.exp
@@ -20,7 +20,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 }
 
 if ![runto_main] then {
-    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.cp/pr9167.exp b/gdb/testsuite/gdb.cp/pr9167.exp
index d88c75d8a12..2486b895947 100644
--- a/gdb/testsuite/gdb.cp/pr9167.exp
+++ b/gdb/testsuite/gdb.cp/pr9167.exp
@@ -26,7 +26,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
 }
 
 if ![runto_main] then {
-    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-casts.exp b/gdb/testsuite/gdb.cp/rvalue-ref-casts.exp
index b375f01ecd8..93299d17500 100644
--- a/gdb/testsuite/gdb.cp/rvalue-ref-casts.exp
+++ b/gdb/testsuite/gdb.cp/rvalue-ref-casts.exp
@@ -31,7 +31,6 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile \
 }
 
 if {![runto_main]} {
-    untested "couldn't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-types.exp b/gdb/testsuite/gdb.cp/rvalue-ref-types.exp
index 32ca8853bcc..23cdbe1f87a 100644
--- a/gdb/testsuite/gdb.cp/rvalue-ref-types.exp
+++ b/gdb/testsuite/gdb.cp/rvalue-ref-types.exp
@@ -29,12 +29,10 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile \
 # Set it up at a breakpoint so we can play with the variable values.
 #
 if {![runto_main]} {
-    untested "couldn't run to breakpoint"
     return -1
 }
 
 if {![runto 'marker1']} {
-    untested "couldn't run to marker1"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/save-bp-qualified.exp b/gdb/testsuite/gdb.cp/save-bp-qualified.exp
index d779ed683a5..bcf22f0b001 100644
--- a/gdb/testsuite/gdb.cp/save-bp-qualified.exp
+++ b/gdb/testsuite/gdb.cp/save-bp-qualified.exp
@@ -27,7 +27,6 @@ proc restart {} {
     clean_restart $testfile
 
     if ![runto_main] {
-	untested "could not run to main"
 	return 0
     }
     # Delete all breakpoints so that the "runto_main" breakpoint above
diff --git a/gdb/testsuite/gdb.cp/scope-err.exp b/gdb/testsuite/gdb.cp/scope-err.exp
index 216665ea98c..685e0bf85a4 100644
--- a/gdb/testsuite/gdb.cp/scope-err.exp
+++ b/gdb/testsuite/gdb.cp/scope-err.exp
@@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $exefile $srcfile {debug c++}]} {
 }
 
 if {![runto_main]} {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.cp/static-typedef-print.exp b/gdb/testsuite/gdb.cp/static-typedef-print.exp
index 3c8e286a1f2..b4b18bf3c05 100644
--- a/gdb/testsuite/gdb.cp/static-typedef-print.exp
+++ b/gdb/testsuite/gdb.cp/static-typedef-print.exp
@@ -26,7 +26,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 }
 
 if ![runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/step-and-next-inline.exp b/gdb/testsuite/gdb.cp/step-and-next-inline.exp
index 13d801bb539..4997abb9b1b 100644
--- a/gdb/testsuite/gdb.cp/step-and-next-inline.exp
+++ b/gdb/testsuite/gdb.cp/step-and-next-inline.exp
@@ -59,7 +59,6 @@ proc do_test { use_header } {
     with_test_prefix $prefix {
 
     if ![runto_main] {
-	fail "can't run to main"
 	return
     }
 
@@ -176,7 +175,6 @@ proc do_test { use_header } {
     clean_restart ${executable}
 
     if ![runto_main] {
-	fail "can't run to main pass 2"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.cp/typedef-base.exp b/gdb/testsuite/gdb.cp/typedef-base.exp
index 7edc1640c45..7b7bdc45097 100644
--- a/gdb/testsuite/gdb.cp/typedef-base.exp
+++ b/gdb/testsuite/gdb.cp/typedef-base.exp
@@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 }
 
 if ![runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/typeid.exp b/gdb/testsuite/gdb.cp/typeid.exp
index 1a2599fb6d0..5b9ff91bebc 100644
--- a/gdb/testsuite/gdb.cp/typeid.exp
+++ b/gdb/testsuite/gdb.cp/typeid.exp
@@ -58,7 +58,6 @@ with_test_prefix "before starting" {
 }
 
 if ![runto_main] {
-    untested typeid
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/wide_char_types.exp b/gdb/testsuite/gdb.cp/wide_char_types.exp
index 03d8502d25b..e11b11d354f 100644
--- a/gdb/testsuite/gdb.cp/wide_char_types.exp
+++ b/gdb/testsuite/gdb.cp/wide_char_types.exp
@@ -48,7 +48,6 @@ proc wide_char_types_program {lang} {
     }
 
     if ![runto_main] then {
-	fail "can't run to main"
 	return 0
     }
     do_test_wide_char $lang "u16" "u32" "wchar"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
index 5f52bc9d110..752c4842467 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
@@ -36,7 +36,6 @@ if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile {nodebug no
 }
 
 if ![runto_main] then {
-    fail "cannot run to main."
     continue
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp
index e43f59ea1ad..0320c11d9e4 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp
@@ -119,7 +119,6 @@ foreach_with_prefix ranges_sect {ranges rnglists} {
     gdb_test_no_output "set auto-solib-add off"
 
     if { ![runto_main] } {
-	fail "cannot run to main."
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp
index 2d5a633a9f3..9034f4c0085 100644
--- a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp
+++ b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp
@@ -80,4 +80,4 @@ if { [ensure_gdb_index $binfile] == -1 } {
 
 clean_restart ${binfile}
 
-runto main message
+runto main
diff --git a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp
index 1c366521808..d05300e2882 100644
--- a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp
+++ b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp
@@ -324,7 +324,6 @@ if [prepare_for_testing "failed to prepare" ${testfile} \
 gdb_load_shlib ${lib_so}
 
 if ![runto_main] then {
-    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp b/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp
index 6b4f5c8cbb8..47e163f6db0 100644
--- a/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp
+++ b/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp
@@ -127,7 +127,6 @@ foreach_with_prefix is_64 {false true} {
     }
 
     if { ![runto_main] } {
-	fail "can't run to main"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp b/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp
index 573324af3d1..0ca9dc17e42 100644
--- a/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp
+++ b/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp
@@ -218,7 +218,6 @@ foreach_with_prefix is_64 {false true} {
     }
 
     if { ![runto_main] } {
-	fail "can't run to main"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp b/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp
index 43ddefcf61d..ce611fb5554 100644
--- a/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp
+++ b/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp
@@ -118,7 +118,6 @@ foreach_with_prefix is_64 {false true} {
     }
 
     if { ![runto_main] } {
-	fail "can't run to main"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.fortran/allocated.exp b/gdb/testsuite/gdb.fortran/allocated.exp
index 4391c5eec97..d9308af17b5 100644
--- a/gdb/testsuite/gdb.fortran/allocated.exp
+++ b/gdb/testsuite/gdb.fortran/allocated.exp
@@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/array-slices-bad.exp b/gdb/testsuite/gdb.fortran/array-slices-bad.exp
index b9519e69c94..a68903498d6 100644
--- a/gdb/testsuite/gdb.fortran/array-slices-bad.exp
+++ b/gdb/testsuite/gdb.fortran/array-slices-bad.exp
@@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp b/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp
index 98a5da20e57..4264cec7a9d 100644
--- a/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp
+++ b/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp
@@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/array-slices.exp b/gdb/testsuite/gdb.fortran/array-slices.exp
index 8200a0ca284..5b01e4f5e04 100644
--- a/gdb/testsuite/gdb.fortran/array-slices.exp
+++ b/gdb/testsuite/gdb.fortran/array-slices.exp
@@ -56,7 +56,6 @@ proc run_test { repack } {
     clean_restart ${binfile}
 
     if ![fortran_runto_main] {
-	untested "could not run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.fortran/associated.exp b/gdb/testsuite/gdb.fortran/associated.exp
index 021a6b784f9..fdd3162e19b 100644
--- a/gdb/testsuite/gdb.fortran/associated.exp
+++ b/gdb/testsuite/gdb.fortran/associated.exp
@@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/block-data.exp b/gdb/testsuite/gdb.fortran/block-data.exp
index 73df4abfa7b..ec26cf0b80c 100644
--- a/gdb/testsuite/gdb.fortran/block-data.exp
+++ b/gdb/testsuite/gdb.fortran/block-data.exp
@@ -31,7 +31,6 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
 }
 
 if ![fortran_runto_main] then {
-    untested "couldn't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/call-no-debug.exp b/gdb/testsuite/gdb.fortran/call-no-debug.exp
index a5e982533fd..3c5172e7e36 100644
--- a/gdb/testsuite/gdb.fortran/call-no-debug.exp
+++ b/gdb/testsuite/gdb.fortran/call-no-debug.exp
@@ -68,7 +68,6 @@ set some_func [find_mangled_name "some_func"]
 set string_func [find_mangled_name "string_func"]
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/class-allocatable-array.exp b/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
index b98cd4fa130..b5097df25a0 100644
--- a/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
+++ b/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
@@ -27,7 +27,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/completion.exp b/gdb/testsuite/gdb.fortran/completion.exp
index 9ff3b7858d1..cf01d48e5df 100644
--- a/gdb/testsuite/gdb.fortran/completion.exp
+++ b/gdb/testsuite/gdb.fortran/completion.exp
@@ -27,7 +27,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/debug-expr.exp b/gdb/testsuite/gdb.fortran/debug-expr.exp
index ca1fb9755aa..db2178fed17 100644
--- a/gdb/testsuite/gdb.fortran/debug-expr.exp
+++ b/gdb/testsuite/gdb.fortran/debug-expr.exp
@@ -32,7 +32,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
 }
 
 if ![fortran_runto_main] {
-    fail "run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/intvar-array.exp b/gdb/testsuite/gdb.fortran/intvar-array.exp
index 1569f51fa4e..bed80e7c629 100644
--- a/gdb/testsuite/gdb.fortran/intvar-array.exp
+++ b/gdb/testsuite/gdb.fortran/intvar-array.exp
@@ -26,7 +26,6 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp b/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp
index 16dc603cb47..acac03bb0f0 100644
--- a/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp
+++ b/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp
@@ -25,7 +25,6 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/lbound-ubound.exp b/gdb/testsuite/gdb.fortran/lbound-ubound.exp
index 7b2efde2636..489c9ad24ce 100644
--- a/gdb/testsuite/gdb.fortran/lbound-ubound.exp
+++ b/gdb/testsuite/gdb.fortran/lbound-ubound.exp
@@ -27,7 +27,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
index 6a249e60f2f..ba9dcd546b5 100644
--- a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
+++ b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
@@ -46,7 +46,6 @@ proc run_tests { lang } {
 	clean_restart ${binfile}
 
 	if ![runto_main] {
-	    untested "could not run to main"
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp b/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp
index 306168b2876..b3e64c5a024 100644
--- a/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp
+++ b/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp
@@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/print-formatted.exp b/gdb/testsuite/gdb.fortran/print-formatted.exp
index 6c2eeb0df71..d0a244943dd 100644
--- a/gdb/testsuite/gdb.fortran/print-formatted.exp
+++ b/gdb/testsuite/gdb.fortran/print-formatted.exp
@@ -26,7 +26,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}] }
 }
 
 if { ![fortran_runto_main] } {
-    fail "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/print_type.exp b/gdb/testsuite/gdb.fortran/print_type.exp
index 11aa0f5de9c..9027a29fb1b 100755
--- a/gdb/testsuite/gdb.fortran/print_type.exp
+++ b/gdb/testsuite/gdb.fortran/print_type.exp
@@ -27,7 +27,6 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/printing-types.exp b/gdb/testsuite/gdb.fortran/printing-types.exp
index 2a66eae44df..860aabb2ca3 100644
--- a/gdb/testsuite/gdb.fortran/printing-types.exp
+++ b/gdb/testsuite/gdb.fortran/printing-types.exp
@@ -23,7 +23,6 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
 }
 
 if {![fortran_runto_main]} then {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/ptr-indentation.exp b/gdb/testsuite/gdb.fortran/ptr-indentation.exp
index f229489bf8f..830166b1765 100644
--- a/gdb/testsuite/gdb.fortran/ptr-indentation.exp
+++ b/gdb/testsuite/gdb.fortran/ptr-indentation.exp
@@ -23,7 +23,6 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
 }
 
 if {![fortran_runto_main]} then {
-    untested "couldn't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/rank.exp b/gdb/testsuite/gdb.fortran/rank.exp
index 86af7111f47..b2ea5d99a0f 100644
--- a/gdb/testsuite/gdb.fortran/rank.exp
+++ b/gdb/testsuite/gdb.fortran/rank.exp
@@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/shape.exp b/gdb/testsuite/gdb.fortran/shape.exp
index 0c41b7b2326..4e02dc65d9f 100644
--- a/gdb/testsuite/gdb.fortran/shape.exp
+++ b/gdb/testsuite/gdb.fortran/shape.exp
@@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/size.exp b/gdb/testsuite/gdb.fortran/size.exp
index 20a9b2795b0..c1363cb8a12 100644
--- a/gdb/testsuite/gdb.fortran/size.exp
+++ b/gdb/testsuite/gdb.fortran/size.exp
@@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp
index 2fe86c8dced..e20e6caa4dd 100644
--- a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp
+++ b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp
@@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/vla-datatypes.exp b/gdb/testsuite/gdb.fortran/vla-datatypes.exp
index eaf4bdfc806..49894a992e1 100644
--- a/gdb/testsuite/gdb.fortran/vla-datatypes.exp
+++ b/gdb/testsuite/gdb.fortran/vla-datatypes.exp
@@ -27,7 +27,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 # handled correctly when using as VLA's
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/vla-history.exp b/gdb/testsuite/gdb.fortran/vla-history.exp
index 49fb446edcf..918d13bb8cf 100644
--- a/gdb/testsuite/gdb.fortran/vla-history.exp
+++ b/gdb/testsuite/gdb.fortran/vla-history.exp
@@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp
index f329204c3bd..a70ca8c9021 100644
--- a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp
+++ b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp
@@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp b/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp
index 162a2eb31ea..fbe36efc065 100644
--- a/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp
+++ b/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp
@@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/vla-ptype.exp b/gdb/testsuite/gdb.fortran/vla-ptype.exp
index d279cd02dee..10d593b3386 100644
--- a/gdb/testsuite/gdb.fortran/vla-ptype.exp
+++ b/gdb/testsuite/gdb.fortran/vla-ptype.exp
@@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/vla-sizeof.exp b/gdb/testsuite/gdb.fortran/vla-sizeof.exp
index 6e940cf13e9..510e0d10eae 100644
--- a/gdb/testsuite/gdb.fortran/vla-sizeof.exp
+++ b/gdb/testsuite/gdb.fortran/vla-sizeof.exp
@@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/vla-type.exp b/gdb/testsuite/gdb.fortran/vla-type.exp
index 120c3e656c8..0ef3b78a396 100755
--- a/gdb/testsuite/gdb.fortran/vla-type.exp
+++ b/gdb/testsuite/gdb.fortran/vla-type.exp
@@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp b/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp
index bb47527d53e..3f6c1ab4b02 100644
--- a/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp
+++ b/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp
@@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp b/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp
index 0596d9b57f0..9187d33dafc 100644
--- a/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp
+++ b/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp
@@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub.exp b/gdb/testsuite/gdb.fortran/vla-value-sub.exp
index 7be327bae35..92feabbe353 100644
--- a/gdb/testsuite/gdb.fortran/vla-value-sub.exp
+++ b/gdb/testsuite/gdb.fortran/vla-value-sub.exp
@@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/vla-value.exp b/gdb/testsuite/gdb.fortran/vla-value.exp
index 071d2b72d87..f275472e921 100644
--- a/gdb/testsuite/gdb.fortran/vla-value.exp
+++ b/gdb/testsuite/gdb.fortran/vla-value.exp
@@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 }
 
 if ![fortran_runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.fortran/whatis_type.exp b/gdb/testsuite/gdb.fortran/whatis_type.exp
index 02b9e0a40ee..786a46d90a7 100644
--- a/gdb/testsuite/gdb.fortran/whatis_type.exp
+++ b/gdb/testsuite/gdb.fortran/whatis_type.exp
@@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \
 }
 
 if ![fortran_runto_main] {
-    fail "run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.go/chan.exp b/gdb/testsuite/gdb.go/chan.exp
index 616794bfcc0..a182c62e7b5 100644
--- a/gdb/testsuite/gdb.go/chan.exp
+++ b/gdb/testsuite/gdb.go/chan.exp
@@ -33,7 +33,6 @@ set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]
 
 if { [go_runto_main] < 0 } {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.go/global-local-var-shadow.exp b/gdb/testsuite/gdb.go/global-local-var-shadow.exp
index 8b4dde15012..aec05a61928 100644
--- a/gdb/testsuite/gdb.go/global-local-var-shadow.exp
+++ b/gdb/testsuite/gdb.go/global-local-var-shadow.exp
@@ -31,7 +31,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 
 if { [go_runto_main] < 0 } {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.go/handcall.exp b/gdb/testsuite/gdb.go/handcall.exp
index a228950ba8f..a5772f06177 100644
--- a/gdb/testsuite/gdb.go/handcall.exp
+++ b/gdb/testsuite/gdb.go/handcall.exp
@@ -29,7 +29,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]
 }
 
 if { [go_runto_main] < 0 } {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.go/hello.exp b/gdb/testsuite/gdb.go/hello.exp
index eadc99896ad..f20336a7ed5 100644
--- a/gdb/testsuite/gdb.go/hello.exp
+++ b/gdb/testsuite/gdb.go/hello.exp
@@ -31,7 +31,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 
 if { [go_runto_main] < 0 } {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.go/integers.exp b/gdb/testsuite/gdb.go/integers.exp
index af1eed2ddbf..f6a0b9879e9 100644
--- a/gdb/testsuite/gdb.go/integers.exp
+++ b/gdb/testsuite/gdb.go/integers.exp
@@ -32,7 +32,6 @@ set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]
 
 if { [go_runto_main] < 0 } {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.go/max-depth.exp b/gdb/testsuite/gdb.go/max-depth.exp
index 1f8aa8de1b1..d1c7caa0627 100644
--- a/gdb/testsuite/gdb.go/max-depth.exp
+++ b/gdb/testsuite/gdb.go/max-depth.exp
@@ -29,7 +29,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]
 }
 
 if { [go_runto_main] < 0 } {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.go/methods.exp b/gdb/testsuite/gdb.go/methods.exp
index d21853d44de..2eb49078078 100644
--- a/gdb/testsuite/gdb.go/methods.exp
+++ b/gdb/testsuite/gdb.go/methods.exp
@@ -32,7 +32,6 @@ set bp_location1 {main.T.Foo}
 set bp_location2 {main.T.Bar}
 
 if { [go_runto_main] < 0 } {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.go/package.exp b/gdb/testsuite/gdb.go/package.exp
index a46f1e27d13..de6109be809 100644
--- a/gdb/testsuite/gdb.go/package.exp
+++ b/gdb/testsuite/gdb.go/package.exp
@@ -37,7 +37,6 @@ if  { [gdb_compile "${srcdir}/${subdir}/${testfile}1.go ${binfile}2.o" "${binfil
 clean_restart $testfile
 
 if { [go_runto_main] < 0 } {
-    untested methods
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.go/strings.exp b/gdb/testsuite/gdb.go/strings.exp
index 4af07881a5c..6be2df70a08 100644
--- a/gdb/testsuite/gdb.go/strings.exp
+++ b/gdb/testsuite/gdb.go/strings.exp
@@ -27,7 +27,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]
 }
 
 if { [go_runto_main] < 0 } {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.go/types.exp b/gdb/testsuite/gdb.go/types.exp
index 19e04e38153..632ce9bfcbf 100644
--- a/gdb/testsuite/gdb.go/types.exp
+++ b/gdb/testsuite/gdb.go/types.exp
@@ -29,7 +29,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]
 }
 
 if { [go_runto_main] < 0 } {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.go/unsafe.exp b/gdb/testsuite/gdb.go/unsafe.exp
index a2bb9071486..78d76747402 100644
--- a/gdb/testsuite/gdb.go/unsafe.exp
+++ b/gdb/testsuite/gdb.go/unsafe.exp
@@ -29,7 +29,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]
 }
 
 if { [go_runto_main] < 0 } {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.guile/scm-breakpoint.exp b/gdb/testsuite/gdb.guile/scm-breakpoint.exp
index c5f19e154d7..b3316e454fe 100644
--- a/gdb/testsuite/gdb.guile/scm-breakpoint.exp
+++ b/gdb/testsuite/gdb.guile/scm-breakpoint.exp
@@ -492,7 +492,6 @@ proc_with_prefix test_bkpt_temporary { } {
     clean_restart ${testfile}
 
     if ![gdb_guile_runto_main] {
-	fail "cannot run to main."
 	return 0
     }
     delete_breakpoints
diff --git a/gdb/testsuite/gdb.guile/scm-cmd.exp b/gdb/testsuite/gdb.guile/scm-cmd.exp
index c2598bbf0ed..661c2627139 100644
--- a/gdb/testsuite/gdb.guile/scm-cmd.exp
+++ b/gdb/testsuite/gdb.guile/scm-cmd.exp
@@ -28,7 +28,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 if { [skip_guile_tests] } { continue }
 
 if ![gdb_guile_runto_main] {
-    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.guile/scm-frame-inline.exp b/gdb/testsuite/gdb.guile/scm-frame-inline.exp
index 0ffd1d6f482..73fdc236329 100644
--- a/gdb/testsuite/gdb.guile/scm-frame-inline.exp
+++ b/gdb/testsuite/gdb.guile/scm-frame-inline.exp
@@ -25,7 +25,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 if { [skip_guile_tests] } { continue }
 
 if ![runto_main] {
-    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.guile/scm-lazy-string.exp b/gdb/testsuite/gdb.guile/scm-lazy-string.exp
index 661b154abab..37cda58aca0 100644
--- a/gdb/testsuite/gdb.guile/scm-lazy-string.exp
+++ b/gdb/testsuite/gdb.guile/scm-lazy-string.exp
@@ -33,7 +33,6 @@ if { [skip_guile_tests] } { continue }
 # The following tests require execution.
 
 if ![gdb_guile_runto_main] {
-    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.guile/scm-objfile.exp b/gdb/testsuite/gdb.guile/scm-objfile.exp
index df67c14408d..6707005052b 100644
--- a/gdb/testsuite/gdb.guile/scm-objfile.exp
+++ b/gdb/testsuite/gdb.guile/scm-objfile.exp
@@ -28,7 +28,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 if { [skip_guile_tests] } { continue }
 
 if ![gdb_guile_runto_main] {
-    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.guile/scm-value.exp b/gdb/testsuite/gdb.guile/scm-value.exp
index bd5b14999d8..5fd2bc4eed1 100644
--- a/gdb/testsuite/gdb.guile/scm-value.exp
+++ b/gdb/testsuite/gdb.guile/scm-value.exp
@@ -310,7 +310,6 @@ proc test_subscript_regression {exefile lang} {
     clean_restart ${exefile}
 
     if ![gdb_guile_runto_main ] {
-	fail "can't run to main"
 	return
     }
 
@@ -440,7 +439,6 @@ test_value_hash
 # The following tests require execution.
 
 if ![gdb_guile_runto_main] {
-    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.linespec/keywords.exp b/gdb/testsuite/gdb.linespec/keywords.exp
index b0ed18b42e0..88192690fc4 100644
--- a/gdb/testsuite/gdb.linespec/keywords.exp
+++ b/gdb/testsuite/gdb.linespec/keywords.exp
@@ -23,7 +23,6 @@ if {[prepare_for_testing "failed to prepare" $exefile $srcfile {debug}]} {
 }
 
 if ![runto_main] {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.linespec/ls-errs.exp b/gdb/testsuite/gdb.linespec/ls-errs.exp
index 99b0f393bb8..10c5d32122c 100644
--- a/gdb/testsuite/gdb.linespec/ls-errs.exp
+++ b/gdb/testsuite/gdb.linespec/ls-errs.exp
@@ -48,7 +48,6 @@ proc do_test {lang} {
     gdb_test_no_output "set max-completions unlimited"
 
     if {![runto_main]} {
-	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.linespec/thread.exp b/gdb/testsuite/gdb.linespec/thread.exp
index 578a4da77cc..ab631a01647 100644
--- a/gdb/testsuite/gdb.linespec/thread.exp
+++ b/gdb/testsuite/gdb.linespec/thread.exp
@@ -24,7 +24,6 @@ if {[prepare_for_testing "failed to prepare" $exefile $srcfile {debug}]} {
 }
 
 if ![runto_main] {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp b/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
index 095f436a03b..d01f970f230 100644
--- a/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
@@ -26,7 +26,6 @@ if [build_executable $testfile.exp $testfile $srcfile $opts] {
 mi_clean_restart $binfile
 
 if {[mi_runto_main] < 0} {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
index 2f1a4884a21..df09da06b5d 100644
--- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
+++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
@@ -402,7 +402,6 @@ proc_with_prefix test_setup { mode } {
     mi_gdb_load $binfile
 
     if { [mi_runto_main] < 0 } {
-	fail "can't run to main"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.modula2/max-depth.exp b/gdb/testsuite/gdb.modula2/max-depth.exp
index 631bc1f085c..be8f8a8f629 100644
--- a/gdb/testsuite/gdb.modula2/max-depth.exp
+++ b/gdb/testsuite/gdb.modula2/max-depth.exp
@@ -22,7 +22,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug quiet}]}
 }
 
 if { ![runto_main] } then {
-    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
index c2b9bcead10..584916be6ea 100644
--- a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
+++ b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
@@ -50,7 +50,6 @@ clean_restart ${exec1}
 # Start the program running, and stop at main.
 #
 if ![runto_main] then {
-    perror "Couldn't run ${binfile1}"
     return
 }
 
diff --git a/gdb/testsuite/gdb.multi/dummy-frame-restore.exp b/gdb/testsuite/gdb.multi/dummy-frame-restore.exp
index 617862fbfee..1ddc39d6c08 100644
--- a/gdb/testsuite/gdb.multi/dummy-frame-restore.exp
+++ b/gdb/testsuite/gdb.multi/dummy-frame-restore.exp
@@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} {
 # Inferior 1 stops at f1.
 
 if ![runto f1] then {
-    fail "can't run to f1"
     return 0
 }
 
@@ -42,7 +41,6 @@ delete_breakpoints
 # Inferior 2 stops at f2.
 
 if ![runto f2] then {
-    fail "can't run to f2"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.multi/multi-arch-exec.exp b/gdb/testsuite/gdb.multi/multi-arch-exec.exp
index 4f36ec82dde..e9a8abd6748 100644
--- a/gdb/testsuite/gdb.multi/multi-arch-exec.exp
+++ b/gdb/testsuite/gdb.multi/multi-arch-exec.exp
@@ -150,7 +150,6 @@ proc do_test { first_arch mode selected_thread } {
 
 	clean_restart ${from_exec}
 	if ![runto all_started] then {
-	    fail "couldn't run to all_started"
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.multi/multi-arch.exp b/gdb/testsuite/gdb.multi/multi-arch.exp
index c1c77917e45..3340e884df4 100644
--- a/gdb/testsuite/gdb.multi/multi-arch.exp
+++ b/gdb/testsuite/gdb.multi/multi-arch.exp
@@ -79,7 +79,7 @@ if { [build_executable "failed to prepare" ${exec2} "${srcfile2}" \
 
 clean_restart ${exec1}
 if ![runto_main] then {
-    fail "starting inferior 1"
+    return
 }
 
 # Add and start inferior 2
@@ -89,7 +89,7 @@ gdb_test "inferior 2" "Switching to inferior 2.*" "switch to inferior 2"
 gdb_load ${binfile2}
 
 if ![runto_main] then {
-    fail "starting inferior 2"
+    return
 }
 
 # Check we do have two inferiors loaded.
diff --git a/gdb/testsuite/gdb.multi/multi-re-run.exp b/gdb/testsuite/gdb.multi/multi-re-run.exp
index 6eda6fafb5b..4d51c1f87a1 100644
--- a/gdb/testsuite/gdb.multi/multi-re-run.exp
+++ b/gdb/testsuite/gdb.multi/multi-re-run.exp
@@ -80,8 +80,7 @@ proc test_re_run {re_run_inf} {
 
     # Run the steady inferior to a breakpoint, and let it stay stopped
     # there.
-    if ![runto all_started message] then {
-	untested "setup failed"
+    if ![runto all_started] then {
 	return 0
     }
 
@@ -95,7 +94,7 @@ proc test_re_run {re_run_inf} {
     foreach_with_prefix iter {1 2} {
 	delete_breakpoints
 
-	if ![runto all_started message] {
+	if ![runto all_started] {
 	    return 0
 	}
 
diff --git a/gdb/testsuite/gdb.multi/multi-term-settings.exp b/gdb/testsuite/gdb.multi/multi-term-settings.exp
index dcc6f2ece0f..2bf20142fa6 100644
--- a/gdb/testsuite/gdb.multi/multi-term-settings.exp
+++ b/gdb/testsuite/gdb.multi/multi-term-settings.exp
@@ -57,7 +57,6 @@ proc create_inferior {which_inf inf_how} {
     # Run to main and delete breakpoints.
     proc my_runto_main {} {
 	if ![runto_main] {
-	    fail "run to main"
 	    return 0
 	} else {
 	    # Delete breakpoints otherwise GDB would try to step over
diff --git a/gdb/testsuite/gdb.multi/remove-inferiors.exp b/gdb/testsuite/gdb.multi/remove-inferiors.exp
index bd56f3ca7cb..c0bd5bd1599 100644
--- a/gdb/testsuite/gdb.multi/remove-inferiors.exp
+++ b/gdb/testsuite/gdb.multi/remove-inferiors.exp
@@ -54,7 +54,6 @@ proc test_remove_inferiors { } {
 	"load binary"
 
     if {![runto_main]} {
-	fail "couldn't run to main."
 	return
     }
 
diff --git a/gdb/testsuite/gdb.multi/stop-all-on-exit.exp b/gdb/testsuite/gdb.multi/stop-all-on-exit.exp
index 5d164381a4f..4a89ec83ffe 100644
--- a/gdb/testsuite/gdb.multi/stop-all-on-exit.exp
+++ b/gdb/testsuite/gdb.multi/stop-all-on-exit.exp
@@ -25,7 +25,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
 }
 
 if {![runto_main]} {
-    fail "starting inferior 1"
     return -1
 }
 
@@ -42,7 +41,6 @@ gdb_test "add-inferior -exec $binfile" "Added inferior 2.*" \
     "add the second inferior"
 gdb_test "inferior 2" ".*Switching to inferior 2.*"
 if {![runto_main]} {
-    fail "starting inferior 2"
     return -1
 }
 gdb_test "print duration=10" "= 10"
diff --git a/gdb/testsuite/gdb.multi/tids-gid-reset.exp b/gdb/testsuite/gdb.multi/tids-gid-reset.exp
index e1755f9a689..e79da426447 100644
--- a/gdb/testsuite/gdb.multi/tids-gid-reset.exp
+++ b/gdb/testsuite/gdb.multi/tids-gid-reset.exp
@@ -67,7 +67,6 @@ with_test_prefix "multi-inferior" {
     gdb_load ${binfile}
 
     if ![runto_main] then {
-	fail "starting inferior 2"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp b/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp
index 1dff0832255..24ad1f8d345 100644
--- a/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp
+++ b/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp
@@ -35,7 +35,6 @@ proc do_test {dispose} {
     gdb_test_no_output "set detach-on-fork off"
 
     if ![runto "child_function"] {
-	fail "can't run to child_function"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
index 8ad7257c9cd..b63cd9cc4e1 100644
--- a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
+++ b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
@@ -32,7 +32,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 }
 
 if { ![runto start_sequence] } then {
-   fail "run to start_sequence"
    return
 }
 
diff --git a/gdb/testsuite/gdb.opt/inline-break.exp b/gdb/testsuite/gdb.opt/inline-break.exp
index c96966ee275..9804b63ae36 100644
--- a/gdb/testsuite/gdb.opt/inline-break.exp
+++ b/gdb/testsuite/gdb.opt/inline-break.exp
@@ -191,7 +191,6 @@ foreach_with_prefix cmd [list "break" "tbreak"] {
     # Start with a clean state.
     delete_breakpoints
     if {![runto_main]} {
-	untested "could not run to main"
 	return -1
     }
 
@@ -247,7 +246,6 @@ foreach_with_prefix func {
     clean_restart $binfile
 
     if {![runto_main]} {
-	untested "could not run to main"
 	continue
     }
 
@@ -265,7 +263,6 @@ with_test_prefix "line number" {
     clean_restart $binfile
 
     if {![runto_main]} {
-	untested "could not run to main"
 	continue
     }
 
@@ -290,7 +287,6 @@ with_test_prefix "address" {
     clean_restart $binfile
 
     if {![runto_main]} {
-	untested "could not run to main"
 	continue
     }
 
@@ -309,7 +305,6 @@ with_test_prefix "check alignment" {
     clean_restart $binfile
 
     if {![runto_main]} {
-	untested "could not run to main"
 	continue
     }
 
diff --git a/gdb/testsuite/gdb.perf/backtrace.exp b/gdb/testsuite/gdb.perf/backtrace.exp
index ced653c4b84..30156189183 100644
--- a/gdb/testsuite/gdb.perf/backtrace.exp
+++ b/gdb/testsuite/gdb.perf/backtrace.exp
@@ -52,7 +52,6 @@ PerfTest::assemble {
     clean_restart $binfile
 
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.perf/single-step.exp b/gdb/testsuite/gdb.perf/single-step.exp
index 7a5d068f153..a5f33c0e65d 100644
--- a/gdb/testsuite/gdb.perf/single-step.exp
+++ b/gdb/testsuite/gdb.perf/single-step.exp
@@ -44,7 +44,6 @@ PerfTest::assemble {
     clean_restart $binfile
 
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
     return 0
diff --git a/gdb/testsuite/gdb.perf/skip-command.exp b/gdb/testsuite/gdb.perf/skip-command.exp
index d9f31a7e8f5..e57f0a21954 100644
--- a/gdb/testsuite/gdb.perf/skip-command.exp
+++ b/gdb/testsuite/gdb.perf/skip-command.exp
@@ -94,7 +94,6 @@ proc run_skip_bench { kind text } {
     global SKIP_STEP_COUNT SKIP_DIRECTIVE_COUNT
 
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.perf/skip-prologue.exp b/gdb/testsuite/gdb.perf/skip-prologue.exp
index 7caff667a0d..d4b0ed770e4 100644
--- a/gdb/testsuite/gdb.perf/skip-prologue.exp
+++ b/gdb/testsuite/gdb.perf/skip-prologue.exp
@@ -56,7 +56,6 @@ PerfTest::assemble {
     clean_restart $binfile
 
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
     return 0
diff --git a/gdb/testsuite/gdb.perf/solib.exp b/gdb/testsuite/gdb.perf/solib.exp
index e0cd341bf31..512fd0d10fb 100644
--- a/gdb/testsuite/gdb.perf/solib.exp
+++ b/gdb/testsuite/gdb.perf/solib.exp
@@ -77,7 +77,6 @@ PerfTest::assemble {
     clean_restart $binfile
 
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
     return 0
diff --git a/gdb/testsuite/gdb.perf/template-breakpoints.exp b/gdb/testsuite/gdb.perf/template-breakpoints.exp
index 96c1209e96c..0fa7fd8ecf0 100644
--- a/gdb/testsuite/gdb.perf/template-breakpoints.exp
+++ b/gdb/testsuite/gdb.perf/template-breakpoints.exp
@@ -52,7 +52,6 @@ PerfTest::assemble {
 	clean_restart $binfile
 
 	if ![runto_main] {
-		fail "can't run to main"
 		return -1
 	}
 
diff --git a/gdb/testsuite/gdb.python/lib-types.exp b/gdb/testsuite/gdb.python/lib-types.exp
index fbc74990f59..f928b223aad 100644
--- a/gdb/testsuite/gdb.python/lib-types.exp
+++ b/gdb/testsuite/gdb.python/lib-types.exp
@@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-as-string.exp b/gdb/testsuite/gdb.python/py-as-string.exp
index 92db25e2581..e327d6997eb 100644
--- a/gdb/testsuite/gdb.python/py-as-string.exp
+++ b/gdb/testsuite/gdb.python/py-as-string.exp
@@ -25,7 +25,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 }
 
 if ![runto_main] {
-    fail "couldn't run to main."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event.exp b/gdb/testsuite/gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event.exp
index 96ae41b0752..0180fea55cc 100644
--- a/gdb/testsuite/gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event.exp
+++ b/gdb/testsuite/gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event.exp
@@ -66,7 +66,6 @@ gdb_load ${binfile}
 gdb_test_no_output "set print pretty on"
 
 if { ![runto_main] } {
-    fail "failed to run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.python/py-bad-printers.exp b/gdb/testsuite/gdb.python/py-bad-printers.exp
index 708f0e0c5c9..dde64c08baf 100644
--- a/gdb/testsuite/gdb.python/py-bad-printers.exp
+++ b/gdb/testsuite/gdb.python/py-bad-printers.exp
@@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main ] then {
-    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp
index fdb7c097e20..8c4c9a522a2 100644
--- a/gdb/testsuite/gdb.python/py-block.exp
+++ b/gdb/testsuite/gdb.python/py-block.exp
@@ -28,7 +28,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.python/py-breakpoint-create-fail.exp b/gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp
index 4d0e9c58200..7eefaa8dd52 100644
--- a/gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp
+++ b/gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp
@@ -29,8 +29,7 @@ if { [skip_python_tests] } { continue }
 
 clean_restart "${testfile}"
 if ![runto_main] {
-    perror "could not run to main"
-    continue
+    return
 }
 
 # The following will create a breakpoint Python wrapper whose construction will
diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp
index bd99452dd5f..bac9b6ed292 100644
--- a/gdb/testsuite/gdb.python/py-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-breakpoint.exp
@@ -39,7 +39,6 @@ proc_with_prefix test_bkpt_basic { } {
     gdb_test "python print (gdb.breakpoints())" "\\(\\)"
 
     if ![runto_main] then {
-	fail "cannot run to main."
 	return 0
     }
 
@@ -122,7 +121,6 @@ proc_with_prefix test_bkpt_deletion { } {
     clean_restart ${testfile}
 
     if ![runto_main] then {
-	fail "cannot run to main."
 	return 0
     }
 
@@ -158,7 +156,6 @@ proc_with_prefix test_bkpt_cond_and_cmds { } {
     clean_restart ${testfile}
 
     if ![runto_main] then {
-	fail "cannot run to main."
 	return 0
     }
 
@@ -216,7 +213,6 @@ proc_with_prefix test_bkpt_invisible { } {
     clean_restart ${testfile}
 
     if ![runto_main] then {
-	fail "cannot run to main."
 	return 0
     }
 
@@ -262,7 +258,6 @@ proc_with_prefix test_hardware_breakpoints { } {
     clean_restart ${testfile}
 
     if ![runto_main] then {
-	fail "cannot run to main."
 	return 0
     }
 
@@ -290,7 +285,6 @@ proc_with_prefix test_watchpoints { } {
     }
 
     if ![runto_main] then {
-	fail "cannot run to main."
 	return 0
     }
 
@@ -313,7 +307,6 @@ proc_with_prefix test_bkpt_internal { } {
 	gdb_test_no_output "set can-use-hw-watchpoints 0" ""
     }
     if ![runto_main] then {
-	fail "cannot run to main."
 	return 0
     }
     delete_breakpoints
@@ -341,7 +334,6 @@ proc_with_prefix test_bkpt_eval_funcs { } {
 	gdb_test_no_output "set can-use-hw-watchpoints 0" ""
     }
     if ![runto_main] then {
-	fail "cannot run to main."
 	return 0
     }
     delete_breakpoints
@@ -455,7 +447,6 @@ proc_with_prefix test_bkpt_temporary { } {
     clean_restart ${testfile}
 
     if ![runto_main] then {
-	fail "cannot run to main."
 	return 0
     }
     delete_breakpoints
@@ -574,7 +565,6 @@ proc_with_prefix test_bkpt_explicit_loc {} {
     clean_restart ${testfile}
 
     if ![runto_main] then {
-	fail "cannot run to main."
 	return 0
     }
 
@@ -660,7 +650,6 @@ proc_with_prefix test_bkpt_qualified {} {
     set two_location_re "Breakpoint $decimal at $hex:.*2 locations."
 
     if ![runto_main] then {
-	fail "cannot run to main."
 	return 0
     }
 
@@ -730,7 +719,6 @@ proc_with_prefix test_bkpt_probe {} {
     }
 
     if ![runto_main] then {
-	fail "cannot run to main."
 	return 0
     }
 
@@ -748,7 +736,6 @@ proc_with_prefix test_catchpoints {} {
     clean_restart ${testfile}
 
     if ![runto_main] then {
-	fail "cannot run to main."
 	return 0
     }
 
@@ -808,7 +795,6 @@ proc_with_prefix test_bkpt_auto_disable { } {
     clean_restart ${testfile}
 
     if ![runto_main] then {
-	fail "cannot run to main."
 	return 0
     }
     delete_breakpoints
diff --git a/gdb/testsuite/gdb.python/py-cmd.exp b/gdb/testsuite/gdb.python/py-cmd.exp
index a1c2a9b3377..43a96a75419 100644
--- a/gdb/testsuite/gdb.python/py-cmd.exp
+++ b/gdb/testsuite/gdb.python/py-cmd.exp
@@ -28,7 +28,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main] then {
-    fail "cannot run to main."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
index 456d14b9633..5ecd9df954d 100644
--- a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
@@ -54,7 +54,6 @@ clean_restart ${testfile}
 gdb_load_shlib ${lib_sl}
 
 if ![runto_main] then {
-    fail "cannot run to main."
     return 0
 }
 
@@ -105,7 +104,6 @@ gdb_test "source $python_file" "Python script imported.*" \
 set cond_line [gdb_get_line_number "Condition Break."]
 
 if ![runto_main] then {
-    fail "cannot run to main."
     return 0
 }
 
@@ -131,8 +129,7 @@ gdb_test "source $python_file" "Python script imported.*" \
          "import python scripts, 3"
 
 if ![runto call_longjmp_1] then {
-    perror "couldn't run to breakpoint call_longjmp"
-    continue
+    return
 }
 
 gdb_test "python finishbp = SimpleFinishBreakpoint(gdb.newest_frame())" \
@@ -158,7 +155,6 @@ gdb_test "source $python_file" "Python script imported.*" \
 
 
 if ![runto_main] then {
-    fail "cannot run to main."
     return 0
 }
          
@@ -184,7 +180,6 @@ gdb_test "source $python_file" "Python script imported.*" \
          "import python scripts, 5"
 
 if ![runto_main] then {
-    fail "cannot run to main."
     return 0
 }
 
@@ -212,7 +207,6 @@ gdb_test "source $python_file" "Python script imported.*" \
          "import python scripts, 6"
 
 if ![runto_main] then {
-    fail "cannot run to main."
     return 0
 }
 
@@ -239,7 +233,6 @@ gdb_test "print increase(&i)" \
 #
 
 if ![runto "test_exec_exit"] then {
-    fail "cannot run to test_exec_exit."
     return 0
 }
 
@@ -252,7 +245,6 @@ gdb_test "continue" "SimpleFinishBreakpoint out of scope.*" "catch out of scope
 #
 
 if ![runto "test_exec_exit"] then {
-    fail "cannot run to test_exec_exit."
     return 0
 }     
 
diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
index 58e086ad3b4..1d4974b3c9b 100644
--- a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
+++ b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
@@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main] then {
-    fail "cannot run to main."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-frame-inline.exp b/gdb/testsuite/gdb.python/py-frame-inline.exp
index 211c930ce50..59789f9b6d4 100644
--- a/gdb/testsuite/gdb.python/py-frame-inline.exp
+++ b/gdb/testsuite/gdb.python/py-frame-inline.exp
@@ -25,7 +25,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main] then {
-    fail "can't run to function f"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp
index 05c7fb00dfd..4c6ede8da33 100644
--- a/gdb/testsuite/gdb.python/py-frame.exp
+++ b/gdb/testsuite/gdb.python/py-frame.exp
@@ -30,7 +30,6 @@ if { [skip_python_tests] } { continue }
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-inferior.exp b/gdb/testsuite/gdb.python/py-inferior.exp
index 2252215b721..894b90a85fc 100644
--- a/gdb/testsuite/gdb.python/py-inferior.exp
+++ b/gdb/testsuite/gdb.python/py-inferior.exp
@@ -38,7 +38,6 @@ switch [get_endianness] {
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-infthread.exp b/gdb/testsuite/gdb.python/py-infthread.exp
index e68986bdfa7..5bbf7ea7f30 100644
--- a/gdb/testsuite/gdb.python/py-infthread.exp
+++ b/gdb/testsuite/gdb.python/py-infthread.exp
@@ -40,7 +40,6 @@ gdb_test_multiline "install new_thread event handler" \
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-objfile.exp b/gdb/testsuite/gdb.python/py-objfile.exp
index 89a98a6ed5b..bf569f4df68 100644
--- a/gdb/testsuite/gdb.python/py-objfile.exp
+++ b/gdb/testsuite/gdb.python/py-objfile.exp
@@ -28,7 +28,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
 }
 
@@ -121,7 +120,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile}2 ${srcfile} {nodebug l
 }
 
 if ![runto_main] {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-pending-frame-level.exp b/gdb/testsuite/gdb.python/py-pending-frame-level.exp
index 1aadcaeacae..7fab31d83e1 100644
--- a/gdb/testsuite/gdb.python/py-pending-frame-level.exp
+++ b/gdb/testsuite/gdb.python/py-pending-frame-level.exp
@@ -27,7 +27,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.python/py-pp-maint.exp b/gdb/testsuite/gdb.python/py-pp-maint.exp
index 4bda85a8aed..b0b42487856 100644
--- a/gdb/testsuite/gdb.python/py-pp-maint.exp
+++ b/gdb/testsuite/gdb.python/py-pp-maint.exp
@@ -33,7 +33,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main ] then {
-    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-pp-registration.exp b/gdb/testsuite/gdb.python/py-pp-registration.exp
index f35640a88b3..e08cb60db31 100644
--- a/gdb/testsuite/gdb.python/py-pp-registration.exp
+++ b/gdb/testsuite/gdb.python/py-pp-registration.exp
@@ -31,7 +31,6 @@ set remote_python_file [gdb_remote_download host \
 			    ${srcdir}/${subdir}/${testfile}.py]
 
 if ![runto_main ] {
-    fail "can't run to main"
     return -1
 }
 
@@ -42,7 +41,7 @@ proc prepare_test { } {
     clean_restart ${testfile}
 
     set run_to_here [gdb_get_line_number {break to inspect} ${testfile}.c ]
-    if ![runto ${testfile}.c:$run_to_here message] {
+    if ![runto ${testfile}.c:$run_to_here] {
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.python/py-progspace.exp b/gdb/testsuite/gdb.python/py-progspace.exp
index 39e3324a11f..0a945821db8 100644
--- a/gdb/testsuite/gdb.python/py-progspace.exp
+++ b/gdb/testsuite/gdb.python/py-progspace.exp
@@ -53,7 +53,6 @@ gdb_test "python print (progspace.random_attribute)" "42" \
     "Verify set of random attribute in progspace"
 
 if {![runto_main]} {
-    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.python/py-rbreak.exp b/gdb/testsuite/gdb.python/py-rbreak.exp
index c045290729c..bd93bd814be 100644
--- a/gdb/testsuite/gdb.python/py-rbreak.exp
+++ b/gdb/testsuite/gdb.python/py-rbreak.exp
@@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" ${testfile} [list $srcfile $srcfile
 if { [skip_python_tests] } { continue }
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-record-btrace-threads.exp b/gdb/testsuite/gdb.python/py-record-btrace-threads.exp
index 3df8e7480ff..be3b501de08 100644
--- a/gdb/testsuite/gdb.python/py-record-btrace-threads.exp
+++ b/gdb/testsuite/gdb.python/py-record-btrace-threads.exp
@@ -39,7 +39,6 @@ if { [skip_python_tests] } {
 }
 
 if { ![runto_main] } {
-    untested "failed to run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-record-btrace.exp b/gdb/testsuite/gdb.python/py-record-btrace.exp
index bf0fa18720e..acb3651b77a 100644
--- a/gdb/testsuite/gdb.python/py-record-btrace.exp
+++ b/gdb/testsuite/gdb.python/py-record-btrace.exp
@@ -36,7 +36,6 @@ if { [skip_python_tests] } {
 }
 
 if ![runto_main ] then {
-    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-record-full.exp b/gdb/testsuite/gdb.python/py-record-full.exp
index 34c4cadf40c..0b86f6b4318 100644
--- a/gdb/testsuite/gdb.python/py-record-full.exp
+++ b/gdb/testsuite/gdb.python/py-record-full.exp
@@ -36,7 +36,6 @@ if { [skip_python_tests] } {
 }
 
 if ![runto_main ] then {
-    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-recurse-unwind.exp b/gdb/testsuite/gdb.python/py-recurse-unwind.exp
index 0466131db7d..4f750d213e8 100644
--- a/gdb/testsuite/gdb.python/py-recurse-unwind.exp
+++ b/gdb/testsuite/gdb.python/py-recurse-unwind.exp
@@ -41,7 +41,6 @@ gdb_test "source ${pyfile}" "Python script imported" \
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-rvalue-ref-value-cc.exp b/gdb/testsuite/gdb.python/py-rvalue-ref-value-cc.exp
index f7e80bfeada..e336c225e35 100644
--- a/gdb/testsuite/gdb.python/py-rvalue-ref-value-cc.exp
+++ b/gdb/testsuite/gdb.python/py-rvalue-ref-value-cc.exp
@@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile \
 if {[skip_python_tests]} { continue }
 
 if {![runto_main]} {
-    untested "couldn't run to main"
    return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-shared.exp b/gdb/testsuite/gdb.python/py-shared.exp
index 5ce786f8998..891f21b64ea 100644
--- a/gdb/testsuite/gdb.python/py-shared.exp
+++ b/gdb/testsuite/gdb.python/py-shared.exp
@@ -49,7 +49,6 @@ if { [skip_python_tests] } { continue }
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-symbol.exp b/gdb/testsuite/gdb.python/py-symbol.exp
index 98acdbe3621..cbc482c4ed9 100644
--- a/gdb/testsuite/gdb.python/py-symbol.exp
+++ b/gdb/testsuite/gdb.python/py-symbol.exp
@@ -105,7 +105,6 @@ gdb_test "python print (gdb.lookup_static_symbol ('qq') is None)" \
     "True" "lookup_static_symbol for global var"
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
@@ -214,7 +213,6 @@ gdb_test "python print (gdb.lookup_static_symbol ('(anonymous namespace)::anon')
     "10" "print value of anon"
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
@@ -243,7 +241,6 @@ gdb_test "python print (cplusfunc.addr_class == gdb.SYMBOL_LOC_BLOCK)" "True" "t
 # Start with a fresh gdb.
 clean_restart ${binfile}
 if ![runto_main] then {
-    fail "cannot run to main."
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-symtab.exp b/gdb/testsuite/gdb.python/py-symtab.exp
index 3236b63eecd..695bbe8cfe7 100644
--- a/gdb/testsuite/gdb.python/py-symtab.exp
+++ b/gdb/testsuite/gdb.python/py-symtab.exp
@@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 if { [skip_python_tests] } { continue }
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-unwind-inline.exp b/gdb/testsuite/gdb.python/py-unwind-inline.exp
index 36d918a5bd4..5619895abed 100644
--- a/gdb/testsuite/gdb.python/py-unwind-inline.exp
+++ b/gdb/testsuite/gdb.python/py-unwind-inline.exp
@@ -30,7 +30,6 @@ if { [skip_python_tests] } { continue }
 
 # The following tests require execution.
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-unwind-maint.exp b/gdb/testsuite/gdb.python/py-unwind-maint.exp
index 8e22cbf7d43..6604fd36242 100644
--- a/gdb/testsuite/gdb.python/py-unwind-maint.exp
+++ b/gdb/testsuite/gdb.python/py-unwind-maint.exp
@@ -30,7 +30,6 @@ if { [skip_python_tests] } { continue }
 set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py]
 
 if ![runto_main ] then {
-    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.python/py-unwind-user-regs.exp b/gdb/testsuite/gdb.python/py-unwind-user-regs.exp
index 7ae3a5bb19f..773bc70e482 100644
--- a/gdb/testsuite/gdb.python/py-unwind-user-regs.exp
+++ b/gdb/testsuite/gdb.python/py-unwind-user-regs.exp
@@ -48,7 +48,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.python/py-unwind.exp b/gdb/testsuite/gdb.python/py-unwind.exp
index c4364a97979..df4b8400536 100644
--- a/gdb/testsuite/gdb.python/py-unwind.exp
+++ b/gdb/testsuite/gdb.python/py-unwind.exp
@@ -38,7 +38,6 @@ if { ![istarget x86_64-*-* ] || ![is_lp64_target] } { continue }
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
index d9f1a76a388..f4b7c23fb7d 100644
--- a/gdb/testsuite/gdb.python/py-value.exp
+++ b/gdb/testsuite/gdb.python/py-value.exp
@@ -624,7 +624,6 @@ test_add_to_history
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index bc670ce25c1..a81cd5c850e 100644
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -218,7 +218,6 @@ clean_restart ${testfile}
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
@@ -433,7 +432,6 @@ clean_restart ${testfile}
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
@@ -489,7 +487,6 @@ clean_restart ${testfile}
 # The following tests require execution.
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
index 5ebc8b5d11b..27c2a77f210 100644
--- a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
+++ b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
@@ -30,7 +30,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.reverse/insn-reverse.exp b/gdb/testsuite/gdb.reverse/insn-reverse.exp
index baebaaed1f7..47f0166a762 100644
--- a/gdb/testsuite/gdb.reverse/insn-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/insn-reverse.exp
@@ -24,7 +24,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
     return -1
 }
 if { ![runto_main] } then {
-    fail "run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp b/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
index d4802eb123c..d0d6454293f 100644
--- a/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
+++ b/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
@@ -34,7 +34,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.reverse/step-indirect-call-thunk.exp b/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp
index dad43d78e6b..7537a01eeb8 100644
--- a/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp
+++ b/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp
@@ -27,7 +27,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.server/extended-remote-restart.exp b/gdb/testsuite/gdb.server/extended-remote-restart.exp
index 9480a0f5a6f..b9604592187 100644
--- a/gdb/testsuite/gdb.server/extended-remote-restart.exp
+++ b/gdb/testsuite/gdb.server/extended-remote-restart.exp
@@ -61,7 +61,6 @@ proc test_reload { do_kill_p follow_child_p } {
     clean_restart ${binfile}
 
     if ![runto_main] then {
-	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.stabs/gdb11479.exp b/gdb/testsuite/gdb.stabs/gdb11479.exp
index e14999f3448..75caf1cc2e3 100644
--- a/gdb/testsuite/gdb.stabs/gdb11479.exp
+++ b/gdb/testsuite/gdb.stabs/gdb11479.exp
@@ -22,7 +22,6 @@ set testfile "gdb11479"
 
 proc do_test {version} {
     if ![runto_main] {
-        fail "can't run to main $version"
         return -1
     }
     gdb_test "rb test" "" "set breakpoints $version"
diff --git a/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp b/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp
index b2fef9fca6a..4c2e2b776e4 100644
--- a/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp
+++ b/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp
@@ -53,7 +53,6 @@ proc test { non_stop } {
     }
 
     if ![runto_main] {
-	fail "cannot run to main"
 	return -1
     }
 
@@ -84,7 +83,6 @@ proc test { non_stop } {
 	gdb_load $binfile
 
 	if ![runto_main] {
-	    fail "cannot run to main"
 	    return -1
 	}
     }
diff --git a/gdb/testsuite/gdb.threads/async.exp b/gdb/testsuite/gdb.threads/async.exp
index c49deb1f8b5..112965eda96 100644
--- a/gdb/testsuite/gdb.threads/async.exp
+++ b/gdb/testsuite/gdb.threads/async.exp
@@ -35,7 +35,6 @@ proc test_current_thread {expected_thr} {
     clean_restart $binfile
 
     if {![runto "all_started"]} {
-	fail "could not run to all_started"
 	return
     }
 
diff --git a/gdb/testsuite/gdb.threads/clone-new-thread-event.exp b/gdb/testsuite/gdb.threads/clone-new-thread-event.exp
index 4911a73fd9a..562c3a62e4a 100644
--- a/gdb/testsuite/gdb.threads/clone-new-thread-event.exp
+++ b/gdb/testsuite/gdb.threads/clone-new-thread-event.exp
@@ -25,7 +25,6 @@ if { [prepare_for_testing "failed to prepare" clone-new-thread-event] } {
 }
 
 if { ![runto_main] } {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/clone-thread_db.exp b/gdb/testsuite/gdb.threads/clone-thread_db.exp
index 91608c38855..2d1f8ef9583 100644
--- a/gdb/testsuite/gdb.threads/clone-thread_db.exp
+++ b/gdb/testsuite/gdb.threads/clone-thread_db.exp
@@ -27,7 +27,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}]
 }
 
 if ![runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/continue-pending-status.exp b/gdb/testsuite/gdb.threads/continue-pending-status.exp
index c0321c39d11..2c3bc12e250 100644
--- a/gdb/testsuite/gdb.threads/continue-pending-status.exp
+++ b/gdb/testsuite/gdb.threads/continue-pending-status.exp
@@ -29,7 +29,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}]
 }
 
 if ![runto_main] {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/current-lwp-dead.exp b/gdb/testsuite/gdb.threads/current-lwp-dead.exp
index 09b21d42760..2111ea2d670 100644
--- a/gdb/testsuite/gdb.threads/current-lwp-dead.exp
+++ b/gdb/testsuite/gdb.threads/current-lwp-dead.exp
@@ -28,7 +28,6 @@ if { [prepare_for_testing "failed to prepare" current-lwp-dead] } {
 }
 
 if {[runto_main] <= 0} {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/fork-child-threads.exp b/gdb/testsuite/gdb.threads/fork-child-threads.exp
index 2142fffb89c..fffb0de5517 100644
--- a/gdb/testsuite/gdb.threads/fork-child-threads.exp
+++ b/gdb/testsuite/gdb.threads/fork-child-threads.exp
@@ -27,7 +27,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 clean_restart ${binfile}
 
 if ![runto_main] then {
-   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/fork-plus-threads.exp b/gdb/testsuite/gdb.threads/fork-plus-threads.exp
index 7fe3c603bcd..2300279254e 100644
--- a/gdb/testsuite/gdb.threads/fork-plus-threads.exp
+++ b/gdb/testsuite/gdb.threads/fork-plus-threads.exp
@@ -46,7 +46,6 @@ proc do_test { detach-on-fork } {
     set GDBFLAGS $saved_gdbflags
 
     if ![runto_main] then {
-	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.threads/fork-thread-pending.exp b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
index 8f38f783b47..ec6d9839dcc 100644
--- a/gdb/testsuite/gdb.threads/fork-thread-pending.exp
+++ b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
@@ -28,7 +28,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 clean_restart ${binfile}
 
 if ![runto_main] then {
-   fail "can't run to main"
    return 0
 }
 
@@ -86,7 +85,6 @@ gdb_reinitialize_dir $srcdir/$subdir
 
 gdb_load ${binfile}
 if ![runto_main] then {
-   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
index 288ee9b1f5f..c1e910bfc1c 100644
--- a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
+++ b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
@@ -39,7 +39,6 @@ proc probe_displaced_stepping_support {} {
 
 	gdb_test_no_output "set displaced on"
 	if ![runto_main] then {
-	    fail "can't run to main"
 	    return 0
 	}
 
@@ -79,7 +78,6 @@ proc do_test { cond_bp_target detach_on_fork displaced } {
     set GDBFLAGS $saved_gdbflags
 
     if ![runto_main] then {
-	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.threads/gcore-thread.exp b/gdb/testsuite/gdb.threads/gcore-thread.exp
index 35c75f7a499..142c04bcab2 100644
--- a/gdb/testsuite/gdb.threads/gcore-thread.exp
+++ b/gdb/testsuite/gdb.threads/gcore-thread.exp
@@ -56,7 +56,6 @@ set nl "\[\r\n\]+"
 set timeout 30
 
 if { ! [ runto_main ] } then {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
index 11c45c3dce4..8914eaa0478 100644
--- a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
+++ b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
@@ -50,7 +50,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.threads/interrupt-while-step-over.exp b/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp
index a9304fc1af0..5f22392f5fd 100644
--- a/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp
+++ b/gdb/testsuite/gdb.threads/interrupt-while-step-over.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
 }
 
@@ -175,7 +174,6 @@ proc testdriver {displaced} {
     gdb_test_no_output "set displaced-stepping $displaced"
 
     if ![runto all_started] {
-	fail "couldn't run to all_started"
 	return
     }
     set break_line [gdb_get_line_number "set breakpoint here"]
diff --git a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
index e6d806699f2..b9d4034f341 100644
--- a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
+++ b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
@@ -34,7 +34,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.threads/kill.exp b/gdb/testsuite/gdb.threads/kill.exp
index c984d45e6be..27464d2f5e8 100644
--- a/gdb/testsuite/gdb.threads/kill.exp
+++ b/gdb/testsuite/gdb.threads/kill.exp
@@ -39,7 +39,6 @@ proc test {threaded} {
 	}
 
 	if { ![runto_main] } then {
-	    fail "run to main"
 	    return
 	}
 
diff --git a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
index 46a8af825ba..0a23fde579e 100644
--- a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
+++ b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
@@ -35,7 +35,6 @@ clean_restart ${binfile}
 gdb_test_no_output "set can-use-hw-watchpoints 1" ""
 
 if ![runto_main] then {
-    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp b/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
index 5ffe9293b55..921c213721f 100644
--- a/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
+++ b/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
@@ -30,7 +30,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 clean_restart "${binfile}"
 
 if ![runto_main] then {
-   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp b/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
index b0716bb31fa..2401cf51671 100644
--- a/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
+++ b/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
@@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" \
 }
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/non-ldr-exit.exp b/gdb/testsuite/gdb.threads/non-ldr-exit.exp
index f3ed9a0cf7e..beab8afb9a7 100644
--- a/gdb/testsuite/gdb.threads/non-ldr-exit.exp
+++ b/gdb/testsuite/gdb.threads/non-ldr-exit.exp
@@ -23,7 +23,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}
 }
 
 if ![runto_main] {
-    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/omp-par-scope.exp b/gdb/testsuite/gdb.threads/omp-par-scope.exp
index b07855c87db..f250965612a 100644
--- a/gdb/testsuite/gdb.threads/omp-par-scope.exp
+++ b/gdb/testsuite/gdb.threads/omp-par-scope.exp
@@ -53,7 +53,6 @@ if {[info procs gdb_openmp_setup] != ""} {
 }
 
 if {![runto_main]} {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/pending-step.exp b/gdb/testsuite/gdb.threads/pending-step.exp
index 208a93f7232..22691d87301 100644
--- a/gdb/testsuite/gdb.threads/pending-step.exp
+++ b/gdb/testsuite/gdb.threads/pending-step.exp
@@ -57,7 +57,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 clean_restart ${binfile}
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp b/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp
index ab5a82bef71..cabbc4faacc 100644
--- a/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp
+++ b/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp
@@ -217,7 +217,6 @@ proc test_detach {multi_process cmd} {
 	clean_restart ${binfile}
 
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 
@@ -246,7 +245,6 @@ proc test_detach_watch {wp multi_process cmd} {
 	clean_restart ${binfile}
 
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 
@@ -295,7 +293,6 @@ proc test_detach_killed_outside {multi_process cmd} {
 	clean_restart ${binfile}
 
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp b/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
index 7a234e5c37a..7558d37fc5a 100644
--- a/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
+++ b/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
@@ -46,7 +46,6 @@ proc do_test { non_stop cond_bp_target } {
     set GDBFLAGS $saved_gdbflags
 
     if ![runto_main] then {
-	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.threads/queue-signal.exp b/gdb/testsuite/gdb.threads/queue-signal.exp
index ca06ce789d2..ae46ff1eb21 100644
--- a/gdb/testsuite/gdb.threads/queue-signal.exp
+++ b/gdb/testsuite/gdb.threads/queue-signal.exp
@@ -23,7 +23,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 clean_restart ${binfile}
 
 if ![runto_main] {
-   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/reconnect-signal.exp b/gdb/testsuite/gdb.threads/reconnect-signal.exp
index 2b5ba5daa82..a1816193755 100644
--- a/gdb/testsuite/gdb.threads/reconnect-signal.exp
+++ b/gdb/testsuite/gdb.threads/reconnect-signal.exp
@@ -34,7 +34,6 @@ if { [gdb_compile_pthreads \
 clean_restart $executable
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp b/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
index bef125c8ab4..4d754ef887a 100644
--- a/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
+++ b/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
@@ -41,7 +41,6 @@ proc test { step_over } {
 	clean_restart ${binfile}
 
 	if ![runto_main] then {
-	    fail "can't run to main"
 	    return 0
 	}
 
diff --git a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
index 78ded0db4c2..bb58b7e3342 100644
--- a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
+++ b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
@@ -38,7 +38,6 @@ proc test { schedlock } {
 	clean_restart ${binfile}
 
 	if ![runto_main] then {
-	    fail "can't run to main"
 	    return 0
 	}
 
diff --git a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
index c635facca2d..138e836dec6 100644
--- a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
+++ b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
@@ -35,7 +35,6 @@ proc test { command } {
 	clean_restart ${binfile}
 
 	if ![runto_main] then {
-	    fail "can't run to main"
 	    return 0
 	}
 
diff --git a/gdb/testsuite/gdb.threads/signal-sigtrap.exp b/gdb/testsuite/gdb.threads/signal-sigtrap.exp
index f5dc7fe6e74..3e4ceebb05c 100644
--- a/gdb/testsuite/gdb.threads/signal-sigtrap.exp
+++ b/gdb/testsuite/gdb.threads/signal-sigtrap.exp
@@ -38,7 +38,6 @@ proc test { sigtrap_thread } {
 	clean_restart ${binfile}
 
 	if ![runto "thread_function"] then {
-	    fail "can't run to thread_function"
 	    return 0
 	}
 
diff --git a/gdb/testsuite/gdb.threads/sigthread.exp b/gdb/testsuite/gdb.threads/sigthread.exp
index 867aef9a710..a9d168865d4 100644
--- a/gdb/testsuite/gdb.threads/sigthread.exp
+++ b/gdb/testsuite/gdb.threads/sigthread.exp
@@ -24,7 +24,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 clean_restart ${binfile}
 
 if ![runto_main] then {
-   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/stop-with-handle.exp b/gdb/testsuite/gdb.threads/stop-with-handle.exp
index 5e0f4da00e1..2cbe0e13ba4 100644
--- a/gdb/testsuite/gdb.threads/stop-with-handle.exp
+++ b/gdb/testsuite/gdb.threads/stop-with-handle.exp
@@ -29,7 +29,6 @@ if {[prepare_for_testing "failed to prepare" \
 }
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/thread-specific-bp.exp b/gdb/testsuite/gdb.threads/thread-specific-bp.exp
index c59a65b3150..331f9470c22 100644
--- a/gdb/testsuite/gdb.threads/thread-specific-bp.exp
+++ b/gdb/testsuite/gdb.threads/thread-specific-bp.exp
@@ -50,7 +50,6 @@ proc check_thread_specific_breakpoint {mode} {
 	global gdb_prompt
 
 	if ![runto_main] {
-	    untested "could not run to main"
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
index 042691b1709..3c46b8a1db6 100644
--- a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
+++ b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
@@ -34,7 +34,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.threads/thread_check.exp b/gdb/testsuite/gdb.threads/thread_check.exp
index 441e3feb78b..89f76edc14f 100644
--- a/gdb/testsuite/gdb.threads/thread_check.exp
+++ b/gdb/testsuite/gdb.threads/thread_check.exp
@@ -42,7 +42,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 clean_restart ${binfile}
 
 if ![runto_main] then {
-   fail "can't run to main"
       return 1
 }
 
diff --git a/gdb/testsuite/gdb.threads/thread_events.exp b/gdb/testsuite/gdb.threads/thread_events.exp
index 31e4d025b9b..2082d346325 100644
--- a/gdb/testsuite/gdb.threads/thread_events.exp
+++ b/gdb/testsuite/gdb.threads/thread_events.exp
@@ -113,7 +113,6 @@ proc test_thread_messages {enabled} {
   # The initial thread may log a 'New Thread' message, but we don't
   # check for it.
   if ![runto_main] then {
-     fail "can't run to main $enabled_string"
      return 1
   }
 
diff --git a/gdb/testsuite/gdb.threads/threadapply.exp b/gdb/testsuite/gdb.threads/threadapply.exp
index ebc1cf15ad6..958339d2870 100644
--- a/gdb/testsuite/gdb.threads/threadapply.exp
+++ b/gdb/testsuite/gdb.threads/threadapply.exp
@@ -32,7 +32,6 @@ clean_restart ${binfile}
 #
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
@@ -77,7 +76,6 @@ proc thr_apply_detach {thread_set} {
 	clean_restart ${binfile}
 
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.threads/tid-reuse.exp b/gdb/testsuite/gdb.threads/tid-reuse.exp
index 8ac1f5b2ceb..422736402b0 100644
--- a/gdb/testsuite/gdb.threads/tid-reuse.exp
+++ b/gdb/testsuite/gdb.threads/tid-reuse.exp
@@ -23,7 +23,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile { debug pthreads
 }
 
 if ![runto_main] {
-    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.threads/tls-nodebug.exp b/gdb/testsuite/gdb.threads/tls-nodebug.exp
index 19eb9a02be2..ad637d3abf9 100644
--- a/gdb/testsuite/gdb.threads/tls-nodebug.exp
+++ b/gdb/testsuite/gdb.threads/tls-nodebug.exp
@@ -28,7 +28,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 
 clean_restart ${binfile}
 if ![runto_main] then {
-   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/tls-shared.exp b/gdb/testsuite/gdb.threads/tls-shared.exp
index 4efa226c8a6..6c3c2d8c45d 100644
--- a/gdb/testsuite/gdb.threads/tls-shared.exp
+++ b/gdb/testsuite/gdb.threads/tls-shared.exp
@@ -39,7 +39,6 @@ clean_restart ${binfile}
 gdb_load_shlib ${binfile_lib}
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/tls-so_extern.exp b/gdb/testsuite/gdb.threads/tls-so_extern.exp
index c3f114bf894..2f358a3886f 100644
--- a/gdb/testsuite/gdb.threads/tls-so_extern.exp
+++ b/gdb/testsuite/gdb.threads/tls-so_extern.exp
@@ -38,7 +38,6 @@ clean_restart ${binfile}
 gdb_load_shlib ${binfile_lib}
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp
index 954e2925e7f..a416d81dc82 100644
--- a/gdb/testsuite/gdb.threads/tls.exp
+++ b/gdb/testsuite/gdb.threads/tls.exp
@@ -165,7 +165,6 @@ gdb_test_multiple "print a_thread_local" "" {
 }
 
 if ![runto_main] then {
-   fail "can't run to main"
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp b/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp
index c7839d0e5d8..351a8dd77c7 100644
--- a/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp
+++ b/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp
@@ -31,7 +31,6 @@ proc test_vfork {detach} {
     clean_restart $binfile
 
     if ![runto_main] then {
-	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp b/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp
index 4b37836e955..7a0ec6e7326 100644
--- a/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp
+++ b/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp
@@ -31,7 +31,6 @@ proc test_vfork {detach} {
     clean_restart $binfile
 
     if ![runto_main] then {
-	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.threads/watchthreads.exp b/gdb/testsuite/gdb.threads/watchthreads.exp
index 57630025e11..011e952882b 100644
--- a/gdb/testsuite/gdb.threads/watchthreads.exp
+++ b/gdb/testsuite/gdb.threads/watchthreads.exp
@@ -45,7 +45,6 @@ gdb_test_no_output "set can-use-hw-watchpoints 1" ""
 #
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/watchthreads2.exp b/gdb/testsuite/gdb.threads/watchthreads2.exp
index 0b60b0e702e..bd9f0cd399a 100644
--- a/gdb/testsuite/gdb.threads/watchthreads2.exp
+++ b/gdb/testsuite/gdb.threads/watchthreads2.exp
@@ -42,7 +42,6 @@ gdb_test_no_output "set can-use-hw-watchpoints 1" ""
 #
 
 if ![runto_main] then {
-    fail "can't run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/wp-replication.exp b/gdb/testsuite/gdb.threads/wp-replication.exp
index 81eee1595d5..3515f8c0afd 100644
--- a/gdb/testsuite/gdb.threads/wp-replication.exp
+++ b/gdb/testsuite/gdb.threads/wp-replication.exp
@@ -43,7 +43,6 @@ gdb_test_no_output "set can-use-hw-watchpoints 1" ""
 
 # Run to `main' where we begin our tests.
 if ![runto_main] then {
-    fail "failed to run to main"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.trace/actions-changed.exp b/gdb/testsuite/gdb.trace/actions-changed.exp
index 453af1f3b19..44e9ad0d7d2 100644
--- a/gdb/testsuite/gdb.trace/actions-changed.exp
+++ b/gdb/testsuite/gdb.trace/actions-changed.exp
@@ -165,7 +165,6 @@ proc test_actions_changed { } {
 clean_restart $testfile
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index 787df23e3ae..7d3bd652945 100644
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -247,7 +247,6 @@ gdb_load $binfile
 gdb_breakpoint "main"
 gdb_run_cmd
 if {[gdb_test "" "Breakpoint .*"] != 0} {
-    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
index 9a03ca4a7a5..dccd9ada8e7 100644
--- a/gdb/testsuite/gdb.trace/backtrace.exp
+++ b/gdb/testsuite/gdb.trace/backtrace.exp
@@ -32,7 +32,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp
index f2ed8fd50b8..f3caa74eafa 100644
--- a/gdb/testsuite/gdb.trace/change-loc.exp
+++ b/gdb/testsuite/gdb.trace/change-loc.exp
@@ -54,7 +54,6 @@ gdb_load_shlib $lib_sl1
 gdb_load_shlib $lib_sl2
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -75,7 +74,6 @@ proc tracepoint_change_loc_1 { trace_type } {
 
 	clean_restart ${testfile}
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 	gdb_test_no_output "delete break 1"
@@ -303,7 +301,6 @@ proc tracepoint_install_in_trace_disabled { trace_type } {
 
 	clean_restart ${testfile}
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp
index 820f5693ece..f3c6b6cb73f 100644
--- a/gdb/testsuite/gdb.trace/circ.exp
+++ b/gdb/testsuite/gdb.trace/circ.exp
@@ -74,7 +74,6 @@ proc run_trace_experiment { } {
 }
 
 if { ![runto_main] } {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -210,7 +209,6 @@ with_test_prefix "normal buffer" {
     clean_restart $testfile
 
     if { ![runto_main] } {
-	fail "can't run to main"
 	return 1
     }
 
@@ -234,7 +232,6 @@ with_test_prefix "small buffer" {
     clean_restart $testfile
 
     if { ![runto_main] } {
-	fail "can't run to main"
 	return 1
     }
 
@@ -260,7 +257,6 @@ with_test_prefix "circular buffer" {
     clean_restart $testfile
 
     if { ![runto_main] } {
-	fail "can't run to main"
 	return 1
     }
 
diff --git a/gdb/testsuite/gdb.trace/disconnected-tracing.exp b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
index 88e8c9eb9eb..b26c80e517e 100644
--- a/gdb/testsuite/gdb.trace/disconnected-tracing.exp
+++ b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
@@ -33,7 +33,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -53,7 +52,6 @@ proc disconnected_tracing {  } {
 	# Start with a fresh gdb.
 	clean_restart ${executable}
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 
@@ -116,7 +114,6 @@ proc disconnected_tfind {  } {
 	# Start with a fresh gdb.
 	clean_restart ${executable}
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp
index 3695a1ee114..bd8a8c5559f 100644
--- a/gdb/testsuite/gdb.trace/entry-values.exp
+++ b/gdb/testsuite/gdb.trace/entry-values.exp
@@ -173,7 +173,6 @@ if  {[gdb_compile [list ${binfile}1.o ${binfile}2.o] \
 clean_restart ${testfile}
 
 if ![runto_main] {
-    fail "can't run to main"
     return -1
 }
 
@@ -208,7 +207,6 @@ clean_restart $binfile
 load_lib "trace-support.exp"
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/ftrace-lock.exp b/gdb/testsuite/gdb.trace/ftrace-lock.exp
index 2c87b853ea2..33842cf58ff 100644
--- a/gdb/testsuite/gdb.trace/ftrace-lock.exp
+++ b/gdb/testsuite/gdb.trace/ftrace-lock.exp
@@ -45,7 +45,6 @@ if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $optio
 clean_restart ${testfile}
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -68,7 +67,6 @@ if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $optio
 clean_restart ${executable}
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp
index 902d172f9cc..18ce9c74639 100644
--- a/gdb/testsuite/gdb.trace/ftrace.exp
+++ b/gdb/testsuite/gdb.trace/ftrace.exp
@@ -36,7 +36,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -60,7 +59,6 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 clean_restart ${executable}
 
 if ![runto_main] {
-    fail "can't run to main for ftrace tests"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
index 16f18979ece..d100e165b70 100644
--- a/gdb/testsuite/gdb.trace/infotrace.exp
+++ b/gdb/testsuite/gdb.trace/infotrace.exp
@@ -108,7 +108,6 @@ gdb_trace_setactions "collect on tracepoint 1" "1" \
 	"collect gdb_struct1_test" "^$"
 gdb_run_cmd
 if {[gdb_test "" "Breakpoint ${decimal}, main.*"] != 0} {
-    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
index eefbb4bbff4..832f87a3fa3 100644
--- a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
+++ b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
@@ -27,7 +27,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug}] }
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
index 27194a1263d..72824546542 100644
--- a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
+++ b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
@@ -22,7 +22,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug nopi
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
index d4416899348..e0d3135f7d5 100644
--- a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
@@ -107,7 +107,6 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 clean_restart $executable
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
index 58503a3e103..d2e9ae49c65 100644
--- a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
@@ -70,7 +70,6 @@ proc test_reconnect { } {
 	gdb_load_shlib $lib_sl1
 	gdb_load_shlib $lib_sl2
 	if ![runto_main] then {
-	    fail "can't run to main"
 	    return 0
 	}
 	# Create tracepoints on marker and main, and leave them in the
@@ -251,7 +250,6 @@ gdb_load_shlib $lib_sl1
 gdb_load_shlib $lib_sl2
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
index b3d01e828a3..577e3422d03 100644
--- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
@@ -71,7 +71,6 @@ proc test_create_delete_modify_tsv { } {
 	clean_restart $testfile
 
 	if ![runto_main] {
-	    fail "can't run to main to check for trace support"
 	    return -1
 	}
 
@@ -153,7 +152,6 @@ proc test_upload_tsv { } {
 
 	clean_restart $testfile
 	if ![runto_main] then {
-	    fail "can't run to main"
 	    return 0
 	}
 
@@ -239,7 +237,6 @@ proc test_upload_tsv { } {
 clean_restart $testfile
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/no-attach-trace.exp b/gdb/testsuite/gdb.trace/no-attach-trace.exp
index 5bd730fa24d..552446aef52 100644
--- a/gdb/testsuite/gdb.trace/no-attach-trace.exp
+++ b/gdb/testsuite/gdb.trace/no-attach-trace.exp
@@ -43,7 +43,6 @@ gdb_test "tstart" "Target returns error code.*\."
 
 with_test_prefix "after tstart" {
     if ![runto_main] {
-	fail "can't run to main, target may have died unexpectedly"
 	return -1
     }
 }
diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp
index bbff2238f53..94a1e271e1e 100644
--- a/gdb/testsuite/gdb.trace/pending.exp
+++ b/gdb/testsuite/gdb.trace/pending.exp
@@ -52,7 +52,6 @@ gdb_load_shlib $lib_sl1
 gdb_load_shlib $lib_sl2
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -188,7 +187,6 @@ proc pending_tracepoint_resolved_during_trace { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
@@ -257,7 +255,6 @@ proc pending_tracepoint_installed_during_trace { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
@@ -331,7 +328,6 @@ proc pending_tracepoint_disconnect_during_trace { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
@@ -379,7 +375,6 @@ proc pending_tracepoint_disconnect_after_resolved { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
@@ -432,7 +427,6 @@ proc pending_tracepoint_with_action_resolved { trace_type } \
     # Start with a fresh gdb.
     clean_restart $executable
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.trace/pr16508.exp b/gdb/testsuite/gdb.trace/pr16508.exp
index d0ecaddc7b1..2070648f05b 100644
--- a/gdb/testsuite/gdb.trace/pr16508.exp
+++ b/gdb/testsuite/gdb.trace/pr16508.exp
@@ -23,7 +23,6 @@ if [prepare_for_testing "failed to prepare for trace tests" \
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/qtro.exp b/gdb/testsuite/gdb.trace/qtro.exp
index 0fadfa66b13..b1298834ec0 100644
--- a/gdb/testsuite/gdb.trace/qtro.exp
+++ b/gdb/testsuite/gdb.trace/qtro.exp
@@ -27,7 +27,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nopie}]}
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/range-stepping.exp b/gdb/testsuite/gdb.trace/range-stepping.exp
index 156d86207ed..cc3c7a81af7 100644
--- a/gdb/testsuite/gdb.trace/range-stepping.exp
+++ b/gdb/testsuite/gdb.trace/range-stepping.exp
@@ -25,7 +25,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -82,7 +81,6 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 clean_restart ${executable}
 
 if ![runto_main] {
-    fail "can't run to main for ftrace tests"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.trace/read-memory.exp b/gdb/testsuite/gdb.trace/read-memory.exp
index 295784c297e..cad2f7d73b1 100644
--- a/gdb/testsuite/gdb.trace/read-memory.exp
+++ b/gdb/testsuite/gdb.trace/read-memory.exp
@@ -22,7 +22,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nopie}]}
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -39,7 +38,6 @@ proc set_tracepoint_and_collect { } {
     # Start with a fresh gdb.
     clean_restart ${testfile}
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
     gdb_breakpoint "end" qualified
diff --git a/gdb/testsuite/gdb.trace/signal.exp b/gdb/testsuite/gdb.trace/signal.exp
index 218c7ba32fb..df257cddf8b 100644
--- a/gdb/testsuite/gdb.trace/signal.exp
+++ b/gdb/testsuite/gdb.trace/signal.exp
@@ -40,7 +40,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -67,7 +66,6 @@ if { [istarget "i\[34567\]86-*-linux*"] || [istarget "x86_64-*-linux*"] } {
 # Start with a fresh gdb.
 clean_restart ${testfile}
 if ![runto_main] {
-    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp
index e129f011be7..1960b6464c6 100644
--- a/gdb/testsuite/gdb.trace/status-stop.exp
+++ b/gdb/testsuite/gdb.trace/status-stop.exp
@@ -25,7 +25,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -44,7 +43,6 @@ proc test_tstart_tstop_tstart { } {
 	# Start with a fresh gdb.
 	clean_restart ${executable}
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 
@@ -71,7 +69,6 @@ proc test_tstart_tstart { } {
 	# Start with a fresh gdb.
 	clean_restart ${executable}
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 
@@ -98,7 +95,6 @@ proc test_buffer_full_tstart { } {
 	# Start with a fresh gdb.
 	clean_restart ${executable}
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp
index 82d62fc3b54..1038b87a3f9 100644
--- a/gdb/testsuite/gdb.trace/strace.exp
+++ b/gdb/testsuite/gdb.trace/strace.exp
@@ -51,7 +51,6 @@ proc strace_remove_socket { action } {
     clean_restart $executable
     gdb_load_shlib $libipa
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
@@ -136,7 +135,6 @@ proc strace_info_marker { } {
 	clean_restart $executable
 	gdb_load_shlib $libipa
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 
@@ -173,7 +171,6 @@ proc strace_probe_marker { } {
 	clean_restart $executable
 	gdb_load_shlib $libipa
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 
@@ -213,7 +210,6 @@ proc strace_trace_on_same_addr { type } {
 	clean_restart $executable
 	gdb_load_shlib $libipa
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 
@@ -317,7 +313,6 @@ proc strace_trace_on_diff_addr { } {
 	clean_restart $executable
 	gdb_load_shlib $libipa
 	if ![runto_main] {
-	    fail "can't run to main"
 	    return -1
 	}
 
@@ -377,7 +372,6 @@ if { [istarget "x86_64-*-linux*"] || [istarget "i\[34567\]86-*-linux*"] } {
 clean_restart $executable
 gdb_load_shlib $libipa
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 if { ![gdb_target_supports_trace] } then {
diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp
index cf60bfad448..2e55d5cb4b0 100644
--- a/gdb/testsuite/gdb.trace/trace-break.exp
+++ b/gdb/testsuite/gdb.trace/trace-break.exp
@@ -32,7 +32,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -52,7 +51,6 @@ proc break_trace_same_addr_1 { trace_type option } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
@@ -87,7 +85,6 @@ proc break_trace_same_addr_2 { trace_type1 trace_type2 option } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
@@ -126,7 +123,6 @@ proc break_trace_same_addr_3 { trace_type option } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
@@ -164,7 +160,6 @@ proc break_trace_same_addr_4 { trace_type option } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
@@ -208,7 +203,6 @@ proc break_trace_same_addr_5 { trace1 trace2 trace3 trace3_at_first_loc } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
@@ -282,7 +276,6 @@ proc break_trace_same_addr_6 { trace1 enable1 trace2 enable2 } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
@@ -371,7 +364,6 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 clean_restart ${executable}
 
 if ![runto_main] {
-    fail "can't run to main for ftrace tests"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.trace/trace-buffer-size.exp b/gdb/testsuite/gdb.trace/trace-buffer-size.exp
index e3962fa0a8c..2b2bb425cff 100644
--- a/gdb/testsuite/gdb.trace/trace-buffer-size.exp
+++ b/gdb/testsuite/gdb.trace/trace-buffer-size.exp
@@ -23,7 +23,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile \
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gdb.trace/trace-condition.exp
index 3b23b4fa8d0..4eb376e8265 100644
--- a/gdb/testsuite/gdb.trace/trace-condition.exp
+++ b/gdb/testsuite/gdb.trace/trace-condition.exp
@@ -36,7 +36,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -61,7 +60,6 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 clean_restart ${executable}
 
 if ![runto_main] {
-    fail "can't run to main for ftrace tests"
     return 0
 }
 
@@ -76,7 +74,6 @@ proc test_tracepoints { trace_command condition num_frames { kfail_proc 0 } } {
     clean_restart ${executable}
 
     if ![runto_main] {
-	fail "can't run to main for ftrace tests"
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.trace/trace-enable-disable.exp b/gdb/testsuite/gdb.trace/trace-enable-disable.exp
index 3733cd6700f..4ceae1a595f 100644
--- a/gdb/testsuite/gdb.trace/trace-enable-disable.exp
+++ b/gdb/testsuite/gdb.trace/trace-enable-disable.exp
@@ -38,7 +38,6 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != ""
 clean_restart ${testfile}
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -70,7 +69,6 @@ proc test_tracepoint_enable_disable { tracepoint_cmd } {
 	set expected 0
 
 	if ![runto_main] {
-	    fail "can't run to main."
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace/trace-mt.exp
index 1c81b2ec59d..634c1e7a4dd 100644
--- a/gdb/testsuite/gdb.trace/trace-mt.exp
+++ b/gdb/testsuite/gdb.trace/trace-mt.exp
@@ -35,7 +35,6 @@ if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
 clean_restart ${testfile}
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
@@ -55,7 +54,6 @@ proc step_over_tracepoint { trace_type } \
     # Make sure inferior is running in all-stop mode.
     gdb_test_no_output "set non-stop 0"
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
@@ -80,7 +78,6 @@ proc break_trace_same_addr { trace_type option } \
     # Start with a fresh gdb.
     clean_restart ${executable}
     if ![runto_main] {
-	fail "can't run to main"
 	return -1
     }
 
@@ -127,7 +124,6 @@ if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
 clean_restart ${executable}
 
 if ![runto_main] {
-    fail "can't run to main for ftrace tests"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
index eafab1d174b..7746a806c23 100644
--- a/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
+++ b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
@@ -27,7 +27,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/tspeed.exp b/gdb/testsuite/gdb.trace/tspeed.exp
index 5728194eda6..59cea40b912 100644
--- a/gdb/testsuite/gdb.trace/tspeed.exp
+++ b/gdb/testsuite/gdb.trace/tspeed.exp
@@ -36,7 +36,6 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != ""
 clean_restart ${testfile}
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/tstatus.exp b/gdb/testsuite/gdb.trace/tstatus.exp
index 69edda65aa8..bbecfe44be2 100644
--- a/gdb/testsuite/gdb.trace/tstatus.exp
+++ b/gdb/testsuite/gdb.trace/tstatus.exp
@@ -29,7 +29,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
 }
 
 if ![runto_main] {
-    fail "can't run to main to check for trace support"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index ff49aff52e5..210ee98835c 100644
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -201,7 +201,6 @@ gdb_test_multiple "target ctf ${tracefile}.ctf" "" {
 clean_restart ${binfile}
 
 if ![runto_main] then {
-    fail "can't run to main"
     return
 }
 
diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp
index db32a36f78c..3cea488aff4 100644
--- a/gdb/testsuite/gdb.trace/while-stepping.exp
+++ b/gdb/testsuite/gdb.trace/while-stepping.exp
@@ -112,7 +112,6 @@ gdb_load $binfile
 gdb_breakpoint "main"
 gdb_run_cmd
 if {[gdb_test "" "Breakpoint .*"] != 0} {
-    fail "can't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.tui/corefile-run.exp b/gdb/testsuite/gdb.tui/corefile-run.exp
index d53149fb648..f000ff6a93a 100644
--- a/gdb/testsuite/gdb.tui/corefile-run.exp
+++ b/gdb/testsuite/gdb.tui/corefile-run.exp
@@ -35,7 +35,6 @@ if { [use_gdb_stub] || [target_info gdb_protocol] == "extended-remote" } {
 }
 
 if { ![runto_main] } {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.tui/tui-layout.exp b/gdb/testsuite/gdb.tui/tui-layout.exp
index b867ab5498b..34b56c7a75b 100644
--- a/gdb/testsuite/gdb.tui/tui-layout.exp
+++ b/gdb/testsuite/gdb.tui/tui-layout.exp
@@ -36,7 +36,6 @@ proc test_layout {layout execution} {
 
     if {$execution} {
 	if ![runto_main] then {
-	    fail "can't run to main"
 	    return 0
 	}
     }
diff --git a/gdb/testsuite/gdb.xml/tdesc-reload.exp b/gdb/testsuite/gdb.xml/tdesc-reload.exp
index a3bb2fb166a..5d6409dfa75 100644
--- a/gdb/testsuite/gdb.xml/tdesc-reload.exp
+++ b/gdb/testsuite/gdb.xml/tdesc-reload.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
 }
 
@@ -64,7 +63,6 @@ gdb_load ${binfile}
 
 # Run to `main' where we begin our tests.
 if ![runto_main] then {
-    untested "could not run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp
index 857b079b9e5..efbcc7b9884 100644
--- a/gdb/testsuite/lib/ada.exp
+++ b/gdb/testsuite/lib/ada.exp
@@ -181,7 +181,6 @@ gdb_caching_proc gnat_runtime_has_debug_info {
     clean_restart $dst
 
     if { ! [runto "GNAT_Debug_Info_Test"] } {
-	fail "failed to run to GNAT_Debug_Info_Test"
 	return 0
     }
 
diff --git a/gdb/testsuite/lib/gdb-guile.exp b/gdb/testsuite/lib/gdb-guile.exp
index c118ffeda50..25b8801362e 100644
--- a/gdb/testsuite/lib/gdb-guile.exp
+++ b/gdb/testsuite/lib/gdb-guile.exp
@@ -105,7 +105,6 @@ proc gdb_install_guile_module { } {
 
 proc gdb_guile_runto_main { } {
     if ![runto_main] {
-	fail "can't run to main"
 	return 0
     }
 
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index afdc92eec3f..6de49c15492 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -707,7 +707,7 @@ proc runto { function args } {
 # If you don't want that, use gdb_start_cmd.
 
 proc runto_main { } {
-    return [runto main no-message qualified]
+    return [runto main qualified]
 }
 
 ### Continue, and expect to hit a breakpoint.
-- 
2.33.0


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gdb/testsuite: make runto_main not pass no-message to runto
  2021-09-30 15:52 [PATCH] gdb/testsuite: make runto_main not pass no-message to runto Simon Marchi
@ 2021-09-30 17:19 ` Tom de Vries
  2021-09-30 18:03 ` Tom Tromey
  2021-12-07  9:51 ` Tom de Vries
  2 siblings, 0 replies; 8+ messages in thread
From: Tom de Vries @ 2021-09-30 17:19 UTC (permalink / raw)
  To: Simon Marchi, gdb-patches

On 9/30/21 5:52 PM, Simon Marchi via Gdb-patches wrote:
> From: Simon Marchi <simon.marchi@polymtl.ca>
> 
> 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

typo: "inconsistent manner"

> "fail", "unsupported" or "untested".  The messages also vary widly.

typo: "widely"

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

I haven't looked at the patch, but the idea LGTM.

Thanks for doing this.
- Tom

> Change-Id: Ib763c98c5f4fb6898886b635210d7c34bd4b9023
> ---
>  gdb/testsuite/gdb.ada/array_return.exp        |  1 -
>  gdb/testsuite/gdb.ada/bp_inlined_func.exp     |  1 -
>  gdb/testsuite/gdb.ada/catch_assert_if.exp     |  2 --
>  gdb/testsuite/gdb.ada/catch_ex.exp            |  3 ---
>  gdb/testsuite/gdb.ada/excep_handle.exp        |  1 -
>  gdb/testsuite/gdb.ada/info_auto_lang.exp      |  1 -
>  gdb/testsuite/gdb.ada/info_exc.exp            |  1 -
>  gdb/testsuite/gdb.ada/mi_catch_assert.exp     |  2 --
>  gdb/testsuite/gdb.ada/mi_catch_ex.exp         |  3 ---
>  gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp    |  3 ---
>  gdb/testsuite/gdb.ada/mi_dyn_arr.exp          |  1 -
>  gdb/testsuite/gdb.ada/mi_ex_cond.exp          |  1 -
>  gdb/testsuite/gdb.ada/mi_exc_info.exp         |  1 -
>  gdb/testsuite/gdb.ada/mi_interface.exp        |  1 -
>  gdb/testsuite/gdb.ada/mi_prot.exp             |  1 -
>  gdb/testsuite/gdb.ada/mi_ref_changeable.exp   |  1 -
>  gdb/testsuite/gdb.ada/mi_string_access.exp    |  1 -
>  gdb/testsuite/gdb.ada/mi_task_arg.exp         |  1 -
>  gdb/testsuite/gdb.ada/mi_task_info.exp        |  1 -
>  gdb/testsuite/gdb.ada/mi_var_access.exp       |  1 -
>  gdb/testsuite/gdb.ada/mi_var_array.exp        |  1 -
>  gdb/testsuite/gdb.ada/mi_var_union.exp        |  1 -
>  gdb/testsuite/gdb.ada/mi_variant.exp          |  1 -
>  .../gdb.arch/aarch64-atomic-inst.exp          |  1 -
>  .../gdb.arch/aarch64-brk-patterns.exp         |  1 -
>  gdb/testsuite/gdb.arch/aarch64-fp.exp         |  1 -
>  gdb/testsuite/gdb.arch/aarch64-mte.exp        |  2 --
>  gdb/testsuite/gdb.arch/aarch64-pauth.exp      |  1 -
>  gdb/testsuite/gdb.arch/aarch64-prologue.exp   |  1 -
>  .../gdb.arch/aarch64-sighandler-regs.exp      |  1 -
>  .../gdb.arch/aarch64-tagged-pointer.exp       |  1 -
>  gdb/testsuite/gdb.arch/alpha-step.exp         |  1 -
>  gdb/testsuite/gdb.arch/altivec-abi.exp        |  1 -
>  gdb/testsuite/gdb.arch/altivec-regs.exp       |  1 -
>  .../gdb.arch/amd64-break-on-asm-line.exp      |  1 -
>  gdb/testsuite/gdb.arch/amd64-byte.exp         |  1 -
>  .../gdb.arch/amd64-disp-step-avx.exp          |  1 -
>  gdb/testsuite/gdb.arch/amd64-disp-step.exp    |  1 -
>  gdb/testsuite/gdb.arch/amd64-dword.exp        |  1 -
>  gdb/testsuite/gdb.arch/amd64-gs_base.exp      |  1 -
>  .../gdb.arch/amd64-init-x87-values.exp        |  3 ---
>  .../gdb.arch/amd64-stap-special-operands.exp  |  1 -
>  .../gdb.arch/amd64-stap-wrong-subexp.exp      |  1 -
>  gdb/testsuite/gdb.arch/amd64-word.exp         |  1 -
>  .../gdb.arch/arc-analyze-prologue.exp         |  1 -
>  gdb/testsuite/gdb.arch/arc-decode-insn.exp    |  1 -
>  gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp   |  1 -
>  gdb/testsuite/gdb.arch/arm-disp-step.exp      |  1 -
>  gdb/testsuite/gdb.arch/arm-neon.exp           |  1 -
>  .../gdb.arch/disp-step-insn-reloc.exp         |  1 -
>  gdb/testsuite/gdb.arch/e500-abi.exp           |  1 -
>  gdb/testsuite/gdb.arch/e500-regs.exp          |  2 --
>  gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp  |  2 --
>  gdb/testsuite/gdb.arch/gdb1291.exp            |  1 -
>  gdb/testsuite/gdb.arch/gdb1431.exp            |  1 -
>  gdb/testsuite/gdb.arch/i386-avx.exp           |  2 --
>  gdb/testsuite/gdb.arch/i386-avx512.exp        |  1 -
>  gdb/testsuite/gdb.arch/i386-byte.exp          |  1 -
>  gdb/testsuite/gdb.arch/i386-disp-step.exp     |  1 -
>  gdb/testsuite/gdb.arch/i386-dr3-watch.exp     |  1 -
>  gdb/testsuite/gdb.arch/i386-float.exp         |  1 -
>  gdb/testsuite/gdb.arch/i386-mpx-call.exp      |  1 -
>  gdb/testsuite/gdb.arch/i386-mpx-map.exp       |  1 -
>  gdb/testsuite/gdb.arch/i386-mpx-sigsegv.exp   |  1 -
>  .../gdb.arch/i386-mpx-simple_segv.exp         |  5 -----
>  gdb/testsuite/gdb.arch/i386-mpx.exp           |  1 -
>  gdb/testsuite/gdb.arch/i386-pkru.exp          |  1 -
>  gdb/testsuite/gdb.arch/i386-prologue.exp      |  1 -
>  gdb/testsuite/gdb.arch/i386-sse.exp           |  1 -
>  gdb/testsuite/gdb.arch/i386-word.exp          |  1 -
>  .../gdb.arch/ia64-breakpoint-shadow.exp       |  1 -
>  gdb/testsuite/gdb.arch/iwmmxt-regs.exp        |  1 -
>  gdb/testsuite/gdb.arch/mips16-thunks.exp      |  1 -
>  gdb/testsuite/gdb.arch/pa-nullify.exp         |  3 ---
>  gdb/testsuite/gdb.arch/powerpc-d128-regs.exp  |  1 -
>  .../gdb.arch/powerpc-fpscr-gcore.exp          |  1 -
>  gdb/testsuite/gdb.arch/powerpc-prologue.exp   |  1 -
>  gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp  |  1 -
>  gdb/testsuite/gdb.arch/powerpc64-prologue.exp |  1 -
>  gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp  |  1 -
>  .../gdb.arch/ppc64-isa207-atomic-inst.exp     |  1 -
>  gdb/testsuite/gdb.arch/riscv-bp-infcall.exp   |  1 -
>  gdb/testsuite/gdb.arch/riscv-reg-aliases.exp  |  1 -
>  gdb/testsuite/gdb.arch/riscv-tdesc-regs.exp   |  1 -
>  .../gdb.arch/riscv-unwind-long-insn.exp       |  1 -
>  .../riscv64-unwind-prologue-with-ld-lw.exp    |  1 -
>  gdb/testsuite/gdb.arch/s390-tdbregs.exp       |  1 -
>  gdb/testsuite/gdb.arch/s390-vregs.exp         |  1 -
>  gdb/testsuite/gdb.arch/sparc64-adi.exp        |  1 -
>  gdb/testsuite/gdb.arch/sparc64-regs.exp       |  1 -
>  gdb/testsuite/gdb.arch/thumb-bx-pc.exp        |  1 -
>  gdb/testsuite/gdb.arch/thumb-prologue.exp     |  1 -
>  gdb/testsuite/gdb.arch/thumb-singlestep.exp   |  1 -
>  gdb/testsuite/gdb.arch/thumb2-it.exp          |  1 -
>  gdb/testsuite/gdb.arch/vsx-regs.exp           |  1 -
>  gdb/testsuite/gdb.arch/vsx-vsr-float28.exp    |  1 -
>  gdb/testsuite/gdb.arch/x86-avx512bf16.exp     |  1 -
>  gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp |  1 -
>  gdb/testsuite/gdb.arch/x86-avx512fp16.exp     |  1 -
>  gdb/testsuite/gdb.asm/asm-source.exp          |  1 -
>  .../advance-until-multiple-locations.exp      |  5 -----
>  gdb/testsuite/gdb.base/advance.exp            |  1 -
>  .../gdb.base/annota-input-while-running.exp   |  1 -
>  gdb/testsuite/gdb.base/annota1.exp            |  1 -
>  gdb/testsuite/gdb.base/annotate-symlink.exp   |  1 -
>  gdb/testsuite/gdb.base/anon.exp               |  1 -
>  gdb/testsuite/gdb.base/argv0-symlink.exp      |  2 --
>  gdb/testsuite/gdb.base/asmlabel.exp           |  1 -
>  gdb/testsuite/gdb.base/attach-wait-input.exp  |  1 -
>  gdb/testsuite/gdb.base/attach.exp             |  1 -
>  .../gdb.base/auto-connect-native-target.exp   |  1 -
>  gdb/testsuite/gdb.base/auxv.exp               |  1 -
>  gdb/testsuite/gdb.base/backtrace.exp          |  1 -
>  gdb/testsuite/gdb.base/bigcore.exp            |  1 -
>  gdb/testsuite/gdb.base/break-idempotent.exp   |  1 -
>  .../gdb.base/break-main-file-remove-fail.exp  |  1 -
>  gdb/testsuite/gdb.base/break-unload-file.exp  |  1 -
>  gdb/testsuite/gdb.base/break.exp              | 12 +++++++---
>  gdb/testsuite/gdb.base/breakpoint-shadow.exp  |  1 -
>  .../gdb.base/bt-on-error-and-warning.exp      |  1 -
>  gdb/testsuite/gdb.base/bt-on-fatal-signal.exp |  1 -
>  gdb/testsuite/gdb.base/bt-selected-frame.exp  |  1 -
>  gdb/testsuite/gdb.base/call-signal-resume.exp |  1 -
>  gdb/testsuite/gdb.base/callexit.exp           |  1 -
>  gdb/testsuite/gdb.base/cast-call.exp          |  1 -
>  gdb/testsuite/gdb.base/catch-follow-exec.exp  |  1 -
>  gdb/testsuite/gdb.base/catch-fork-kill.exp    |  1 -
>  .../gdb.base/catch-gdb-caused-signals.exp     |  1 -
>  gdb/testsuite/gdb.base/catch-load.exp         |  1 -
>  .../gdb.base/catch-signal-siginfo-cond.exp    |  1 -
>  gdb/testsuite/gdb.base/catch-syscall.exp      |  1 -
>  gdb/testsuite/gdb.base/commands.exp           |  1 -
>  gdb/testsuite/gdb.base/compare-sections.exp   |  1 -
>  gdb/testsuite/gdb.base/complex-parts.exp      |  1 -
>  gdb/testsuite/gdb.base/cond-eval-mode.exp     |  1 -
>  gdb/testsuite/gdb.base/condbreak-bad.exp      |  3 ---
>  .../gdb.base/condbreak-call-false.exp         |  1 -
>  .../gdb.base/consecutive-step-over.exp        |  1 -
>  .../continue-after-aborted-step-over.exp      |  1 -
>  .../gdb.base/continue-all-already-running.exp |  1 -
>  .../gdb.base/coredump-filter-build-id.exp     |  1 -
>  gdb/testsuite/gdb.base/coredump-filter.exp    |  1 -
>  gdb/testsuite/gdb.base/corefile2.exp          |  1 -
>  gdb/testsuite/gdb.base/ctxobj.exp             |  1 -
>  gdb/testsuite/gdb.base/debug-expr.exp         |  1 -
>  gdb/testsuite/gdb.base/decl-before-def.exp    |  1 -
>  gdb/testsuite/gdb.base/define.exp             |  4 +++-
>  .../gdb.base/detach-sysroot-target.exp        |  1 -
>  gdb/testsuite/gdb.base/disabled-location.exp  |  1 -
>  gdb/testsuite/gdb.base/display.exp            |  3 +--
>  .../gdb.base/dprintf-bp-same-addr.exp         |  1 -
>  gdb/testsuite/gdb.base/dprintf-detach.exp     |  1 -
>  gdb/testsuite/gdb.base/dprintf-next.exp       |  1 -
>  gdb/testsuite/gdb.base/dprintf-non-stop.exp   |  1 -
>  gdb/testsuite/gdb.base/dtrace-probe.exp       |  8 ++-----
>  gdb/testsuite/gdb.base/duplicate-bp.exp       |  1 -
>  gdb/testsuite/gdb.base/ena-dis-br.exp         | 22 ++++++++++++-------
>  gdb/testsuite/gdb.base/endianity.exp          |  1 -
>  gdb/testsuite/gdb.base/examine-backward.exp   |  1 -
>  .../gdb.base/exec-invalid-sysroot.exp         |  1 -
>  .../gdb.base/execl-update-breakpoints.exp     |  3 ---
>  gdb/testsuite/gdb.base/execution-termios.exp  |  1 -
>  gdb/testsuite/gdb.base/finish-pretty.exp      |  1 -
>  gdb/testsuite/gdb.base/finish.exp             |  3 ---
>  gdb/testsuite/gdb.base/fixsection.exp         |  1 -
>  gdb/testsuite/gdb.base/foll-exec-mode.exp     |  2 --
>  gdb/testsuite/gdb.base/foll-exec.exp          |  6 -----
>  gdb/testsuite/gdb.base/foll-fork.exp          |  1 -
>  gdb/testsuite/gdb.base/fork-running-state.exp |  1 -
>  .../gdb.base/frame-info-consistent.exp        |  1 -
>  gdb/testsuite/gdb.base/frameapply.exp         |  1 -
>  gdb/testsuite/gdb.base/func-ptr.exp           |  1 -
>  gdb/testsuite/gdb.base/func-ptrs.exp          |  1 -
>  .../gdb.base/gcore-buffer-overflow.exp        |  1 -
>  gdb/testsuite/gdb.base/gcore-relro-pie.exp    |  1 -
>  gdb/testsuite/gdb.base/gcore-tls-pie.exp      |  1 -
>  gdb/testsuite/gdb.base/gcore.exp              |  1 -
>  gdb/testsuite/gdb.base/gdb1090.exp            |  1 -
>  gdb/testsuite/gdb.base/gdb11530.exp           |  1 -
>  gdb/testsuite/gdb.base/gdb11531.exp           |  1 -
>  gdb/testsuite/gdb.base/gdb1555.exp            |  1 -
>  gdb/testsuite/gdb.base/gnu-ifunc.exp          |  2 --
>  gdb/testsuite/gdb.base/gnu_vector.exp         |  1 -
>  gdb/testsuite/gdb.base/gold-gdb-index.exp     |  1 -
>  .../gdb.base/hbreak-in-shr-unsupported.exp    |  1 -
>  gdb/testsuite/gdb.base/hbreak-unmapped.exp    |  1 -
>  gdb/testsuite/gdb.base/hbreak.exp             |  1 -
>  gdb/testsuite/gdb.base/hbreak2.exp            | 18 +++++++++++----
>  gdb/testsuite/gdb.base/hook-stop.exp          |  1 -
>  gdb/testsuite/gdb.base/huge.exp               |  1 -
>  .../gdb.base/hw-sw-break-same-address.exp     |  1 -
>  gdb/testsuite/gdb.base/infcall-exec.exp       |  1 -
>  gdb/testsuite/gdb.base/infcall-input.exp      |  1 -
>  .../gdb.base/infcall-nested-structs.exp.tcl   |  1 -
>  gdb/testsuite/gdb.base/inferior-args.exp      |  1 -
>  gdb/testsuite/gdb.base/inferior-noarg.exp     |  1 -
>  gdb/testsuite/gdb.base/info-fun.exp           |  1 -
>  .../info-locals-unused-static-var.exp         |  1 -
>  gdb/testsuite/gdb.base/info-macros.exp        |  1 -
>  gdb/testsuite/gdb.base/info-os.exp            |  1 -
>  gdb/testsuite/gdb.base/info-proc.exp          |  1 -
>  gdb/testsuite/gdb.base/info-program.exp       |  2 --
>  gdb/testsuite/gdb.base/info-types.exp.tcl     |  1 -
>  gdb/testsuite/gdb.base/info_qt.exp            |  1 -
>  gdb/testsuite/gdb.base/info_sources.exp       |  1 -
>  .../gdb.base/inline-frame-cycle-unwind.exp    |  1 -
>  gdb/testsuite/gdb.base/interp.exp             |  1 -
>  gdb/testsuite/gdb.base/interrupt-daemon.exp   |  1 -
>  gdb/testsuite/gdb.base/interrupt-noterm.exp   |  1 -
>  gdb/testsuite/gdb.base/jit-elf-fork.exp       |  1 -
>  gdb/testsuite/gdb.base/jit-elf-so.exp         |  1 -
>  gdb/testsuite/gdb.base/jit-elf.exp            |  1 -
>  gdb/testsuite/gdb.base/jit-reader-exec.exp    |  1 -
>  gdb/testsuite/gdb.base/jit-reader-simple.exp  |  1 -
>  .../gdb.base/label-without-address.exp        |  1 -
>  gdb/testsuite/gdb.base/label.exp              |  1 -
>  gdb/testsuite/gdb.base/large-frame.exp        |  1 -
>  gdb/testsuite/gdb.base/ldbl_e308.exp          |  1 -
>  gdb/testsuite/gdb.base/line-symtabs.exp       |  1 -
>  .../gdb.base/list-missing-source.exp          |  1 -
>  gdb/testsuite/gdb.base/list.exp               |  1 -
>  gdb/testsuite/gdb.base/load-command.exp       |  1 -
>  .../gdb.base/long-inferior-output.exp         |  1 -
>  gdb/testsuite/gdb.base/long_long.exp          |  1 -
>  gdb/testsuite/gdb.base/longjmp.exp            |  1 -
>  gdb/testsuite/gdb.base/macscp.exp             |  1 -
>  .../gdb.base/maint-info-sections.exp          |  1 -
>  .../gdb.base/maint-target-async-off.exp       |  1 -
>  gdb/testsuite/gdb.base/many-completions.exp   |  1 -
>  gdb/testsuite/gdb.base/max-depth.exp.tcl      |  1 -
>  gdb/testsuite/gdb.base/max-value-size.exp     |  1 -
>  gdb/testsuite/gdb.base/memtag.exp             |  1 -
>  gdb/testsuite/gdb.base/msym-bp-shl.exp        |  1 -
>  gdb/testsuite/gdb.base/msym-bp.exp            |  1 -
>  gdb/testsuite/gdb.base/new-ui.exp             |  3 +--
>  gdb/testsuite/gdb.base/noreturn-finish.exp    |  1 -
>  gdb/testsuite/gdb.base/noreturn-return.exp    |  1 -
>  gdb/testsuite/gdb.base/options.exp            |  2 --
>  gdb/testsuite/gdb.base/overlays.exp           |  1 -
>  .../paginate-after-ctrl-c-running.exp         |  1 -
>  .../gdb.base/paginate-bg-execution.exp        |  1 -
>  .../gdb.base/paginate-inferior-exit.exp       |  1 -
>  gdb/testsuite/gdb.base/pie-fork.exp           |  1 -
>  gdb/testsuite/gdb.base/pr10179.exp            |  1 -
>  gdb/testsuite/gdb.base/pr11022.exp            |  1 -
>  gdb/testsuite/gdb.base/pretty-array.exp       |  1 -
>  gdb/testsuite/gdb.base/pretty-print.exp       |  1 -
>  gdb/testsuite/gdb.base/print-file-var.exp     |  1 -
>  gdb/testsuite/gdb.base/printcmds.exp          |  1 -
>  gdb/testsuite/gdb.base/quit-live.exp          |  1 -
>  gdb/testsuite/gdb.base/range-stepping.exp     |  1 -
>  gdb/testsuite/gdb.base/recpar.exp             |  1 -
>  gdb/testsuite/gdb.base/reggroups.exp          |  1 -
>  gdb/testsuite/gdb.base/remote.exp             |  1 -
>  gdb/testsuite/gdb.base/return2.exp            |  1 -
>  .../gdb.base/run-attach-while-running.exp     |  1 -
>  gdb/testsuite/gdb.base/save-bp.exp            |  2 --
>  gdb/testsuite/gdb.base/savedregs.exp          |  1 -
>  gdb/testsuite/gdb.base/sect-cmd.exp           |  1 -
>  gdb/testsuite/gdb.base/sepdebug.exp           | 12 +++++++---
>  gdb/testsuite/gdb.base/set-cwd.exp            |  4 ----
>  gdb/testsuite/gdb.base/set-noassign.exp       |  1 -
>  gdb/testsuite/gdb.base/setshow.exp            |  2 --
>  gdb/testsuite/gdb.base/share-psymtabs-bt.exp  |  1 -
>  gdb/testsuite/gdb.base/shreloc.exp            |  1 -
>  gdb/testsuite/gdb.base/sigaltstack.exp        |  1 -
>  gdb/testsuite/gdb.base/sigbpt.exp             |  1 -
>  gdb/testsuite/gdb.base/siginfo-addr.exp       |  1 -
>  gdb/testsuite/gdb.base/siginfo-obj.exp        |  2 --
>  gdb/testsuite/gdb.base/siginfo-thread.exp     |  1 -
>  gdb/testsuite/gdb.base/siginfo.exp            |  1 -
>  .../gdb.base/signals-state-child.exp          |  1 -
>  gdb/testsuite/gdb.base/signest.exp            |  1 -
>  gdb/testsuite/gdb.base/signull.exp            |  1 -
>  gdb/testsuite/gdb.base/sigrepeat.exp          |  1 -
>  gdb/testsuite/gdb.base/skip-inline.exp        |  4 ----
>  gdb/testsuite/gdb.base/skip-solib.exp         |  8 +++++--
>  gdb/testsuite/gdb.base/skip.exp               | 13 +----------
>  gdb/testsuite/gdb.base/skipcxx.exp            |  1 -
>  gdb/testsuite/gdb.base/so-impl-ld.exp         |  4 +++-
>  gdb/testsuite/gdb.base/solib-corrupted.exp    |  1 -
>  gdb/testsuite/gdb.base/solib-disc.exp         |  1 -
>  gdb/testsuite/gdb.base/solib-display.exp      |  1 -
>  gdb/testsuite/gdb.base/solib-search.exp       |  1 -
>  gdb/testsuite/gdb.base/solib-symbol.exp       |  1 -
>  gdb/testsuite/gdb.base/solib-vanish.exp       |  1 -
>  gdb/testsuite/gdb.base/source-dir.exp         |  1 -
>  gdb/testsuite/gdb.base/source-execution.exp   |  1 -
>  .../gdb.base/sss-bp-on-user-bp-2.exp          |  1 -
>  gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp  |  1 -
>  gdb/testsuite/gdb.base/stack-checking.exp     |  1 -
>  gdb/testsuite/gdb.base/stack-protector.exp    |  1 -
>  gdb/testsuite/gdb.base/step-break.exp         |  1 -
>  .../gdb.base/step-indirect-call-thunk.exp     |  1 -
>  gdb/testsuite/gdb.base/step-line.exp          |  1 -
>  gdb/testsuite/gdb.base/step-over-exit.exp     |  1 -
>  .../gdb.base/step-over-no-symbols.exp         |  2 --
>  gdb/testsuite/gdb.base/step-over-syscall.exp  |  2 --
>  gdb/testsuite/gdb.base/step-test.exp          |  3 ---
>  gdb/testsuite/gdb.base/structs2.exp           |  1 -
>  gdb/testsuite/gdb.base/structs3.exp           |  1 -
>  .../gdb.base/style-interp-exec-mi.exp         |  1 -
>  gdb/testsuite/gdb.base/style-logging.exp      |  1 -
>  gdb/testsuite/gdb.base/style.exp              |  1 -
>  gdb/testsuite/gdb.base/sym-file.exp           |  1 -
>  gdb/testsuite/gdb.base/symbol-alias.exp       |  1 -
>  gdb/testsuite/gdb.base/symlink-sourcefile.exp |  1 -
>  .../gdb.base/symtab-search-order.exp          |  1 -
>  gdb/testsuite/gdb.base/template.exp           |  1 -
>  gdb/testsuite/gdb.base/term.exp               |  1 -
>  gdb/testsuite/gdb.base/type-opaque.exp        |  1 -
>  gdb/testsuite/gdb.base/ui-redirect.exp        |  1 -
>  gdb/testsuite/gdb.base/until-nodebug.exp      |  1 -
>  gdb/testsuite/gdb.base/until.exp              |  1 -
>  gdb/testsuite/gdb.base/unwindonsignal.exp     |  1 -
>  gdb/testsuite/gdb.base/utf8-identifiers.exp   |  1 -
>  gdb/testsuite/gdb.base/vla-optimized-out.exp  |  1 -
>  gdb/testsuite/gdb.base/watch-cond-infcall.exp |  1 -
>  gdb/testsuite/gdb.base/watch-cond.exp         |  3 ---
>  gdb/testsuite/gdb.base/watch-non-mem.exp      |  1 -
>  gdb/testsuite/gdb.base/watch-read.exp         |  1 -
>  gdb/testsuite/gdb.base/watch-vfork.exp        |  1 -
>  gdb/testsuite/gdb.base/watch_thread_num.exp   |  1 -
>  .../gdb.base/watchpoint-hw-attach.exp         |  1 -
>  .../gdb.base/watchpoint-reuse-slot.exp        |  1 -
>  .../watchpoint-stops-at-right-insn.exp        |  2 --
>  .../gdb.base/watchpoint-unaligned.exp         |  1 -
>  gdb/testsuite/gdb.base/watchpoint.exp         |  4 +++-
>  .../gdb.base/whatis-ptype-typedefs.exp        |  1 -
>  gdb/testsuite/gdb.base/with.exp               |  1 -
>  gdb/testsuite/gdb.btrace/buffer-size.exp      |  1 -
>  gdb/testsuite/gdb.btrace/data.exp             |  1 -
>  gdb/testsuite/gdb.btrace/delta.exp            |  1 -
>  gdb/testsuite/gdb.btrace/dlopen.exp           |  1 -
>  .../gdb.btrace/enable-new-thread.exp          |  1 -
>  gdb/testsuite/gdb.btrace/enable-running.exp   |  1 -
>  gdb/testsuite/gdb.btrace/enable.exp           |  5 -----
>  gdb/testsuite/gdb.btrace/exception.exp        |  1 -
>  .../gdb.btrace/function_call_history.exp      |  2 --
>  gdb/testsuite/gdb.btrace/gcore.exp            |  1 -
>  .../gdb.btrace/instruction_history.exp        |  1 -
>  gdb/testsuite/gdb.btrace/multi-inferior.exp   |  3 ---
>  .../gdb.btrace/multi-thread-step.exp          |  1 -
>  gdb/testsuite/gdb.btrace/nohist.exp           |  1 -
>  gdb/testsuite/gdb.btrace/non-stop.exp         |  1 -
>  gdb/testsuite/gdb.btrace/record_goto-step.exp |  1 -
>  gdb/testsuite/gdb.btrace/record_goto.exp      |  1 -
>  gdb/testsuite/gdb.btrace/rn-dl-bind.exp       |  1 -
>  gdb/testsuite/gdb.btrace/segv.exp             |  1 -
>  gdb/testsuite/gdb.btrace/step.exp             |  1 -
>  gdb/testsuite/gdb.btrace/stepi.exp            |  1 -
>  gdb/testsuite/gdb.btrace/tailcall-only.exp    |  1 -
>  gdb/testsuite/gdb.btrace/tailcall.exp         |  1 -
>  gdb/testsuite/gdb.btrace/tsx.exp              |  1 -
>  .../gdb.btrace/unknown_functions.exp          |  1 -
>  gdb/testsuite/gdb.btrace/vdso.exp             |  1 -
>  .../gdb.compile/compile-cplus-anonymous.exp   |  1 -
>  .../gdb.compile/compile-cplus-array-decay.exp |  1 -
>  .../gdb.compile/compile-cplus-inherit.exp     |  1 -
>  .../gdb.compile/compile-cplus-member.exp      |  1 -
>  .../gdb.compile/compile-cplus-method.exp      |  1 -
>  .../gdb.compile/compile-cplus-namespace.exp   |  1 -
>  .../gdb.compile/compile-cplus-nested.exp      |  1 -
>  .../gdb.compile/compile-cplus-virtual.exp     |  1 -
>  gdb/testsuite/gdb.compile/compile-tls.exp     |  1 -
>  gdb/testsuite/gdb.cp/abstract-origin.exp      |  1 -
>  gdb/testsuite/gdb.cp/baseenum.exp             |  1 -
>  gdb/testsuite/gdb.cp/call-method-register.exp |  1 -
>  gdb/testsuite/gdb.cp/cplabel.exp              |  1 -
>  gdb/testsuite/gdb.cp/destrprint.exp           |  1 -
>  gdb/testsuite/gdb.cp/ena-dis-br-range.exp     |  1 -
>  .../gdb.cp/except-multi-location.exp          |  1 -
>  gdb/testsuite/gdb.cp/infcall-nodebug.exp.tcl  |  1 -
>  gdb/testsuite/gdb.cp/local-static.exp         |  1 -
>  gdb/testsuite/gdb.cp/mb-inline.exp            |  1 -
>  gdb/testsuite/gdb.cp/mb-templates.exp         |  1 -
>  gdb/testsuite/gdb.cp/pass-by-ref-2.exp        |  1 -
>  gdb/testsuite/gdb.cp/pass-by-ref.exp          |  1 -
>  gdb/testsuite/gdb.cp/pr10687.exp              |  1 -
>  gdb/testsuite/gdb.cp/pr9167.exp               |  1 -
>  gdb/testsuite/gdb.cp/rvalue-ref-casts.exp     |  1 -
>  gdb/testsuite/gdb.cp/rvalue-ref-types.exp     |  2 --
>  gdb/testsuite/gdb.cp/save-bp-qualified.exp    |  1 -
>  gdb/testsuite/gdb.cp/scope-err.exp            |  1 -
>  gdb/testsuite/gdb.cp/static-typedef-print.exp |  1 -
>  gdb/testsuite/gdb.cp/step-and-next-inline.exp |  2 --
>  gdb/testsuite/gdb.cp/typedef-base.exp         |  1 -
>  gdb/testsuite/gdb.cp/typeid.exp               |  1 -
>  gdb/testsuite/gdb.cp/wide_char_types.exp      |  1 -
>  .../dw2-single-line-discriminators.exp        |  1 -
>  gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp   |  1 -
>  .../gdb.dwarf2/imported-unit-runto-main.exp   |  2 +-
>  .../locexpr-data-member-location.exp          |  1 -
>  .../gdb.dwarf2/loclists-multiple-cus.exp      |  1 -
>  .../gdb.dwarf2/loclists-sec-offset.exp        |  1 -
>  .../gdb.dwarf2/loclists-start-end.exp         |  1 -
>  gdb/testsuite/gdb.fortran/allocated.exp       |  1 -
>  .../gdb.fortran/array-slices-bad.exp          |  1 -
>  .../gdb.fortran/array-slices-sub-slices.exp   |  1 -
>  gdb/testsuite/gdb.fortran/array-slices.exp    |  1 -
>  gdb/testsuite/gdb.fortran/associated.exp      |  1 -
>  gdb/testsuite/gdb.fortran/block-data.exp      |  1 -
>  gdb/testsuite/gdb.fortran/call-no-debug.exp   |  1 -
>  .../gdb.fortran/class-allocatable-array.exp   |  1 -
>  gdb/testsuite/gdb.fortran/completion.exp      |  1 -
>  gdb/testsuite/gdb.fortran/debug-expr.exp      |  1 -
>  gdb/testsuite/gdb.fortran/intvar-array.exp    |  1 -
>  .../gdb.fortran/intvar-dynamic-types.exp      |  1 -
>  gdb/testsuite/gdb.fortran/lbound-ubound.exp   |  1 -
>  .../gdb.fortran/mixed-lang-stack.exp          |  1 -
>  .../gdb.fortran/pointer-to-pointer.exp        |  1 -
>  gdb/testsuite/gdb.fortran/print-formatted.exp |  1 -
>  gdb/testsuite/gdb.fortran/print_type.exp      |  1 -
>  gdb/testsuite/gdb.fortran/printing-types.exp  |  1 -
>  gdb/testsuite/gdb.fortran/ptr-indentation.exp |  1 -
>  gdb/testsuite/gdb.fortran/rank.exp            |  1 -
>  gdb/testsuite/gdb.fortran/shape.exp           |  1 -
>  gdb/testsuite/gdb.fortran/size.exp            |  1 -
>  gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp |  1 -
>  gdb/testsuite/gdb.fortran/vla-datatypes.exp   |  1 -
>  gdb/testsuite/gdb.fortran/vla-history.exp     |  1 -
>  gdb/testsuite/gdb.fortran/vla-ptr-info.exp    |  1 -
>  gdb/testsuite/gdb.fortran/vla-ptype-sub.exp   |  1 -
>  gdb/testsuite/gdb.fortran/vla-ptype.exp       |  1 -
>  gdb/testsuite/gdb.fortran/vla-sizeof.exp      |  1 -
>  gdb/testsuite/gdb.fortran/vla-type.exp        |  1 -
>  .../gdb.fortran/vla-value-sub-arbitrary.exp   |  1 -
>  .../gdb.fortran/vla-value-sub-finish.exp      |  1 -
>  gdb/testsuite/gdb.fortran/vla-value-sub.exp   |  1 -
>  gdb/testsuite/gdb.fortran/vla-value.exp       |  1 -
>  gdb/testsuite/gdb.fortran/whatis_type.exp     |  1 -
>  gdb/testsuite/gdb.go/chan.exp                 |  1 -
>  .../gdb.go/global-local-var-shadow.exp        |  1 -
>  gdb/testsuite/gdb.go/handcall.exp             |  1 -
>  gdb/testsuite/gdb.go/hello.exp                |  1 -
>  gdb/testsuite/gdb.go/integers.exp             |  1 -
>  gdb/testsuite/gdb.go/max-depth.exp            |  1 -
>  gdb/testsuite/gdb.go/methods.exp              |  1 -
>  gdb/testsuite/gdb.go/package.exp              |  1 -
>  gdb/testsuite/gdb.go/strings.exp              |  1 -
>  gdb/testsuite/gdb.go/types.exp                |  1 -
>  gdb/testsuite/gdb.go/unsafe.exp               |  1 -
>  gdb/testsuite/gdb.guile/scm-breakpoint.exp    |  1 -
>  gdb/testsuite/gdb.guile/scm-cmd.exp           |  1 -
>  gdb/testsuite/gdb.guile/scm-frame-inline.exp  |  1 -
>  gdb/testsuite/gdb.guile/scm-lazy-string.exp   |  1 -
>  gdb/testsuite/gdb.guile/scm-objfile.exp       |  1 -
>  gdb/testsuite/gdb.guile/scm-value.exp         |  2 --
>  gdb/testsuite/gdb.linespec/keywords.exp       |  1 -
>  gdb/testsuite/gdb.linespec/ls-errs.exp        |  1 -
>  gdb/testsuite/gdb.linespec/thread.exp         |  1 -
>  gdb/testsuite/gdb.mi/mi-var-create-rtti.exp   |  1 -
>  .../gdb.mi/user-selected-context-sync.exp     |  1 -
>  gdb/testsuite/gdb.modula2/max-depth.exp       |  1 -
>  gdb/testsuite/gdb.multi/bkpt-multi-exec.exp   |  1 -
>  .../gdb.multi/dummy-frame-restore.exp         |  2 --
>  gdb/testsuite/gdb.multi/multi-arch-exec.exp   |  1 -
>  gdb/testsuite/gdb.multi/multi-arch.exp        |  4 ++--
>  gdb/testsuite/gdb.multi/multi-re-run.exp      |  5 ++---
>  .../gdb.multi/multi-term-settings.exp         |  1 -
>  gdb/testsuite/gdb.multi/remove-inferiors.exp  |  1 -
>  gdb/testsuite/gdb.multi/stop-all-on-exit.exp  |  2 --
>  gdb/testsuite/gdb.multi/tids-gid-reset.exp    |  1 -
>  .../gdb.multi/watchpoint-multi-exit.exp       |  1 -
>  .../gdb.opt/clobbered-registers-O2.exp        |  1 -
>  gdb/testsuite/gdb.opt/inline-break.exp        |  5 -----
>  gdb/testsuite/gdb.perf/backtrace.exp          |  1 -
>  gdb/testsuite/gdb.perf/single-step.exp        |  1 -
>  gdb/testsuite/gdb.perf/skip-command.exp       |  1 -
>  gdb/testsuite/gdb.perf/skip-prologue.exp      |  1 -
>  gdb/testsuite/gdb.perf/solib.exp              |  1 -
>  .../gdb.perf/template-breakpoints.exp         |  1 -
>  gdb/testsuite/gdb.python/lib-types.exp        |  1 -
>  gdb/testsuite/gdb.python/py-as-string.exp     |  1 -
>  ...ed-pretty-printers-in-newobjfile-event.exp |  1 -
>  gdb/testsuite/gdb.python/py-bad-printers.exp  |  1 -
>  gdb/testsuite/gdb.python/py-block.exp         |  1 -
>  .../gdb.python/py-breakpoint-create-fail.exp  |  3 +--
>  gdb/testsuite/gdb.python/py-breakpoint.exp    | 14 ------------
>  gdb/testsuite/gdb.python/py-cmd.exp           |  1 -
>  .../gdb.python/py-finish-breakpoint.exp       | 10 +--------
>  .../gdb.python/py-finish-breakpoint2.exp      |  1 -
>  gdb/testsuite/gdb.python/py-frame-inline.exp  |  1 -
>  gdb/testsuite/gdb.python/py-frame.exp         |  1 -
>  gdb/testsuite/gdb.python/py-inferior.exp      |  1 -
>  gdb/testsuite/gdb.python/py-infthread.exp     |  1 -
>  gdb/testsuite/gdb.python/py-objfile.exp       |  2 --
>  .../gdb.python/py-pending-frame-level.exp     |  1 -
>  gdb/testsuite/gdb.python/py-pp-maint.exp      |  1 -
>  .../gdb.python/py-pp-registration.exp         |  3 +--
>  gdb/testsuite/gdb.python/py-progspace.exp     |  1 -
>  gdb/testsuite/gdb.python/py-rbreak.exp        |  1 -
>  .../gdb.python/py-record-btrace-threads.exp   |  1 -
>  gdb/testsuite/gdb.python/py-record-btrace.exp |  1 -
>  gdb/testsuite/gdb.python/py-record-full.exp   |  1 -
>  .../gdb.python/py-recurse-unwind.exp          |  1 -
>  .../gdb.python/py-rvalue-ref-value-cc.exp     |  1 -
>  gdb/testsuite/gdb.python/py-shared.exp        |  1 -
>  gdb/testsuite/gdb.python/py-symbol.exp        |  3 ---
>  gdb/testsuite/gdb.python/py-symtab.exp        |  1 -
>  gdb/testsuite/gdb.python/py-unwind-inline.exp |  1 -
>  gdb/testsuite/gdb.python/py-unwind-maint.exp  |  1 -
>  .../gdb.python/py-unwind-user-regs.exp        |  1 -
>  gdb/testsuite/gdb.python/py-unwind.exp        |  1 -
>  gdb/testsuite/gdb.python/py-value.exp         |  1 -
>  gdb/testsuite/gdb.python/python.exp           |  3 ---
>  .../gdb.reverse/finish-reverse-bkpt.exp       |  1 -
>  gdb/testsuite/gdb.reverse/insn-reverse.exp    |  1 -
>  .../gdb.reverse/next-reverse-bkpt-over-sr.exp |  1 -
>  .../gdb.reverse/step-indirect-call-thunk.exp  |  1 -
>  .../gdb.server/extended-remote-restart.exp    |  1 -
>  gdb/testsuite/gdb.stabs/gdb11479.exp          |  1 -
>  .../access-mem-running-thread-exit.exp        |  2 --
>  gdb/testsuite/gdb.threads/async.exp           |  1 -
>  .../gdb.threads/clone-new-thread-event.exp    |  1 -
>  gdb/testsuite/gdb.threads/clone-thread_db.exp |  1 -
>  .../gdb.threads/continue-pending-status.exp   |  1 -
>  .../gdb.threads/current-lwp-dead.exp          |  1 -
>  .../gdb.threads/fork-child-threads.exp        |  1 -
>  .../gdb.threads/fork-plus-threads.exp         |  1 -
>  .../gdb.threads/fork-thread-pending.exp       |  2 --
>  .../forking-threads-plus-breakpoint.exp       |  2 --
>  gdb/testsuite/gdb.threads/gcore-thread.exp    |  1 -
>  .../gdb.threads/hand-call-in-threads.exp      |  1 -
>  .../gdb.threads/interrupt-while-step-over.exp |  2 --
>  .../gdb.threads/interrupted-hand-call.exp     |  1 -
>  gdb/testsuite/gdb.threads/kill.exp            |  1 -
>  .../gdb.threads/local-watch-wrong-thread.exp  |  1 -
>  .../multiple-successive-infcall.exp           |  1 -
>  .../next-while-other-thread-longjmps.exp      |  1 -
>  gdb/testsuite/gdb.threads/non-ldr-exit.exp    |  1 -
>  gdb/testsuite/gdb.threads/omp-par-scope.exp   |  1 -
>  gdb/testsuite/gdb.threads/pending-step.exp    |  1 -
>  .../process-dies-while-detaching.exp          |  3 ---
>  .../process-dies-while-handling-bp.exp        |  1 -
>  gdb/testsuite/gdb.threads/queue-signal.exp    |  1 -
>  .../gdb.threads/reconnect-signal.exp          |  1 -
>  .../signal-command-handle-nopass.exp          |  1 -
>  ...ignal-command-multiple-signals-pending.exp |  1 -
>  .../signal-delivered-right-thread.exp         |  1 -
>  gdb/testsuite/gdb.threads/signal-sigtrap.exp  |  1 -
>  gdb/testsuite/gdb.threads/sigthread.exp       |  1 -
>  .../gdb.threads/stop-with-handle.exp          |  1 -
>  .../gdb.threads/thread-specific-bp.exp        |  1 -
>  .../gdb.threads/thread-unwindonsignal.exp     |  1 -
>  gdb/testsuite/gdb.threads/thread_check.exp    |  1 -
>  gdb/testsuite/gdb.threads/thread_events.exp   |  1 -
>  gdb/testsuite/gdb.threads/threadapply.exp     |  2 --
>  gdb/testsuite/gdb.threads/tid-reuse.exp       |  1 -
>  gdb/testsuite/gdb.threads/tls-nodebug.exp     |  1 -
>  gdb/testsuite/gdb.threads/tls-shared.exp      |  1 -
>  gdb/testsuite/gdb.threads/tls-so_extern.exp   |  1 -
>  gdb/testsuite/gdb.threads/tls.exp             |  1 -
>  .../gdb.threads/vfork-follow-child-exec.exp   |  1 -
>  .../gdb.threads/vfork-follow-child-exit.exp   |  1 -
>  gdb/testsuite/gdb.threads/watchthreads.exp    |  1 -
>  gdb/testsuite/gdb.threads/watchthreads2.exp   |  1 -
>  gdb/testsuite/gdb.threads/wp-replication.exp  |  1 -
>  gdb/testsuite/gdb.trace/actions-changed.exp   |  1 -
>  gdb/testsuite/gdb.trace/actions.exp           |  1 -
>  gdb/testsuite/gdb.trace/backtrace.exp         |  1 -
>  gdb/testsuite/gdb.trace/change-loc.exp        |  3 ---
>  gdb/testsuite/gdb.trace/circ.exp              |  4 ----
>  .../gdb.trace/disconnected-tracing.exp        |  3 ---
>  gdb/testsuite/gdb.trace/entry-values.exp      |  2 --
>  gdb/testsuite/gdb.trace/ftrace-lock.exp       |  2 --
>  gdb/testsuite/gdb.trace/ftrace.exp            |  2 --
>  gdb/testsuite/gdb.trace/infotrace.exp         |  1 -
>  .../gdb.trace/mi-trace-frame-collected.exp    |  1 -
>  .../gdb.trace/mi-trace-unavailable.exp        |  1 -
>  .../gdb.trace/mi-traceframe-changed.exp       |  1 -
>  .../gdb.trace/mi-tracepoint-changed.exp       |  2 --
>  gdb/testsuite/gdb.trace/mi-tsv-changed.exp    |  3 ---
>  gdb/testsuite/gdb.trace/no-attach-trace.exp   |  1 -
>  gdb/testsuite/gdb.trace/pending.exp           |  6 -----
>  gdb/testsuite/gdb.trace/pr16508.exp           |  1 -
>  gdb/testsuite/gdb.trace/qtro.exp              |  1 -
>  gdb/testsuite/gdb.trace/range-stepping.exp    |  2 --
>  gdb/testsuite/gdb.trace/read-memory.exp       |  2 --
>  gdb/testsuite/gdb.trace/signal.exp            |  2 --
>  gdb/testsuite/gdb.trace/status-stop.exp       |  4 ----
>  gdb/testsuite/gdb.trace/strace.exp            |  6 -----
>  gdb/testsuite/gdb.trace/trace-break.exp       |  8 -------
>  gdb/testsuite/gdb.trace/trace-buffer-size.exp |  1 -
>  gdb/testsuite/gdb.trace/trace-condition.exp   |  3 ---
>  .../gdb.trace/trace-enable-disable.exp        |  2 --
>  gdb/testsuite/gdb.trace/trace-mt.exp          |  4 ----
>  .../gdb.trace/tracefile-pseudo-reg.exp        |  1 -
>  gdb/testsuite/gdb.trace/tspeed.exp            |  1 -
>  gdb/testsuite/gdb.trace/tstatus.exp           |  1 -
>  gdb/testsuite/gdb.trace/tsv.exp               |  1 -
>  gdb/testsuite/gdb.trace/while-stepping.exp    |  1 -
>  gdb/testsuite/gdb.tui/corefile-run.exp        |  1 -
>  gdb/testsuite/gdb.tui/tui-layout.exp          |  1 -
>  gdb/testsuite/gdb.xml/tdesc-reload.exp        |  2 --
>  gdb/testsuite/lib/ada.exp                     |  1 -
>  gdb/testsuite/lib/gdb-guile.exp               |  1 -
>  gdb/testsuite/lib/gdb.exp                     |  2 +-
>  598 files changed, 75 insertions(+), 784 deletions(-)
> 
> diff --git a/gdb/testsuite/gdb.ada/array_return.exp b/gdb/testsuite/gdb.ada/array_return.exp
> index aceb5fd2c00..9b2800d16ab 100644
> --- a/gdb/testsuite/gdb.ada/array_return.exp
> +++ b/gdb/testsuite/gdb.ada/array_return.exp
> @@ -28,7 +28,6 @@ clean_restart ${testfile}
>  # Start the inferior
>  
>  if ![runto_main] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/bp_inlined_func.exp b/gdb/testsuite/gdb.ada/bp_inlined_func.exp
> index 4d304236fb1..bc253970fac 100644
> --- a/gdb/testsuite/gdb.ada/bp_inlined_func.exp
> +++ b/gdb/testsuite/gdb.ada/bp_inlined_func.exp
> @@ -26,7 +26,6 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
>  clean_restart ${testfile}
>  
>  if ![runto_main] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/catch_assert_if.exp b/gdb/testsuite/gdb.ada/catch_assert_if.exp
> index e6f4d2dbb1b..f4696582809 100644
> --- a/gdb/testsuite/gdb.ada/catch_assert_if.exp
> +++ b/gdb/testsuite/gdb.ada/catch_assert_if.exp
> @@ -33,7 +33,6 @@ set eol "\[\r\n\]+"
>  set sp "\[ \t\]*"
>  
>  if ![runto_main] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> @@ -62,7 +61,6 @@ gdb_test_multiple "catch exception" $msg {
>  #  - continue, the program exits.
>  
>  if ![runto_main] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/catch_ex.exp b/gdb/testsuite/gdb.ada/catch_ex.exp
> index 12e0f6808e5..736e490e9c0 100644
> --- a/gdb/testsuite/gdb.ada/catch_ex.exp
> +++ b/gdb/testsuite/gdb.ada/catch_ex.exp
> @@ -41,7 +41,6 @@ set catch_exception_info \
>  ####################################
>  
>  if ![runto_main] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> @@ -90,7 +89,6 @@ gdb_test "continue" \
>  #  - continue, the program exits.
>  
>  if ![runto_main] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> @@ -151,7 +149,6 @@ gdb_test "continue" \
>  #     the program.
>  
>  if ![runto_main] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/excep_handle.exp b/gdb/testsuite/gdb.ada/excep_handle.exp
> index 990585cb140..5760c531d65 100644
> --- a/gdb/testsuite/gdb.ada/excep_handle.exp
> +++ b/gdb/testsuite/gdb.ada/excep_handle.exp
> @@ -45,7 +45,6 @@ set catchpoint_storage_error_msg \
>  ############################################
>  
>  if ![runto_main] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/info_auto_lang.exp b/gdb/testsuite/gdb.ada/info_auto_lang.exp
> index 0ff10537b7c..41c4d7cf569 100644
> --- a/gdb/testsuite/gdb.ada/info_auto_lang.exp
> +++ b/gdb/testsuite/gdb.ada/info_auto_lang.exp
> @@ -46,7 +46,6 @@ clean_restart ${testfile}
>  
>  set bp_location [gdb_get_line_number "STOP" ${testdir}/some_c.c]
>  if ![runto "some_c.c:$bp_location"] then {
> -    fail "can't run to some_c.c STOP location"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/info_exc.exp b/gdb/testsuite/gdb.ada/info_exc.exp
> index 56e527f6f03..c8dc0741730 100644
> --- a/gdb/testsuite/gdb.ada/info_exc.exp
> +++ b/gdb/testsuite/gdb.ada/info_exc.exp
> @@ -26,7 +26,6 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
>  clean_restart ${testfile}
>  
>  if ![runto_main] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/mi_catch_assert.exp b/gdb/testsuite/gdb.ada/mi_catch_assert.exp
> index d00573af140..0803d1917b0 100644
> --- a/gdb/testsuite/gdb.ada/mi_catch_assert.exp
> +++ b/gdb/testsuite/gdb.ada/mi_catch_assert.exp
> @@ -35,7 +35,6 @@ set sp "\[ \t\]*"
>  clean_restart ${testfile}
>  
>  if ![runto_main] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> @@ -71,7 +70,6 @@ mi_clean_restart $binfile
>  #  - continue, the program exits.
>  
>  if {[mi_runto_main] < 0} {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex.exp b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
> index a4c58fbb3e0..1b7c5808d96 100644
> --- a/gdb/testsuite/gdb.ada/mi_catch_ex.exp
> +++ b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
> @@ -35,7 +35,6 @@ set eol "\[\r\n\]+"
>  clean_restart ${testfile}
>  
>  if ![runto_main] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> @@ -66,7 +65,6 @@ mi_clean_restart $binfile
>  
>  with_test_prefix "scenario 1" {
>      if {[mi_runto_main] < 0} {
> -	fail "cannot run to main, testcase aborted"
>  	return 0
>      }
>  }
> @@ -125,7 +123,6 @@ continue_to_exception \
>  with_test_prefix "scenario 2" {
>      mi_delete_breakpoints
>      if {[mi_runto_main] < 0} {
> -	fail "cannot run to main, testcase aborted"
>  	return 0
>      }
>  }
> diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
> index 57ec628d183..655b087d5e3 100644
> --- a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
> +++ b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
> @@ -34,7 +34,6 @@ set eol "\[\r\n\]+"
>  clean_restart ${testfile}
>  
>  if ![runto_main] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> @@ -65,7 +64,6 @@ mi_clean_restart $binfile
>  
>  with_test_prefix "scenario 1" {
>      if {[mi_runto_main] < 0} {
> -	fail "cannot run to main, testcase aborted"
>  	return 0
>      }
>  }
> @@ -118,7 +116,6 @@ continue_to_exception_handler \
>  with_test_prefix "scenario 2" {
>      mi_delete_breakpoints
>      if {[mi_runto_main] < 0} {
> -	fail "cannot run to main, testcase aborted"
>  	return 0
>      }
>  }
> diff --git a/gdb/testsuite/gdb.ada/mi_dyn_arr.exp b/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
> index 34cfbe65064..d796f554f59 100644
> --- a/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
> +++ b/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
> @@ -29,7 +29,6 @@ set MIFLAGS "-i=mi"
>  mi_clean_restart $binfile
>  
>  if {[mi_runto_main] < 0} {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/mi_ex_cond.exp b/gdb/testsuite/gdb.ada/mi_ex_cond.exp
> index 3390354272e..8aa9eb99517 100644
> --- a/gdb/testsuite/gdb.ada/mi_ex_cond.exp
> +++ b/gdb/testsuite/gdb.ada/mi_ex_cond.exp
> @@ -35,7 +35,6 @@ set eol "\[\r\n\]+"
>  clean_restart ${testfile}
>  
>  if ![runto_main] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/mi_exc_info.exp b/gdb/testsuite/gdb.ada/mi_exc_info.exp
> index c9290c52b9f..af471cfcca4 100644
> --- a/gdb/testsuite/gdb.ada/mi_exc_info.exp
> +++ b/gdb/testsuite/gdb.ada/mi_exc_info.exp
> @@ -29,7 +29,6 @@ set MIFLAGS "-i=mi"
>  mi_clean_restart $binfile
>  
>  if {[mi_runto_main] < 0} {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/mi_interface.exp b/gdb/testsuite/gdb.ada/mi_interface.exp
> index 13e0d8df40e..df3858261ad 100644
> --- a/gdb/testsuite/gdb.ada/mi_interface.exp
> +++ b/gdb/testsuite/gdb.ada/mi_interface.exp
> @@ -29,7 +29,6 @@ set MIFLAGS "-i=mi"
>  mi_clean_restart $binfile
>  
>  if {[mi_runto_main] < 0} {
> -    fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/mi_prot.exp b/gdb/testsuite/gdb.ada/mi_prot.exp
> index 8936a6c5584..57f54dcb992 100644
> --- a/gdb/testsuite/gdb.ada/mi_prot.exp
> +++ b/gdb/testsuite/gdb.ada/mi_prot.exp
> @@ -33,7 +33,6 @@ set MIFLAGS "-i=mi"
>  mi_clean_restart $binfile
>  
>  if {[mi_runto_main] < 0} {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/mi_ref_changeable.exp b/gdb/testsuite/gdb.ada/mi_ref_changeable.exp
> index 0fd5899cc7d..09f7c026be4 100644
> --- a/gdb/testsuite/gdb.ada/mi_ref_changeable.exp
> +++ b/gdb/testsuite/gdb.ada/mi_ref_changeable.exp
> @@ -29,7 +29,6 @@ set MIFLAGS "-i=mi"
>  mi_clean_restart $binfile
>  
>  if {[mi_runto_main] < 0} {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/mi_string_access.exp b/gdb/testsuite/gdb.ada/mi_string_access.exp
> index 89026e307ec..75e5d5b6417 100644
> --- a/gdb/testsuite/gdb.ada/mi_string_access.exp
> +++ b/gdb/testsuite/gdb.ada/mi_string_access.exp
> @@ -32,7 +32,6 @@ foreach_with_prefix scenario {all minimal} {
>      mi_clean_restart $binfile
>  
>      if {[mi_runto_main] < 0} {
> -	fail "cannot run to main, testcase aborted"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.ada/mi_task_arg.exp b/gdb/testsuite/gdb.ada/mi_task_arg.exp
> index c8a74651866..754d93f8eeb 100644
> --- a/gdb/testsuite/gdb.ada/mi_task_arg.exp
> +++ b/gdb/testsuite/gdb.ada/mi_task_arg.exp
> @@ -39,7 +39,6 @@ mi_gdb_load ${binfile}
>  mi_gdb_test "-gdb-set debug-file-directory \"\"" ".*"
>  
>  if ![mi_runto "task_switch.break_me"] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/mi_task_info.exp b/gdb/testsuite/gdb.ada/mi_task_info.exp
> index a7d97b01aff..83ecb826be9 100644
> --- a/gdb/testsuite/gdb.ada/mi_task_info.exp
> +++ b/gdb/testsuite/gdb.ada/mi_task_info.exp
> @@ -40,7 +40,6 @@ mi_gdb_load ${binfile}
>  ####################################
>  
>  if ![mi_runto "task_switch.break_me"] then {
> -   fail "cannot run to main, testcase aborted"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/mi_var_access.exp b/gdb/testsuite/gdb.ada/mi_var_access.exp
> index 92b51f91770..c4899491e7b 100644
> --- a/gdb/testsuite/gdb.ada/mi_var_access.exp
> +++ b/gdb/testsuite/gdb.ada/mi_var_access.exp
> @@ -31,7 +31,6 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != "" } {
>  mi_clean_restart $binfile
>  
>  if {[mi_runto_main] < 0} {
> -    fail "cannot run to main, testcase aborted"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.ada/mi_var_array.exp b/gdb/testsuite/gdb.ada/mi_var_array.exp
> index e0529fb5101..f9f3e3f1010 100644
> --- a/gdb/testsuite/gdb.ada/mi_var_array.exp
> +++ b/gdb/testsuite/gdb.ada/mi_var_array.exp
> @@ -35,7 +35,6 @@ foreach_with_prefix scenario {none all minimal} {
>      mi_clean_restart $binfile
>  
>      if {[mi_runto_main] < 0} {
> -	fail "cannot run to main, testcase aborted"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.ada/mi_var_union.exp b/gdb/testsuite/gdb.ada/mi_var_union.exp
> index c550f29a960..bb32dc81ea5 100644
> --- a/gdb/testsuite/gdb.ada/mi_var_union.exp
> +++ b/gdb/testsuite/gdb.ada/mi_var_union.exp
> @@ -37,7 +37,6 @@ foreach_with_prefix scenario {none all minimal} {
>      mi_clean_restart $binfile
>  
>      if {[mi_runto_main] < 0} {
> -	fail "cannot run to main, testcase aborted"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.ada/mi_variant.exp b/gdb/testsuite/gdb.ada/mi_variant.exp
> index a9d5d8ae577..850abf91ebc 100644
> --- a/gdb/testsuite/gdb.ada/mi_variant.exp
> +++ b/gdb/testsuite/gdb.ada/mi_variant.exp
> @@ -36,7 +36,6 @@ foreach_with_prefix scenario {none all minimal} {
>      mi_clean_restart $binfile
>  
>      if {[mi_runto_main] < 0} {
> -	fail "cannot run to main, testcase aborted"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp b/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
> index 1a35cef2760..01d6871c632 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
> @@ -29,7 +29,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.arch/aarch64-brk-patterns.exp b/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
> index 235f12ea879..3097fdf4182 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
> @@ -29,7 +29,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.arch/aarch64-fp.exp b/gdb/testsuite/gdb.arch/aarch64-fp.exp
> index 4fb8e343c49..5e44b2a7d84 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-fp.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-fp.exp
> @@ -29,7 +29,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.arch/aarch64-mte.exp b/gdb/testsuite/gdb.arch/aarch64-mte.exp
> index 62dfc863748..21dc9b6bec6 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-mte.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-mte.exp
> @@ -54,7 +54,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
>  }
>  
>  if ![runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> @@ -339,7 +338,6 @@ gdb_test "continue" \
>  # Restart to execute the async tag fault test.
>  with_test_prefix "async" {
>      if ![runto_main] {
> -	untested "could not run to main"
>  	return -1
>      }
>  
> diff --git a/gdb/testsuite/gdb.arch/aarch64-pauth.exp b/gdb/testsuite/gdb.arch/aarch64-pauth.exp
> index 6fbf6fad304..9a76b6187ca 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-pauth.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-pauth.exp
> @@ -32,7 +32,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} ${compile_f
>  }
>  
>  if ![runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/aarch64-prologue.exp b/gdb/testsuite/gdb.arch/aarch64-prologue.exp
> index e871cc0acf6..dd55b30dec7 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-prologue.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-prologue.exp
> @@ -26,7 +26,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}]} {
>  }
>  
>  if ![runto_main] {
> -   untested "could not run to main"
>     return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp b/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
> index ea1c5685406..29f23e7b7f2 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
> @@ -36,7 +36,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} ${compile_f
>  }
>  
>  if ![runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp b/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
> index d8620c09f5c..c9bc9cca10c 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
> @@ -26,7 +26,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.arch/alpha-step.exp b/gdb/testsuite/gdb.arch/alpha-step.exp
> index 6f2d78bdd66..a5385d10fe4 100644
> --- a/gdb/testsuite/gdb.arch/alpha-step.exp
> +++ b/gdb/testsuite/gdb.arch/alpha-step.exp
> @@ -38,7 +38,6 @@ proc test_stepi {function } {
>      # of the previous tests, this makes sure that it doesn't affect
>      # this series of tests.
>      if ![runto_main] then {
> -        fail "can't run to main"
>          return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.arch/altivec-abi.exp b/gdb/testsuite/gdb.arch/altivec-abi.exp
> index f1306994055..24e3eb35010 100644
> --- a/gdb/testsuite/gdb.arch/altivec-abi.exp
> +++ b/gdb/testsuite/gdb.arch/altivec-abi.exp
> @@ -62,7 +62,6 @@ proc altivec_abi_tests { extra_flags force_abi } {
>  
>      # Run to `main' where we begin our tests.
>      if ![runto_main] then {
> -	untested "could not run to main"
>  	return -1
>      }
>  
> diff --git a/gdb/testsuite/gdb.arch/altivec-regs.exp b/gdb/testsuite/gdb.arch/altivec-regs.exp
> index 620b0f730c1..d0f27e26944 100644
> --- a/gdb/testsuite/gdb.arch/altivec-regs.exp
> +++ b/gdb/testsuite/gdb.arch/altivec-regs.exp
> @@ -58,7 +58,6 @@ gdb_load ${binfile}
>  #
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp b/gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp
> index 5a902b558a2..852eca0a09d 100644
> --- a/gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp
> +++ b/gdb/testsuite/gdb.arch/amd64-break-on-asm-line.exp
> @@ -26,7 +26,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.arch/amd64-byte.exp b/gdb/testsuite/gdb.arch/amd64-byte.exp
> index 91c4c976083..7187c21f457 100644
> --- a/gdb/testsuite/gdb.arch/amd64-byte.exp
> +++ b/gdb/testsuite/gdb.arch/amd64-byte.exp
> @@ -38,7 +38,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
>  clean_restart ${binfile}
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
> index 469c6f4cd70..73bbd1bc842 100644
> --- a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
> +++ b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
> @@ -43,7 +43,6 @@ gdb_test "set displaced-stepping on" ""
>  gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step.exp b/gdb/testsuite/gdb.arch/amd64-disp-step.exp
> index 7984d91789f..f30f29ea578 100644
> --- a/gdb/testsuite/gdb.arch/amd64-disp-step.exp
> +++ b/gdb/testsuite/gdb.arch/amd64-disp-step.exp
> @@ -36,7 +36,6 @@ gdb_test "set displaced-stepping on" ""
>  gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/amd64-dword.exp b/gdb/testsuite/gdb.arch/amd64-dword.exp
> index 3d60f0714c3..920ec5aa5ef 100644
> --- a/gdb/testsuite/gdb.arch/amd64-dword.exp
> +++ b/gdb/testsuite/gdb.arch/amd64-dword.exp
> @@ -38,7 +38,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
>  clean_restart ${binfile}
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/amd64-gs_base.exp b/gdb/testsuite/gdb.arch/amd64-gs_base.exp
> index 07192697404..136b95acc9e 100644
> --- a/gdb/testsuite/gdb.arch/amd64-gs_base.exp
> +++ b/gdb/testsuite/gdb.arch/amd64-gs_base.exp
> @@ -26,7 +26,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.arch/amd64-init-x87-values.exp b/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
> index 1a748694e37..195cc01a455 100644
> --- a/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
> +++ b/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
> @@ -46,7 +46,6 @@ proc_with_prefix check_x87_regs_around_init {} {
>  
>      # Get things started.
>      if ![runto_main] then {
> -	fail "can't run to main"
>  	return 0
>      }
>  
> @@ -121,7 +120,6 @@ proc_with_prefix check_setting_mxcsr_before_enable {} {
>      clean_restart ${binfile}
>  
>      if ![runto_main] then {
> -	fail "can't run to main"
>  	return 0
>      }
>  
> @@ -156,7 +154,6 @@ proc_with_prefix check_setting_x87_regs_before_enable {} {
>      clean_restart ${binfile}
>  
>      if ![runto_main] then {
> -	fail "can't run to main"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp b/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
> index 7338dfe019e..d7e74db11e3 100644
> --- a/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
> +++ b/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp
> @@ -21,7 +21,6 @@ if { ![istarget "x86_64-*-*"] || ![is_lp64_target] } {
>  proc test_probe { probe_name } {
>      with_test_prefix "probe: ${probe_name}" {
>  	if { ![runto "-pstap $probe_name"] } {
> -	    fail "run to probe $probe_name"
>  	    return
>  	}
>  
> diff --git a/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp b/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp
> index 3009b5c1b03..62bd488093a 100644
> --- a/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp
> +++ b/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp
> @@ -26,7 +26,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
>  
>  proc goto_probe { probe_name } {
>      if { ![runto "-pstap $probe_name"] } {
> -	fail "run to probe $probe_name"
>  	return
>      }
>  }
> diff --git a/gdb/testsuite/gdb.arch/amd64-word.exp b/gdb/testsuite/gdb.arch/amd64-word.exp
> index 02978640e85..ed7f0f319ac 100644
> --- a/gdb/testsuite/gdb.arch/amd64-word.exp
> +++ b/gdb/testsuite/gdb.arch/amd64-word.exp
> @@ -38,7 +38,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
>  clean_restart ${binfile}
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/arc-analyze-prologue.exp b/gdb/testsuite/gdb.arch/arc-analyze-prologue.exp
> index abc3487b7b2..3794f9914ec 100644
> --- a/gdb/testsuite/gdb.arch/arc-analyze-prologue.exp
> +++ b/gdb/testsuite/gdb.arch/arc-analyze-prologue.exp
> @@ -27,7 +27,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/arc-decode-insn.exp b/gdb/testsuite/gdb.arch/arc-decode-insn.exp
> index 73d3fc4b146..17b11f3f097 100644
> --- a/gdb/testsuite/gdb.arch/arc-decode-insn.exp
> +++ b/gdb/testsuite/gdb.arch/arc-decode-insn.exp
> @@ -43,7 +43,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp b/gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp
> index eb013b97d9c..14121bc0815 100644
> --- a/gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp
> +++ b/gdb/testsuite/gdb.arch/arm-cmse-sgstubs.exp
> @@ -25,7 +25,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.arch/arm-disp-step.exp b/gdb/testsuite/gdb.arch/arm-disp-step.exp
> index b082bb3923f..f4cd26a65c8 100644
> --- a/gdb/testsuite/gdb.arch/arm-disp-step.exp
> +++ b/gdb/testsuite/gdb.arch/arm-disp-step.exp
> @@ -410,7 +410,6 @@ proc test_add_rn_pc {} {
>  gdb_test_no_output "set displaced-stepping off"
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/arm-neon.exp b/gdb/testsuite/gdb.arch/arm-neon.exp
> index ed34f5d7655..75ccd2743f9 100644
> --- a/gdb/testsuite/gdb.arch/arm-neon.exp
> +++ b/gdb/testsuite/gdb.arch/arm-neon.exp
> @@ -32,7 +32,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug quie
>  }
>  
>  if ![runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp b/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp
> index 44e9dd906b8..49208e8e2bd 100644
> --- a/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp
> +++ b/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp
> @@ -30,7 +30,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/e500-abi.exp b/gdb/testsuite/gdb.arch/e500-abi.exp
> index cbe9e9b326a..21333b67df1 100644
> --- a/gdb/testsuite/gdb.arch/e500-abi.exp
> +++ b/gdb/testsuite/gdb.arch/e500-abi.exp
> @@ -46,7 +46,6 @@ gdb_load ${binfile}
>  #
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/e500-regs.exp b/gdb/testsuite/gdb.arch/e500-regs.exp
> index 59926f58784..c3d4038bf61 100644
> --- a/gdb/testsuite/gdb.arch/e500-regs.exp
> +++ b/gdb/testsuite/gdb.arch/e500-regs.exp
> @@ -45,7 +45,6 @@ gdb_load ${binfile}
>  #
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> @@ -146,7 +145,6 @@ gdb_start
>  gdb_reinitialize_dir $srcdir/$subdir
>  gdb_load ${binfile}
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
> index 8f4e34b5aed..00c7acced19 100644
> --- a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
> +++ b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp
> @@ -27,7 +27,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -51,7 +50,6 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
>  clean_restart ${executable}
>  
>  if ![runto_main] {
> -    fail "can't run to main for ftrace tests"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/gdb1291.exp b/gdb/testsuite/gdb.arch/gdb1291.exp
> index ea151627abd..a6097b8869b 100644
> --- a/gdb/testsuite/gdb.arch/gdb1291.exp
> +++ b/gdb/testsuite/gdb.arch/gdb1291.exp
> @@ -47,7 +47,6 @@ gdb_load ${binfile}
>  #
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/gdb1431.exp b/gdb/testsuite/gdb.arch/gdb1431.exp
> index 01cbea82826..464a8880820 100644
> --- a/gdb/testsuite/gdb.arch/gdb1431.exp
> +++ b/gdb/testsuite/gdb.arch/gdb1431.exp
> @@ -49,7 +49,6 @@ gdb_load ${binfile}
>  #
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/i386-avx.exp b/gdb/testsuite/gdb.arch/i386-avx.exp
> index 93e86eeb23e..1b61a65d605 100644
> --- a/gdb/testsuite/gdb.arch/i386-avx.exp
> +++ b/gdb/testsuite/gdb.arch/i386-avx.exp
> @@ -48,7 +48,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
>  clean_restart ${binfile}
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> @@ -101,7 +100,6 @@ with_test_prefix "force-disable xml descriptions" {
>  	}
>  
>  	if ![runto_main] then {
> -	    fail "run to main"
>  	    return
>  	}
>  
> diff --git a/gdb/testsuite/gdb.arch/i386-avx512.exp b/gdb/testsuite/gdb.arch/i386-avx512.exp
> index c801206805c..74ad9a168d6 100644
> --- a/gdb/testsuite/gdb.arch/i386-avx512.exp
> +++ b/gdb/testsuite/gdb.arch/i386-avx512.exp
> @@ -34,7 +34,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.arch/i386-byte.exp b/gdb/testsuite/gdb.arch/i386-byte.exp
> index aa1096ad975..4b68f020600 100644
> --- a/gdb/testsuite/gdb.arch/i386-byte.exp
> +++ b/gdb/testsuite/gdb.arch/i386-byte.exp
> @@ -38,7 +38,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
>  clean_restart ${binfile}
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/i386-disp-step.exp b/gdb/testsuite/gdb.arch/i386-disp-step.exp
> index 560bf96d147..f48f3b228a4 100644
> --- a/gdb/testsuite/gdb.arch/i386-disp-step.exp
> +++ b/gdb/testsuite/gdb.arch/i386-disp-step.exp
> @@ -33,7 +33,6 @@ gdb_test "set displaced-stepping on" ""
>  gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
> index 22d98c34c9b..a3745b773fa 100644
> --- a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
> +++ b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
> @@ -30,7 +30,6 @@ if [prepare_for_testing "failed to prepare" ${binfile} ${srcfile} {debug $additi
>  }
>  
>  if ![runto_main] then {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/i386-float.exp b/gdb/testsuite/gdb.arch/i386-float.exp
> index 0860269423d..b96ff2ba13e 100644
> --- a/gdb/testsuite/gdb.arch/i386-float.exp
> +++ b/gdb/testsuite/gdb.arch/i386-float.exp
> @@ -33,7 +33,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile [list debug nop
>  }
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/i386-mpx-call.exp b/gdb/testsuite/gdb.arch/i386-mpx-call.exp
> index 360cc68295a..6798079d1dd 100644
> --- a/gdb/testsuite/gdb.arch/i386-mpx-call.exp
> +++ b/gdb/testsuite/gdb.arch/i386-mpx-call.exp
> @@ -38,7 +38,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.arch/i386-mpx-map.exp b/gdb/testsuite/gdb.arch/i386-mpx-map.exp
> index 55b70d1de0f..96631743ab6 100644
> --- a/gdb/testsuite/gdb.arch/i386-mpx-map.exp
> +++ b/gdb/testsuite/gdb.arch/i386-mpx-map.exp
> @@ -40,7 +40,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.arch/i386-mpx-sigsegv.exp b/gdb/testsuite/gdb.arch/i386-mpx-sigsegv.exp
> index ef8fd68486b..43d18a602b5 100644
> --- a/gdb/testsuite/gdb.arch/i386-mpx-sigsegv.exp
> +++ b/gdb/testsuite/gdb.arch/i386-mpx-sigsegv.exp
> @@ -40,7 +40,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.arch/i386-mpx-simple_segv.exp b/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp
> index e5b2a890f3c..a5d9946522c 100644
> --- a/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp
> +++ b/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp
> @@ -46,7 +46,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  }
>  
>  if ![runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> @@ -64,7 +63,6 @@ set segv_with_exit "Program received signal SIGSEGV,\
>  set parameters "print pass stop"
>  with_test_prefix "$parameters" {
>      if ![runto_main] {
> -        fail "could not run to main"
>          return -1
>      }
>  
> @@ -84,7 +82,6 @@ with_test_prefix "$parameters" {
>  set parameters "print pass nostop"
>  with_test_prefix "$parameters" {
>      if ![runto_main] {
> -        fail "could not run to main"
>          return -1
>      }
>  
> @@ -103,7 +100,6 @@ with_test_prefix "$parameters" {
>  set parameters "print nopass stop"
>  with_test_prefix "$parameters" {
>      if ![runto_main] {
> -        fail "could not run to main"
>          return -1
>      }
>  
> @@ -123,7 +119,6 @@ with_test_prefix "$parameters" {
>  set parameters "noprint pass nostop"
>  with_test_prefix "$parameters" {
>      if ![runto_main] {
> -        fail "could not run to main"
>          return -1
>      }
>  
> diff --git a/gdb/testsuite/gdb.arch/i386-mpx.exp b/gdb/testsuite/gdb.arch/i386-mpx.exp
> index a6b74ceda6b..520fd10a240 100644
> --- a/gdb/testsuite/gdb.arch/i386-mpx.exp
> +++ b/gdb/testsuite/gdb.arch/i386-mpx.exp
> @@ -44,7 +44,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.arch/i386-pkru.exp b/gdb/testsuite/gdb.arch/i386-pkru.exp
> index 5732bba6e97..f15e8ce89b0 100644
> --- a/gdb/testsuite/gdb.arch/i386-pkru.exp
> +++ b/gdb/testsuite/gdb.arch/i386-pkru.exp
> @@ -29,7 +29,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.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp
> index 053c6d3dbe2..b3428eaf9e5 100644
> --- a/gdb/testsuite/gdb.arch/i386-prologue.exp
> +++ b/gdb/testsuite/gdb.arch/i386-prologue.exp
> @@ -66,7 +66,6 @@ gdb_load ${binfile}
>  #
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/i386-sse.exp b/gdb/testsuite/gdb.arch/i386-sse.exp
> index fca90256505..1ee3a8444b3 100644
> --- a/gdb/testsuite/gdb.arch/i386-sse.exp
> +++ b/gdb/testsuite/gdb.arch/i386-sse.exp
> @@ -43,7 +43,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
>  clean_restart ${binfile}
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/i386-word.exp b/gdb/testsuite/gdb.arch/i386-word.exp
> index fc27c6b3866..101b75d0abb 100644
> --- a/gdb/testsuite/gdb.arch/i386-word.exp
> +++ b/gdb/testsuite/gdb.arch/i386-word.exp
> @@ -38,7 +38,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
>  clean_restart ${binfile}
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp b/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
> index 2ecbac0450a..7be220534e1 100644
> --- a/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
> +++ b/gdb/testsuite/gdb.arch/ia64-breakpoint-shadow.exp
> @@ -33,7 +33,6 @@ gdb_load ${binfile}
>  
>  # 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.arch/iwmmxt-regs.exp b/gdb/testsuite/gdb.arch/iwmmxt-regs.exp
> index 92629d09ae8..75ab890a2d0 100644
> --- a/gdb/testsuite/gdb.arch/iwmmxt-regs.exp
> +++ b/gdb/testsuite/gdb.arch/iwmmxt-regs.exp
> @@ -41,7 +41,6 @@ gdb_load ${binfile}
>  #
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/mips16-thunks.exp b/gdb/testsuite/gdb.arch/mips16-thunks.exp
> index bfa6b244dff..794942a0ab0 100644
> --- a/gdb/testsuite/gdb.arch/mips16-thunks.exp
> +++ b/gdb/testsuite/gdb.arch/mips16-thunks.exp
> @@ -190,7 +190,6 @@ set options [list debug nowarnings]
>  gdb_compile ${objfiles} ${binfile} executable ${options}
>  clean_restart ${testname}
>  if ![runto_main] then {
> -    fail "running test program, MIPS16 thunk tests aborted"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/pa-nullify.exp b/gdb/testsuite/gdb.arch/pa-nullify.exp
> index 229206efeaa..3e5ce14a6ea 100644
> --- a/gdb/testsuite/gdb.arch/pa-nullify.exp
> +++ b/gdb/testsuite/gdb.arch/pa-nullify.exp
> @@ -89,7 +89,6 @@ proc get_addr_of_sym { sym } {
>  }
>  
>  if  ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> @@ -126,7 +125,6 @@ proc test_core_bt { test } {
>  
>  set test "core at last insn in foo"
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  gdb_breakpoint "*$foo_last"
> @@ -137,7 +135,6 @@ if [gen_core $test] {
>  
>  set test "core at nullified insn"
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  gdb_breakpoint "*$foo_last"
> diff --git a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
> index 97335a55d10..bb9d55f133e 100644
> --- a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
> +++ b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
> @@ -40,7 +40,6 @@ gdb_reinitialize_dir $srcdir/$subdir
>  gdb_load ${binfile}
>  
>  if { ![runto_main] } then {
> -   fail "run to main"
>     return
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp b/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp
> index 5a72e61d341..76ae9b24908 100644
> --- a/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp
> +++ b/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp
> @@ -40,7 +40,6 @@ if {[build_executable "compile" $binfile $gen_src] == -1} {
>  clean_restart $binfile
>  
>  if ![runto_main] then {
> -    fail "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/powerpc-prologue.exp b/gdb/testsuite/gdb.arch/powerpc-prologue.exp
> index dcf56b2f16f..a428ea21205 100644
> --- a/gdb/testsuite/gdb.arch/powerpc-prologue.exp
> +++ b/gdb/testsuite/gdb.arch/powerpc-prologue.exp
> @@ -44,7 +44,6 @@ gdb_load ${binfile}
>  #
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp b/gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp
> index 7c4668e285c..7b01822f7e0 100644
> --- a/gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp
> +++ b/gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp
> @@ -40,7 +40,6 @@ if {[build_executable "compile" $binfile $gen_src] == -1} {
>  clean_restart $binfile
>  
>  if ![runto_main] then {
> -    fail "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/powerpc64-prologue.exp b/gdb/testsuite/gdb.arch/powerpc64-prologue.exp
> index 4b01dec9ac6..ad962e20d09 100644
> --- a/gdb/testsuite/gdb.arch/powerpc64-prologue.exp
> +++ b/gdb/testsuite/gdb.arch/powerpc64-prologue.exp
> @@ -38,7 +38,6 @@ if { [prepare_for_testing "failed to prepare" $testfile "$srcfile" \
>  
>  # Run to `main' where we begin our tests.
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp b/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
> index 0a73660bf39..36150e9fce5 100644
> --- a/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
> +++ b/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
> @@ -37,7 +37,6 @@ proc do_test { displaced } {
>      global decimal hex
>  
>      if ![runto_main] then {
> -	untested "could not run to main"
>  	return -1
>      }
>  
> diff --git a/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp b/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
> index acda961380d..b9d3c6591e5 100644
> --- a/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
> +++ b/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
> @@ -41,7 +41,6 @@ proc do_test { displaced } {
>      global gdb_prompt inferior_exited_re srcfile srcfile2
>  
>      if ![runto_main] then {
> -	untested "could not run to main"
>  	return -1
>      }
>  
> diff --git a/gdb/testsuite/gdb.arch/riscv-bp-infcall.exp b/gdb/testsuite/gdb.arch/riscv-bp-infcall.exp
> index b90eb28517a..b70a1fb002a 100644
> --- a/gdb/testsuite/gdb.arch/riscv-bp-infcall.exp
> +++ b/gdb/testsuite/gdb.arch/riscv-bp-infcall.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.arch/riscv-reg-aliases.exp b/gdb/testsuite/gdb.arch/riscv-reg-aliases.exp
> index 65f68d6c6a5..74b9145a9fe 100644
> --- a/gdb/testsuite/gdb.arch/riscv-reg-aliases.exp
> +++ b/gdb/testsuite/gdb.arch/riscv-reg-aliases.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.arch/riscv-tdesc-regs.exp b/gdb/testsuite/gdb.arch/riscv-tdesc-regs.exp
> index 63721aee178..369d20964b4 100644
> --- a/gdb/testsuite/gdb.arch/riscv-tdesc-regs.exp
> +++ b/gdb/testsuite/gdb.arch/riscv-tdesc-regs.exp
> @@ -31,7 +31,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  }
>  
>  if { ![runto_main] } {
> -    untested "failed to runto main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/riscv-unwind-long-insn.exp b/gdb/testsuite/gdb.arch/riscv-unwind-long-insn.exp
> index ee5dea05636..7bb100fd70c 100644
> --- a/gdb/testsuite/gdb.arch/riscv-unwind-long-insn.exp
> +++ b/gdb/testsuite/gdb.arch/riscv-unwind-long-insn.exp
> @@ -38,7 +38,6 @@ foreach_with_prefix {insn_size} {6 8} {
>      }
>  
>      if ![runto_main] then {
> -	fail "can't run to main"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-ld-lw.exp b/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-ld-lw.exp
> index f559c3ff4bc..b129704121b 100644
> --- a/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-ld-lw.exp
> +++ b/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-ld-lw.exp
> @@ -29,7 +29,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.arch/s390-tdbregs.exp b/gdb/testsuite/gdb.arch/s390-tdbregs.exp
> index 4b7704a9879..1ea7ca2b2be 100644
> --- a/gdb/testsuite/gdb.arch/s390-tdbregs.exp
> +++ b/gdb/testsuite/gdb.arch/s390-tdbregs.exp
> @@ -36,7 +36,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.arch/s390-vregs.exp b/gdb/testsuite/gdb.arch/s390-vregs.exp
> index 97d11e08d76..2ef55dfb611 100644
> --- a/gdb/testsuite/gdb.arch/s390-vregs.exp
> +++ b/gdb/testsuite/gdb.arch/s390-vregs.exp
> @@ -35,7 +35,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.arch/sparc64-adi.exp b/gdb/testsuite/gdb.arch/sparc64-adi.exp
> index 13abc0f0460..5c9b5379290 100644
> --- a/gdb/testsuite/gdb.arch/sparc64-adi.exp
> +++ b/gdb/testsuite/gdb.arch/sparc64-adi.exp
> @@ -31,7 +31,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
>  }
>  
>  if ![runto_main] then {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/sparc64-regs.exp b/gdb/testsuite/gdb.arch/sparc64-regs.exp
> index b5688895634..bf5dcb9c31b 100644
> --- a/gdb/testsuite/gdb.arch/sparc64-regs.exp
> +++ b/gdb/testsuite/gdb.arch/sparc64-regs.exp
> @@ -30,7 +30,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
>  }
>  
>  if ![runto_main] then {
> -    untested "could not run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
> index cc818390a8b..8980a41f04a 100644
> --- a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
> +++ b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
> @@ -29,7 +29,6 @@ if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] {
>  }
>  
>  if ![runto_main] then {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/thumb-prologue.exp b/gdb/testsuite/gdb.arch/thumb-prologue.exp
> index 5cd92839eb4..f8b1b610710 100644
> --- a/gdb/testsuite/gdb.arch/thumb-prologue.exp
> +++ b/gdb/testsuite/gdb.arch/thumb-prologue.exp
> @@ -40,7 +40,6 @@ gdb_load ${binfile}
>  #
>  
>  if ![runto_main] then {
> -    untested "ARM prologue tests"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/thumb-singlestep.exp b/gdb/testsuite/gdb.arch/thumb-singlestep.exp
> index 2cc79ed973f..3f0ed125ad6 100644
> --- a/gdb/testsuite/gdb.arch/thumb-singlestep.exp
> +++ b/gdb/testsuite/gdb.arch/thumb-singlestep.exp
> @@ -29,7 +29,6 @@ if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} [list debug $
>  }
>  
>  if ![runto_main] then {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/thumb2-it.exp b/gdb/testsuite/gdb.arch/thumb2-it.exp
> index 1fa037fd38f..6d34126e688 100644
> --- a/gdb/testsuite/gdb.arch/thumb2-it.exp
> +++ b/gdb/testsuite/gdb.arch/thumb2-it.exp
> @@ -33,7 +33,6 @@ gdb_reinitialize_dir $srcdir/$subdir
>  gdb_load ${binfile}
>  
>  if ![runto_main] then {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/vsx-regs.exp b/gdb/testsuite/gdb.arch/vsx-regs.exp
> index 44ed993f127..1cdf92dc2c3 100644
> --- a/gdb/testsuite/gdb.arch/vsx-regs.exp
> +++ b/gdb/testsuite/gdb.arch/vsx-regs.exp
> @@ -53,7 +53,6 @@ gdb_load ${binfile}
>  # Run to `main' where we begin our tests.
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp b/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp
> index cefe43ccab7..0eaddce5e4a 100644
> --- a/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp
> +++ b/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp
> @@ -53,7 +53,6 @@ gdb_load ${binfile}
>  # Run to `main' where we begin our tests.
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/x86-avx512bf16.exp b/gdb/testsuite/gdb.arch/x86-avx512bf16.exp
> index 528e79f02df..25a8c8079c6 100644
> --- a/gdb/testsuite/gdb.arch/x86-avx512bf16.exp
> +++ b/gdb/testsuite/gdb.arch/x86-avx512bf16.exp
> @@ -30,7 +30,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
>  }
>  
>  if { ![runto_main] } {
> -    unsupported "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp b/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp
> index 61cd189a3dd..a156cba5c09 100644
> --- a/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp
> +++ b/gdb/testsuite/gdb.arch/x86-avx512fp16-abi.exp
> @@ -28,7 +28,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  }
>  
>  if { ![runto_main] } {
> -    unsupported "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.arch/x86-avx512fp16.exp b/gdb/testsuite/gdb.arch/x86-avx512fp16.exp
> index 22575cc2fe8..2e2c255e769 100644
> --- a/gdb/testsuite/gdb.arch/x86-avx512fp16.exp
> +++ b/gdb/testsuite/gdb.arch/x86-avx512fp16.exp
> @@ -27,7 +27,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
>  }
>  
>  if { ![runto_main] } {
> -    unsupported "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp
> index d188c711b83..c4691ee8412 100644
> --- a/gdb/testsuite/gdb.asm/asm-source.exp
> +++ b/gdb/testsuite/gdb.asm/asm-source.exp
> @@ -285,7 +285,6 @@ gdb_load ${binfile}
>  #
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> 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 b17a7842d5f..c080d60a420 100644
> --- a/gdb/testsuite/gdb.base/info-os.exp
> +++ b/gdb/testsuite/gdb.base/info-os.exp
> @@ -34,7 +34,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
>      }
>  
> diff --git a/gdb/testsuite/gdb.btrace/buffer-size.exp b/gdb/testsuite/gdb.btrace/buffer-size.exp
> index ea4e36c1593..04bf523d7cb 100644
> --- a/gdb/testsuite/gdb.btrace/buffer-size.exp
> +++ b/gdb/testsuite/gdb.btrace/buffer-size.exp
> @@ -28,7 +28,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.btrace/data.exp b/gdb/testsuite/gdb.btrace/data.exp
> index 170d4bc6210..e12e792e4a2 100644
> --- a/gdb/testsuite/gdb.btrace/data.exp
> +++ b/gdb/testsuite/gdb.btrace/data.exp
> @@ -28,7 +28,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.btrace/delta.exp b/gdb/testsuite/gdb.btrace/delta.exp
> index 0d61e9aa54e..5e0ffefd4e0 100644
> --- a/gdb/testsuite/gdb.btrace/delta.exp
> +++ b/gdb/testsuite/gdb.btrace/delta.exp
> @@ -28,7 +28,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.btrace/dlopen.exp b/gdb/testsuite/gdb.btrace/dlopen.exp
> index 6e717aa862b..ad77dabe638 100644
> --- a/gdb/testsuite/gdb.btrace/dlopen.exp
> +++ b/gdb/testsuite/gdb.btrace/dlopen.exp
> @@ -42,7 +42,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.btrace/enable-new-thread.exp b/gdb/testsuite/gdb.btrace/enable-new-thread.exp
> index 5000ae56212..d718e857312 100644
> --- a/gdb/testsuite/gdb.btrace/enable-new-thread.exp
> +++ b/gdb/testsuite/gdb.btrace/enable-new-thread.exp
> @@ -28,7 +28,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}]
>  }
>  
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.btrace/enable-running.exp b/gdb/testsuite/gdb.btrace/enable-running.exp
> index 08d682e4f70..d8ac675737c 100644
> --- a/gdb/testsuite/gdb.btrace/enable-running.exp
> +++ b/gdb/testsuite/gdb.btrace/enable-running.exp
> @@ -33,7 +33,6 @@ save_vars { GDBFLAGS } {
>  }
>  
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.btrace/enable.exp b/gdb/testsuite/gdb.btrace/enable.exp
> index fdfdce3fc22..ecec5f59dde 100644
> --- a/gdb/testsuite/gdb.btrace/enable.exp
> +++ b/gdb/testsuite/gdb.btrace/enable.exp
> @@ -43,7 +43,6 @@ if [prepare_for_testing "failed to prepare" $testfile {} {debug}] {
>  }
>  
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> @@ -86,23 +85,19 @@ if [skip_gdbserver_tests] {
>  }
>  clean_restart $testfile
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  
>  # make sure record-btrace can be enabled after re-run
>  clean_restart $testfile
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  gdb_test_no_output "record btrace" "enable after restart"
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  gdb_test_no_output "record btrace" "enable after re-run"
> diff --git a/gdb/testsuite/gdb.btrace/exception.exp b/gdb/testsuite/gdb.btrace/exception.exp
> index 7b840e41bfc..ea8ccafc2c4 100755
> --- a/gdb/testsuite/gdb.btrace/exception.exp
> +++ b/gdb/testsuite/gdb.btrace/exception.exp
> @@ -31,7 +31,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.btrace/function_call_history.exp b/gdb/testsuite/gdb.btrace/function_call_history.exp
> index f995016fafa..284928a9722 100644
> --- a/gdb/testsuite/gdb.btrace/function_call_history.exp
> +++ b/gdb/testsuite/gdb.btrace/function_call_history.exp
> @@ -30,7 +30,6 @@ if [prepare_for_testing "failed to prepare" $testfile {} {nopie debug}] {
>  }
>  
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> @@ -231,7 +230,6 @@ gdb_test "record function-call-history /c 21, +11" [multi_line \
>  
>  # make sure we can handle incomplete trace with respect to indentation
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  # navigate to the fib in line 24 above
> diff --git a/gdb/testsuite/gdb.btrace/gcore.exp b/gdb/testsuite/gdb.btrace/gcore.exp
> index b0bc32f395d..3d12f6e28a8 100644
> --- a/gdb/testsuite/gdb.btrace/gcore.exp
> +++ b/gdb/testsuite/gdb.btrace/gcore.exp
> @@ -28,7 +28,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.btrace/instruction_history.exp b/gdb/testsuite/gdb.btrace/instruction_history.exp
> index 403085c083f..031ed25c06e 100644
> --- a/gdb/testsuite/gdb.btrace/instruction_history.exp
> +++ b/gdb/testsuite/gdb.btrace/instruction_history.exp
> @@ -28,7 +28,6 @@ if [prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" {debu
>  }
>  
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.btrace/multi-inferior.exp b/gdb/testsuite/gdb.btrace/multi-inferior.exp
> index 1e028e1e994..cf02f5f2430 100644
> --- a/gdb/testsuite/gdb.btrace/multi-inferior.exp
> +++ b/gdb/testsuite/gdb.btrace/multi-inferior.exp
> @@ -39,7 +39,6 @@ if [prepare_for_testing "failed to prepare" $testfile {} {debug}] {
>  
>  with_test_prefix "inferior 1" {
>      if ![runto_main] {
> -	untested "failed to run to main"
>  	return -1
>      }
>  }
> @@ -50,7 +49,6 @@ with_test_prefix "inferior 2" {
>      gdb_test "inferior 2" "Switching to inferior 2.*"
>  
>      if ![runto_main] {
> -	untested "inferior 2: failed to run to main"
>  	return -1
>      }
>  
> @@ -70,7 +68,6 @@ with_test_prefix "inferior 3" {
>      gdb_test "inferior 3" "Switching to inferior 3.*"
>  
>      if ![runto_main] {
> -	untested "inferior 3: failed to run to main"
>  	return -1
>      }
>  
> diff --git a/gdb/testsuite/gdb.btrace/multi-thread-step.exp b/gdb/testsuite/gdb.btrace/multi-thread-step.exp
> index 4ab44824ed8..1df27c27ffe 100644
> --- a/gdb/testsuite/gdb.btrace/multi-thread-step.exp
> +++ b/gdb/testsuite/gdb.btrace/multi-thread-step.exp
> @@ -30,7 +30,6 @@ if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable {debu
>  clean_restart $testfile
>  
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.btrace/nohist.exp b/gdb/testsuite/gdb.btrace/nohist.exp
> index 591c721d187..d7eb7af29f3 100644
> --- a/gdb/testsuite/gdb.btrace/nohist.exp
> +++ b/gdb/testsuite/gdb.btrace/nohist.exp
> @@ -28,7 +28,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.btrace/non-stop.exp b/gdb/testsuite/gdb.btrace/non-stop.exp
> index e509d65d660..6f762639595 100644
> --- a/gdb/testsuite/gdb.btrace/non-stop.exp
> +++ b/gdb/testsuite/gdb.btrace/non-stop.exp
> @@ -32,7 +32,6 @@ save_vars { GDBFLAGS } {
>  }
>  
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.btrace/record_goto-step.exp b/gdb/testsuite/gdb.btrace/record_goto-step.exp
> index fd3b87f995a..27f4c49bb4e 100644
> --- a/gdb/testsuite/gdb.btrace/record_goto-step.exp
> +++ b/gdb/testsuite/gdb.btrace/record_goto-step.exp
> @@ -28,7 +28,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.btrace/record_goto.exp b/gdb/testsuite/gdb.btrace/record_goto.exp
> index 75d76da1c7f..3cde516b82c 100644
> --- a/gdb/testsuite/gdb.btrace/record_goto.exp
> +++ b/gdb/testsuite/gdb.btrace/record_goto.exp
> @@ -51,7 +51,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] {
>  }
>  
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp b/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
> index 204e88093a4..9063f9144dd 100644
> --- a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
> +++ b/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
> @@ -33,7 +33,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.btrace/segv.exp b/gdb/testsuite/gdb.btrace/segv.exp
> index a505b347feb..5730697cc6e 100644
> --- a/gdb/testsuite/gdb.btrace/segv.exp
> +++ b/gdb/testsuite/gdb.btrace/segv.exp
> @@ -27,7 +27,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
>      return -1
>  }
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.btrace/step.exp b/gdb/testsuite/gdb.btrace/step.exp
> index 5091867463b..59751c11575 100644
> --- a/gdb/testsuite/gdb.btrace/step.exp
> +++ b/gdb/testsuite/gdb.btrace/step.exp
> @@ -28,7 +28,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.btrace/stepi.exp b/gdb/testsuite/gdb.btrace/stepi.exp
> index 480c08c4875..11051b5cef0 100644
> --- a/gdb/testsuite/gdb.btrace/stepi.exp
> +++ b/gdb/testsuite/gdb.btrace/stepi.exp
> @@ -49,7 +49,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.btrace/tailcall-only.exp b/gdb/testsuite/gdb.btrace/tailcall-only.exp
> index 510f90c9d5e..2f9c3ed7807 100644
> --- a/gdb/testsuite/gdb.btrace/tailcall-only.exp
> +++ b/gdb/testsuite/gdb.btrace/tailcall-only.exp
> @@ -53,7 +53,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] {
>  }
>  
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.btrace/tailcall.exp b/gdb/testsuite/gdb.btrace/tailcall.exp
> index 07a3ec103f4..95bc8c7d0e5 100644
> --- a/gdb/testsuite/gdb.btrace/tailcall.exp
> +++ b/gdb/testsuite/gdb.btrace/tailcall.exp
> @@ -49,7 +49,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] {
>      return -1
>  }
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.btrace/tsx.exp b/gdb/testsuite/gdb.btrace/tsx.exp
> index 66f6305e50a..401b1fafe93 100644
> --- a/gdb/testsuite/gdb.btrace/tsx.exp
> +++ b/gdb/testsuite/gdb.btrace/tsx.exp
> @@ -31,7 +31,6 @@ if [prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" {debu
>  }
>  
>  if ![runto_main] {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.btrace/unknown_functions.exp b/gdb/testsuite/gdb.btrace/unknown_functions.exp
> index dc52d75c0f3..0226c135583 100644
> --- a/gdb/testsuite/gdb.btrace/unknown_functions.exp
> +++ b/gdb/testsuite/gdb.btrace/unknown_functions.exp
> @@ -34,7 +34,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile \
>  }
>  
>  if ![runto test] {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.btrace/vdso.exp b/gdb/testsuite/gdb.btrace/vdso.exp
> index 245536af0c2..de484f2a03f 100644
> --- a/gdb/testsuite/gdb.btrace/vdso.exp
> +++ b/gdb/testsuite/gdb.btrace/vdso.exp
> @@ -31,7 +31,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.compile/compile-cplus-anonymous.exp b/gdb/testsuite/gdb.compile/compile-cplus-anonymous.exp
> index 497c5ceaf9e..572206f5f57 100644
> --- a/gdb/testsuite/gdb.compile/compile-cplus-anonymous.exp
> +++ b/gdb/testsuite/gdb.compile/compile-cplus-anonymous.exp
> @@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
>  }
>  
>  if {![runto_main]} {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp b/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp
> index 3c803b78589..27b713b90a0 100644
> --- a/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp
> +++ b/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp
> @@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
>  }
>  
>  if {![runto_main]} {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp b/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp
> index e5c9c035962..de7c3511b99 100644
> --- a/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp
> +++ b/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp
> @@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
>  }
>  
>  if {![runto_main]} {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.compile/compile-cplus-member.exp b/gdb/testsuite/gdb.compile/compile-cplus-member.exp
> index f6f570d7e3b..a702a25250b 100644
> --- a/gdb/testsuite/gdb.compile/compile-cplus-member.exp
> +++ b/gdb/testsuite/gdb.compile/compile-cplus-member.exp
> @@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
>  }
>  
>  if {![runto_main]} {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.compile/compile-cplus-method.exp b/gdb/testsuite/gdb.compile/compile-cplus-method.exp
> index 5fe026acadd..1c020aa9b10 100644
> --- a/gdb/testsuite/gdb.compile/compile-cplus-method.exp
> +++ b/gdb/testsuite/gdb.compile/compile-cplus-method.exp
> @@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
>  }
>  
>  if {![runto_main]} {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp b/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp
> index 9d60290078b..75637843a93 100644
> --- a/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp
> +++ b/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp
> @@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
>  }
>  
>  if {![runto_main]} {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.compile/compile-cplus-nested.exp b/gdb/testsuite/gdb.compile/compile-cplus-nested.exp
> index d4183324c46..dc8e1d2cb16 100644
> --- a/gdb/testsuite/gdb.compile/compile-cplus-nested.exp
> +++ b/gdb/testsuite/gdb.compile/compile-cplus-nested.exp
> @@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
>  }
>  
>  if {![runto_main]} {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp b/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp
> index 745589beeea..b57d59bb0b5 100644
> --- a/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp
> +++ b/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp
> @@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile $testfile $srcfile \
>  }
>  
>  if {![runto_main]} {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.compile/compile-tls.exp b/gdb/testsuite/gdb.compile/compile-tls.exp
> index f65652ffcda..980cfda07e5 100644
> --- a/gdb/testsuite/gdb.compile/compile-tls.exp
> +++ b/gdb/testsuite/gdb.compile/compile-tls.exp
> @@ -22,7 +22,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
>  
>  clean_restart ${binfile}
>  if ![runto_main] then {
> -   fail "can't run to main"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/abstract-origin.exp b/gdb/testsuite/gdb.cp/abstract-origin.exp
> index 4512a79d458..6c5e489d514 100644
> --- a/gdb/testsuite/gdb.cp/abstract-origin.exp
> +++ b/gdb/testsuite/gdb.cp/abstract-origin.exp
> @@ -20,7 +20,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
>  }
>  
>  if ![runto_main] {
> -    untested abstract-origin
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/baseenum.exp b/gdb/testsuite/gdb.cp/baseenum.exp
> index 0ad9ae5ab3e..0fa8ef7704b 100644
> --- a/gdb/testsuite/gdb.cp/baseenum.exp
> +++ b/gdb/testsuite/gdb.cp/baseenum.exp
> @@ -22,7 +22,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
>  }
>  
>  if {![runto_main]} {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/call-method-register.exp b/gdb/testsuite/gdb.cp/call-method-register.exp
> index bcd8e17f4f0..f3c666e5d8e 100644
> --- a/gdb/testsuite/gdb.cp/call-method-register.exp
> +++ b/gdb/testsuite/gdb.cp/call-method-register.exp
> @@ -30,7 +30,6 @@ proc test_call_register_class {} {
>      global gdb_prompt
>  
>      if ![runto_main] {
> -	fail "couldn't run to main"
>  	return
>      }
>  
> diff --git a/gdb/testsuite/gdb.cp/cplabel.exp b/gdb/testsuite/gdb.cp/cplabel.exp
> index 10ba4010793..e8f9211a410 100644
> --- a/gdb/testsuite/gdb.cp/cplabel.exp
> +++ b/gdb/testsuite/gdb.cp/cplabel.exp
> @@ -24,7 +24,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {c++ debug}]} {
>  }
>  
>  if {![runto_main]} {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/destrprint.exp b/gdb/testsuite/gdb.cp/destrprint.exp
> index a4e7b115afd..81ed309d91f 100644
> --- a/gdb/testsuite/gdb.cp/destrprint.exp
> +++ b/gdb/testsuite/gdb.cp/destrprint.exp
> @@ -20,7 +20,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
>  }
>  
>  if ![runto_main] {
> -    untested destrprint
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/ena-dis-br-range.exp b/gdb/testsuite/gdb.cp/ena-dis-br-range.exp
> index f2ccaab6a6e..ced186a46e8 100644
> --- a/gdb/testsuite/gdb.cp/ena-dis-br-range.exp
> +++ b/gdb/testsuite/gdb.cp/ena-dis-br-range.exp
> @@ -30,7 +30,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
>  }
>  
>  if ![runto 'marker'] then {
> -    fail "run to marker"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/except-multi-location.exp b/gdb/testsuite/gdb.cp/except-multi-location.exp
> index 921606b3c43..f79e1c8aa96 100644
> --- a/gdb/testsuite/gdb.cp/except-multi-location.exp
> +++ b/gdb/testsuite/gdb.cp/except-multi-location.exp
> @@ -60,7 +60,6 @@ proc test_multi_libstdcpp {static_bin static_lib} {
>      gdb_load_shlib $binfile_lib
>  
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.cp/infcall-nodebug.exp.tcl b/gdb/testsuite/gdb.cp/infcall-nodebug.exp.tcl
> index cb4528b97e3..4760bd05497 100644
> --- a/gdb/testsuite/gdb.cp/infcall-nodebug.exp.tcl
> +++ b/gdb/testsuite/gdb.cp/infcall-nodebug.exp.tcl
> @@ -74,7 +74,6 @@ proc build_and_run_test { lang symbols } {
>      clean_restart $binfile
>  
>      if ![runto_main] then {
> -	fail "can't run to main"
>  	return
>      }
>  
> diff --git a/gdb/testsuite/gdb.cp/local-static.exp b/gdb/testsuite/gdb.cp/local-static.exp
> index 335c7e31130..15bb7cf8e10 100644
> --- a/gdb/testsuite/gdb.cp/local-static.exp
> +++ b/gdb/testsuite/gdb.cp/local-static.exp
> @@ -150,7 +150,6 @@ proc do_test {lang} {
>      }
>  
>      if ![runto_main] then {
> -	fail "couldn't run to breakpoint"
>  	return
>      }
>  
> diff --git a/gdb/testsuite/gdb.cp/mb-inline.exp b/gdb/testsuite/gdb.cp/mb-inline.exp
> index e77f139f4e2..19a83302ffa 100644
> --- a/gdb/testsuite/gdb.cp/mb-inline.exp
> +++ b/gdb/testsuite/gdb.cp/mb-inline.exp
> @@ -83,7 +83,6 @@ delete_breakpoints
>  set bp_location [gdb_get_line_number "set multi-line breakpoint here" $hdrfile]
>  
>  if { ![runto_main] } {
> -    fail "can't run to main for multi_line_foo tests."
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/mb-templates.exp b/gdb/testsuite/gdb.cp/mb-templates.exp
> index 0a18000bdfd..3ec71fb1a29 100644
> --- a/gdb/testsuite/gdb.cp/mb-templates.exp
> +++ b/gdb/testsuite/gdb.cp/mb-templates.exp
> @@ -112,7 +112,6 @@ delete_breakpoints
>  set bp_location [gdb_get_line_number "set multi-line breakpoint here"]
>  
>  if { ![runto_main] } {
> -    fail "can't run to main for multi_line_foo tests."
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/pass-by-ref-2.exp b/gdb/testsuite/gdb.cp/pass-by-ref-2.exp
> index 84ee717c265..1435d718dbf 100644
> --- a/gdb/testsuite/gdb.cp/pass-by-ref-2.exp
> +++ b/gdb/testsuite/gdb.cp/pass-by-ref-2.exp
> @@ -38,7 +38,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile $options]} {
>  }
>  
>  if {![runto_main]} {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/pass-by-ref.exp b/gdb/testsuite/gdb.cp/pass-by-ref.exp
> index d4a8825df8f..ff1ec56c58d 100644
> --- a/gdb/testsuite/gdb.cp/pass-by-ref.exp
> +++ b/gdb/testsuite/gdb.cp/pass-by-ref.exp
> @@ -343,7 +343,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile $options]} {
>  }
>  
>  if {![runto_main]} {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/pr10687.exp b/gdb/testsuite/gdb.cp/pr10687.exp
> index 088fde3cf5d..8bc31698bc2 100644
> --- a/gdb/testsuite/gdb.cp/pr10687.exp
> +++ b/gdb/testsuite/gdb.cp/pr10687.exp
> @@ -20,7 +20,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
>  }
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/pr9167.exp b/gdb/testsuite/gdb.cp/pr9167.exp
> index d88c75d8a12..2486b895947 100644
> --- a/gdb/testsuite/gdb.cp/pr9167.exp
> +++ b/gdb/testsuite/gdb.cp/pr9167.exp
> @@ -26,7 +26,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
>  }
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-casts.exp b/gdb/testsuite/gdb.cp/rvalue-ref-casts.exp
> index b375f01ecd8..93299d17500 100644
> --- a/gdb/testsuite/gdb.cp/rvalue-ref-casts.exp
> +++ b/gdb/testsuite/gdb.cp/rvalue-ref-casts.exp
> @@ -31,7 +31,6 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile \
>  }
>  
>  if {![runto_main]} {
> -    untested "couldn't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-types.exp b/gdb/testsuite/gdb.cp/rvalue-ref-types.exp
> index 32ca8853bcc..23cdbe1f87a 100644
> --- a/gdb/testsuite/gdb.cp/rvalue-ref-types.exp
> +++ b/gdb/testsuite/gdb.cp/rvalue-ref-types.exp
> @@ -29,12 +29,10 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile \
>  # Set it up at a breakpoint so we can play with the variable values.
>  #
>  if {![runto_main]} {
> -    untested "couldn't run to breakpoint"
>      return -1
>  }
>  
>  if {![runto 'marker1']} {
> -    untested "couldn't run to marker1"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/save-bp-qualified.exp b/gdb/testsuite/gdb.cp/save-bp-qualified.exp
> index d779ed683a5..bcf22f0b001 100644
> --- a/gdb/testsuite/gdb.cp/save-bp-qualified.exp
> +++ b/gdb/testsuite/gdb.cp/save-bp-qualified.exp
> @@ -27,7 +27,6 @@ proc restart {} {
>      clean_restart $testfile
>  
>      if ![runto_main] {
> -	untested "could not run to main"
>  	return 0
>      }
>      # Delete all breakpoints so that the "runto_main" breakpoint above
> diff --git a/gdb/testsuite/gdb.cp/scope-err.exp b/gdb/testsuite/gdb.cp/scope-err.exp
> index 216665ea98c..685e0bf85a4 100644
> --- a/gdb/testsuite/gdb.cp/scope-err.exp
> +++ b/gdb/testsuite/gdb.cp/scope-err.exp
> @@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $exefile $srcfile {debug c++}]} {
>  }
>  
>  if {![runto_main]} {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/static-typedef-print.exp b/gdb/testsuite/gdb.cp/static-typedef-print.exp
> index 3c8e286a1f2..b4b18bf3c05 100644
> --- a/gdb/testsuite/gdb.cp/static-typedef-print.exp
> +++ b/gdb/testsuite/gdb.cp/static-typedef-print.exp
> @@ -26,7 +26,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
>  }
>  
>  if ![runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/step-and-next-inline.exp b/gdb/testsuite/gdb.cp/step-and-next-inline.exp
> index 13d801bb539..4997abb9b1b 100644
> --- a/gdb/testsuite/gdb.cp/step-and-next-inline.exp
> +++ b/gdb/testsuite/gdb.cp/step-and-next-inline.exp
> @@ -59,7 +59,6 @@ proc do_test { use_header } {
>      with_test_prefix $prefix {
>  
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return
>      }
>  
> @@ -176,7 +175,6 @@ proc do_test { use_header } {
>      clean_restart ${executable}
>  
>      if ![runto_main] {
> -	fail "can't run to main pass 2"
>  	return
>      }
>  
> diff --git a/gdb/testsuite/gdb.cp/typedef-base.exp b/gdb/testsuite/gdb.cp/typedef-base.exp
> index 7edc1640c45..7b7bdc45097 100644
> --- a/gdb/testsuite/gdb.cp/typedef-base.exp
> +++ b/gdb/testsuite/gdb.cp/typedef-base.exp
> @@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
>  }
>  
>  if ![runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/typeid.exp b/gdb/testsuite/gdb.cp/typeid.exp
> index 1a2599fb6d0..5b9ff91bebc 100644
> --- a/gdb/testsuite/gdb.cp/typeid.exp
> +++ b/gdb/testsuite/gdb.cp/typeid.exp
> @@ -58,7 +58,6 @@ with_test_prefix "before starting" {
>  }
>  
>  if ![runto_main] {
> -    untested typeid
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.cp/wide_char_types.exp b/gdb/testsuite/gdb.cp/wide_char_types.exp
> index 03d8502d25b..e11b11d354f 100644
> --- a/gdb/testsuite/gdb.cp/wide_char_types.exp
> +++ b/gdb/testsuite/gdb.cp/wide_char_types.exp
> @@ -48,7 +48,6 @@ proc wide_char_types_program {lang} {
>      }
>  
>      if ![runto_main] then {
> -	fail "can't run to main"
>  	return 0
>      }
>      do_test_wide_char $lang "u16" "u32" "wchar"
> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
> index 5f52bc9d110..752c4842467 100644
> --- a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
> +++ b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
> @@ -36,7 +36,6 @@ if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile {nodebug no
>  }
>  
>  if ![runto_main] then {
> -    fail "cannot run to main."
>      continue
>  }
>  
> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp
> index e43f59ea1ad..0320c11d9e4 100644
> --- a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp
> +++ b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp
> @@ -119,7 +119,6 @@ foreach_with_prefix ranges_sect {ranges rnglists} {
>      gdb_test_no_output "set auto-solib-add off"
>  
>      if { ![runto_main] } {
> -	fail "cannot run to main."
>  	return -1
>      }
>  
> diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp
> index 2d5a633a9f3..9034f4c0085 100644
> --- a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp
> +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp
> @@ -80,4 +80,4 @@ if { [ensure_gdb_index $binfile] == -1 } {
>  
>  clean_restart ${binfile}
>  
> -runto main message
> +runto main
> diff --git a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp
> index 1c366521808..d05300e2882 100644
> --- a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp
> +++ b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp
> @@ -324,7 +324,6 @@ if [prepare_for_testing "failed to prepare" ${testfile} \
>  gdb_load_shlib ${lib_so}
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp b/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp
> index 6b4f5c8cbb8..47e163f6db0 100644
> --- a/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp
> +++ b/gdb/testsuite/gdb.dwarf2/loclists-multiple-cus.exp
> @@ -127,7 +127,6 @@ foreach_with_prefix is_64 {false true} {
>      }
>  
>      if { ![runto_main] } {
> -	fail "can't run to main"
>  	return
>      }
>  
> diff --git a/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp b/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp
> index 573324af3d1..0ca9dc17e42 100644
> --- a/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp
> +++ b/gdb/testsuite/gdb.dwarf2/loclists-sec-offset.exp
> @@ -218,7 +218,6 @@ foreach_with_prefix is_64 {false true} {
>      }
>  
>      if { ![runto_main] } {
> -	fail "can't run to main"
>  	return
>      }
>  
> diff --git a/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp b/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp
> index 43ddefcf61d..ce611fb5554 100644
> --- a/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp
> +++ b/gdb/testsuite/gdb.dwarf2/loclists-start-end.exp
> @@ -118,7 +118,6 @@ foreach_with_prefix is_64 {false true} {
>      }
>  
>      if { ![runto_main] } {
> -	fail "can't run to main"
>  	return
>      }
>  
> diff --git a/gdb/testsuite/gdb.fortran/allocated.exp b/gdb/testsuite/gdb.fortran/allocated.exp
> index 4391c5eec97..d9308af17b5 100644
> --- a/gdb/testsuite/gdb.fortran/allocated.exp
> +++ b/gdb/testsuite/gdb.fortran/allocated.exp
> @@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/array-slices-bad.exp b/gdb/testsuite/gdb.fortran/array-slices-bad.exp
> index b9519e69c94..a68903498d6 100644
> --- a/gdb/testsuite/gdb.fortran/array-slices-bad.exp
> +++ b/gdb/testsuite/gdb.fortran/array-slices-bad.exp
> @@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp b/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp
> index 98a5da20e57..4264cec7a9d 100644
> --- a/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp
> +++ b/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp
> @@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/array-slices.exp b/gdb/testsuite/gdb.fortran/array-slices.exp
> index 8200a0ca284..5b01e4f5e04 100644
> --- a/gdb/testsuite/gdb.fortran/array-slices.exp
> +++ b/gdb/testsuite/gdb.fortran/array-slices.exp
> @@ -56,7 +56,6 @@ proc run_test { repack } {
>      clean_restart ${binfile}
>  
>      if ![fortran_runto_main] {
> -	untested "could not run to main"
>  	return -1
>      }
>  
> diff --git a/gdb/testsuite/gdb.fortran/associated.exp b/gdb/testsuite/gdb.fortran/associated.exp
> index 021a6b784f9..fdd3162e19b 100644
> --- a/gdb/testsuite/gdb.fortran/associated.exp
> +++ b/gdb/testsuite/gdb.fortran/associated.exp
> @@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/block-data.exp b/gdb/testsuite/gdb.fortran/block-data.exp
> index 73df4abfa7b..ec26cf0b80c 100644
> --- a/gdb/testsuite/gdb.fortran/block-data.exp
> +++ b/gdb/testsuite/gdb.fortran/block-data.exp
> @@ -31,7 +31,6 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
>  }
>  
>  if ![fortran_runto_main] then {
> -    untested "couldn't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/call-no-debug.exp b/gdb/testsuite/gdb.fortran/call-no-debug.exp
> index a5e982533fd..3c5172e7e36 100644
> --- a/gdb/testsuite/gdb.fortran/call-no-debug.exp
> +++ b/gdb/testsuite/gdb.fortran/call-no-debug.exp
> @@ -68,7 +68,6 @@ set some_func [find_mangled_name "some_func"]
>  set string_func [find_mangled_name "string_func"]
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/class-allocatable-array.exp b/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
> index b98cd4fa130..b5097df25a0 100644
> --- a/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
> +++ b/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
> @@ -27,7 +27,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/completion.exp b/gdb/testsuite/gdb.fortran/completion.exp
> index 9ff3b7858d1..cf01d48e5df 100644
> --- a/gdb/testsuite/gdb.fortran/completion.exp
> +++ b/gdb/testsuite/gdb.fortran/completion.exp
> @@ -27,7 +27,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/debug-expr.exp b/gdb/testsuite/gdb.fortran/debug-expr.exp
> index ca1fb9755aa..db2178fed17 100644
> --- a/gdb/testsuite/gdb.fortran/debug-expr.exp
> +++ b/gdb/testsuite/gdb.fortran/debug-expr.exp
> @@ -32,7 +32,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
>  }
>  
>  if ![fortran_runto_main] {
> -    fail "run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/intvar-array.exp b/gdb/testsuite/gdb.fortran/intvar-array.exp
> index 1569f51fa4e..bed80e7c629 100644
> --- a/gdb/testsuite/gdb.fortran/intvar-array.exp
> +++ b/gdb/testsuite/gdb.fortran/intvar-array.exp
> @@ -26,7 +26,6 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp b/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp
> index 16dc603cb47..acac03bb0f0 100644
> --- a/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp
> +++ b/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp
> @@ -25,7 +25,6 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/lbound-ubound.exp b/gdb/testsuite/gdb.fortran/lbound-ubound.exp
> index 7b2efde2636..489c9ad24ce 100644
> --- a/gdb/testsuite/gdb.fortran/lbound-ubound.exp
> +++ b/gdb/testsuite/gdb.fortran/lbound-ubound.exp
> @@ -27,7 +27,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
>  
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
> index 6a249e60f2f..ba9dcd546b5 100644
> --- a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
> +++ b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
> @@ -46,7 +46,6 @@ proc run_tests { lang } {
>  	clean_restart ${binfile}
>  
>  	if ![runto_main] {
> -	    untested "could not run to main"
>  	    return -1
>  	}
>  
> diff --git a/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp b/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp
> index 306168b2876..b3e64c5a024 100644
> --- a/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp
> +++ b/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp
> @@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/print-formatted.exp b/gdb/testsuite/gdb.fortran/print-formatted.exp
> index 6c2eeb0df71..d0a244943dd 100644
> --- a/gdb/testsuite/gdb.fortran/print-formatted.exp
> +++ b/gdb/testsuite/gdb.fortran/print-formatted.exp
> @@ -26,7 +26,6 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}] }
>  }
>  
>  if { ![fortran_runto_main] } {
> -    fail "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/print_type.exp b/gdb/testsuite/gdb.fortran/print_type.exp
> index 11aa0f5de9c..9027a29fb1b 100755
> --- a/gdb/testsuite/gdb.fortran/print_type.exp
> +++ b/gdb/testsuite/gdb.fortran/print_type.exp
> @@ -27,7 +27,6 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/printing-types.exp b/gdb/testsuite/gdb.fortran/printing-types.exp
> index 2a66eae44df..860aabb2ca3 100644
> --- a/gdb/testsuite/gdb.fortran/printing-types.exp
> +++ b/gdb/testsuite/gdb.fortran/printing-types.exp
> @@ -23,7 +23,6 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
>  }
>  
>  if {![fortran_runto_main]} then {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/ptr-indentation.exp b/gdb/testsuite/gdb.fortran/ptr-indentation.exp
> index f229489bf8f..830166b1765 100644
> --- a/gdb/testsuite/gdb.fortran/ptr-indentation.exp
> +++ b/gdb/testsuite/gdb.fortran/ptr-indentation.exp
> @@ -23,7 +23,6 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
>  }
>  
>  if {![fortran_runto_main]} then {
> -    untested "couldn't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/rank.exp b/gdb/testsuite/gdb.fortran/rank.exp
> index 86af7111f47..b2ea5d99a0f 100644
> --- a/gdb/testsuite/gdb.fortran/rank.exp
> +++ b/gdb/testsuite/gdb.fortran/rank.exp
> @@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/shape.exp b/gdb/testsuite/gdb.fortran/shape.exp
> index 0c41b7b2326..4e02dc65d9f 100644
> --- a/gdb/testsuite/gdb.fortran/shape.exp
> +++ b/gdb/testsuite/gdb.fortran/shape.exp
> @@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/size.exp b/gdb/testsuite/gdb.fortran/size.exp
> index 20a9b2795b0..c1363cb8a12 100644
> --- a/gdb/testsuite/gdb.fortran/size.exp
> +++ b/gdb/testsuite/gdb.fortran/size.exp
> @@ -26,7 +26,6 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp
> index 2fe86c8dced..e20e6caa4dd 100644
> --- a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp
> +++ b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp
> @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/vla-datatypes.exp b/gdb/testsuite/gdb.fortran/vla-datatypes.exp
> index eaf4bdfc806..49894a992e1 100644
> --- a/gdb/testsuite/gdb.fortran/vla-datatypes.exp
> +++ b/gdb/testsuite/gdb.fortran/vla-datatypes.exp
> @@ -27,7 +27,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  # handled correctly when using as VLA's
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/vla-history.exp b/gdb/testsuite/gdb.fortran/vla-history.exp
> index 49fb446edcf..918d13bb8cf 100644
> --- a/gdb/testsuite/gdb.fortran/vla-history.exp
> +++ b/gdb/testsuite/gdb.fortran/vla-history.exp
> @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp
> index f329204c3bd..a70ca8c9021 100644
> --- a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp
> +++ b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp
> @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp b/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp
> index 162a2eb31ea..fbe36efc065 100644
> --- a/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp
> +++ b/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp
> @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/vla-ptype.exp b/gdb/testsuite/gdb.fortran/vla-ptype.exp
> index d279cd02dee..10d593b3386 100644
> --- a/gdb/testsuite/gdb.fortran/vla-ptype.exp
> +++ b/gdb/testsuite/gdb.fortran/vla-ptype.exp
> @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/vla-sizeof.exp b/gdb/testsuite/gdb.fortran/vla-sizeof.exp
> index 6e940cf13e9..510e0d10eae 100644
> --- a/gdb/testsuite/gdb.fortran/vla-sizeof.exp
> +++ b/gdb/testsuite/gdb.fortran/vla-sizeof.exp
> @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/vla-type.exp b/gdb/testsuite/gdb.fortran/vla-type.exp
> index 120c3e656c8..0ef3b78a396 100755
> --- a/gdb/testsuite/gdb.fortran/vla-type.exp
> +++ b/gdb/testsuite/gdb.fortran/vla-type.exp
> @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp b/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp
> index bb47527d53e..3f6c1ab4b02 100644
> --- a/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp
> +++ b/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp
> @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp b/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp
> index 0596d9b57f0..9187d33dafc 100644
> --- a/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp
> +++ b/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp
> @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub.exp b/gdb/testsuite/gdb.fortran/vla-value-sub.exp
> index 7be327bae35..92feabbe353 100644
> --- a/gdb/testsuite/gdb.fortran/vla-value-sub.exp
> +++ b/gdb/testsuite/gdb.fortran/vla-value-sub.exp
> @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/vla-value.exp b/gdb/testsuite/gdb.fortran/vla-value.exp
> index 071d2b72d87..f275472e921 100644
> --- a/gdb/testsuite/gdb.fortran/vla-value.exp
> +++ b/gdb/testsuite/gdb.fortran/vla-value.exp
> @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.fortran/whatis_type.exp b/gdb/testsuite/gdb.fortran/whatis_type.exp
> index 02b9e0a40ee..786a46d90a7 100644
> --- a/gdb/testsuite/gdb.fortran/whatis_type.exp
> +++ b/gdb/testsuite/gdb.fortran/whatis_type.exp
> @@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \
>  }
>  
>  if ![fortran_runto_main] {
> -    fail "run to main"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.go/chan.exp b/gdb/testsuite/gdb.go/chan.exp
> index 616794bfcc0..a182c62e7b5 100644
> --- a/gdb/testsuite/gdb.go/chan.exp
> +++ b/gdb/testsuite/gdb.go/chan.exp
> @@ -33,7 +33,6 @@ set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
>  set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]
>  
>  if { [go_runto_main] < 0 } {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.go/global-local-var-shadow.exp b/gdb/testsuite/gdb.go/global-local-var-shadow.exp
> index 8b4dde15012..aec05a61928 100644
> --- a/gdb/testsuite/gdb.go/global-local-var-shadow.exp
> +++ b/gdb/testsuite/gdb.go/global-local-var-shadow.exp
> @@ -31,7 +31,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]
>  set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
>  
>  if { [go_runto_main] < 0 } {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.go/handcall.exp b/gdb/testsuite/gdb.go/handcall.exp
> index a228950ba8f..a5772f06177 100644
> --- a/gdb/testsuite/gdb.go/handcall.exp
> +++ b/gdb/testsuite/gdb.go/handcall.exp
> @@ -29,7 +29,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]
>  }
>  
>  if { [go_runto_main] < 0 } {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.go/hello.exp b/gdb/testsuite/gdb.go/hello.exp
> index eadc99896ad..f20336a7ed5 100644
> --- a/gdb/testsuite/gdb.go/hello.exp
> +++ b/gdb/testsuite/gdb.go/hello.exp
> @@ -31,7 +31,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]
>  set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
>  
>  if { [go_runto_main] < 0 } {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.go/integers.exp b/gdb/testsuite/gdb.go/integers.exp
> index af1eed2ddbf..f6a0b9879e9 100644
> --- a/gdb/testsuite/gdb.go/integers.exp
> +++ b/gdb/testsuite/gdb.go/integers.exp
> @@ -32,7 +32,6 @@ set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
>  set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]
>  
>  if { [go_runto_main] < 0 } {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.go/max-depth.exp b/gdb/testsuite/gdb.go/max-depth.exp
> index 1f8aa8de1b1..d1c7caa0627 100644
> --- a/gdb/testsuite/gdb.go/max-depth.exp
> +++ b/gdb/testsuite/gdb.go/max-depth.exp
> @@ -29,7 +29,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]
>  }
>  
>  if { [go_runto_main] < 0 } {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.go/methods.exp b/gdb/testsuite/gdb.go/methods.exp
> index d21853d44de..2eb49078078 100644
> --- a/gdb/testsuite/gdb.go/methods.exp
> +++ b/gdb/testsuite/gdb.go/methods.exp
> @@ -32,7 +32,6 @@ set bp_location1 {main.T.Foo}
>  set bp_location2 {main.T.Bar}
>  
>  if { [go_runto_main] < 0 } {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.go/package.exp b/gdb/testsuite/gdb.go/package.exp
> index a46f1e27d13..de6109be809 100644
> --- a/gdb/testsuite/gdb.go/package.exp
> +++ b/gdb/testsuite/gdb.go/package.exp
> @@ -37,7 +37,6 @@ if  { [gdb_compile "${srcdir}/${subdir}/${testfile}1.go ${binfile}2.o" "${binfil
>  clean_restart $testfile
>  
>  if { [go_runto_main] < 0 } {
> -    untested methods
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.go/strings.exp b/gdb/testsuite/gdb.go/strings.exp
> index 4af07881a5c..6be2df70a08 100644
> --- a/gdb/testsuite/gdb.go/strings.exp
> +++ b/gdb/testsuite/gdb.go/strings.exp
> @@ -27,7 +27,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]
>  }
>  
>  if { [go_runto_main] < 0 } {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.go/types.exp b/gdb/testsuite/gdb.go/types.exp
> index 19e04e38153..632ce9bfcbf 100644
> --- a/gdb/testsuite/gdb.go/types.exp
> +++ b/gdb/testsuite/gdb.go/types.exp
> @@ -29,7 +29,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]
>  }
>  
>  if { [go_runto_main] < 0 } {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.go/unsafe.exp b/gdb/testsuite/gdb.go/unsafe.exp
> index a2bb9071486..78d76747402 100644
> --- a/gdb/testsuite/gdb.go/unsafe.exp
> +++ b/gdb/testsuite/gdb.go/unsafe.exp
> @@ -29,7 +29,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}]
>  }
>  
>  if { [go_runto_main] < 0 } {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.guile/scm-breakpoint.exp b/gdb/testsuite/gdb.guile/scm-breakpoint.exp
> index c5f19e154d7..b3316e454fe 100644
> --- a/gdb/testsuite/gdb.guile/scm-breakpoint.exp
> +++ b/gdb/testsuite/gdb.guile/scm-breakpoint.exp
> @@ -492,7 +492,6 @@ proc_with_prefix test_bkpt_temporary { } {
>      clean_restart ${testfile}
>  
>      if ![gdb_guile_runto_main] {
> -	fail "cannot run to main."
>  	return 0
>      }
>      delete_breakpoints
> diff --git a/gdb/testsuite/gdb.guile/scm-cmd.exp b/gdb/testsuite/gdb.guile/scm-cmd.exp
> index c2598bbf0ed..661c2627139 100644
> --- a/gdb/testsuite/gdb.guile/scm-cmd.exp
> +++ b/gdb/testsuite/gdb.guile/scm-cmd.exp
> @@ -28,7 +28,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
>  if { [skip_guile_tests] } { continue }
>  
>  if ![gdb_guile_runto_main] {
> -    fail "can't run to main"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.guile/scm-frame-inline.exp b/gdb/testsuite/gdb.guile/scm-frame-inline.exp
> index 0ffd1d6f482..73fdc236329 100644
> --- a/gdb/testsuite/gdb.guile/scm-frame-inline.exp
> +++ b/gdb/testsuite/gdb.guile/scm-frame-inline.exp
> @@ -25,7 +25,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
>  if { [skip_guile_tests] } { continue }
>  
>  if ![runto_main] {
> -    fail "can't run to main"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.guile/scm-lazy-string.exp b/gdb/testsuite/gdb.guile/scm-lazy-string.exp
> index 661b154abab..37cda58aca0 100644
> --- a/gdb/testsuite/gdb.guile/scm-lazy-string.exp
> +++ b/gdb/testsuite/gdb.guile/scm-lazy-string.exp
> @@ -33,7 +33,6 @@ if { [skip_guile_tests] } { continue }
>  # The following tests require execution.
>  
>  if ![gdb_guile_runto_main] {
> -    fail "can't run to main"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.guile/scm-objfile.exp b/gdb/testsuite/gdb.guile/scm-objfile.exp
> index df67c14408d..6707005052b 100644
> --- a/gdb/testsuite/gdb.guile/scm-objfile.exp
> +++ b/gdb/testsuite/gdb.guile/scm-objfile.exp
> @@ -28,7 +28,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
>  if { [skip_guile_tests] } { continue }
>  
>  if ![gdb_guile_runto_main] {
> -    fail "can't run to main"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.guile/scm-value.exp b/gdb/testsuite/gdb.guile/scm-value.exp
> index bd5b14999d8..5fd2bc4eed1 100644
> --- a/gdb/testsuite/gdb.guile/scm-value.exp
> +++ b/gdb/testsuite/gdb.guile/scm-value.exp
> @@ -310,7 +310,6 @@ proc test_subscript_regression {exefile lang} {
>      clean_restart ${exefile}
>  
>      if ![gdb_guile_runto_main ] {
> -	fail "can't run to main"
>  	return
>      }
>  
> @@ -440,7 +439,6 @@ test_value_hash
>  # The following tests require execution.
>  
>  if ![gdb_guile_runto_main] {
> -    fail "can't run to main"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.linespec/keywords.exp b/gdb/testsuite/gdb.linespec/keywords.exp
> index b0ed18b42e0..88192690fc4 100644
> --- a/gdb/testsuite/gdb.linespec/keywords.exp
> +++ b/gdb/testsuite/gdb.linespec/keywords.exp
> @@ -23,7 +23,6 @@ if {[prepare_for_testing "failed to prepare" $exefile $srcfile {debug}]} {
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.linespec/ls-errs.exp b/gdb/testsuite/gdb.linespec/ls-errs.exp
> index 99b0f393bb8..10c5d32122c 100644
> --- a/gdb/testsuite/gdb.linespec/ls-errs.exp
> +++ b/gdb/testsuite/gdb.linespec/ls-errs.exp
> @@ -48,7 +48,6 @@ proc do_test {lang} {
>      gdb_test_no_output "set max-completions unlimited"
>  
>      if {![runto_main]} {
> -	fail "can't run to main"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.linespec/thread.exp b/gdb/testsuite/gdb.linespec/thread.exp
> index 578a4da77cc..ab631a01647 100644
> --- a/gdb/testsuite/gdb.linespec/thread.exp
> +++ b/gdb/testsuite/gdb.linespec/thread.exp
> @@ -24,7 +24,6 @@ if {[prepare_for_testing "failed to prepare" $exefile $srcfile {debug}]} {
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp b/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
> index 095f436a03b..d01f970f230 100644
> --- a/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
> +++ b/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
> @@ -26,7 +26,6 @@ if [build_executable $testfile.exp $testfile $srcfile $opts] {
>  mi_clean_restart $binfile
>  
>  if {[mi_runto_main] < 0} {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
> index 2f1a4884a21..df09da06b5d 100644
> --- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
> +++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
> @@ -402,7 +402,6 @@ proc_with_prefix test_setup { mode } {
>      mi_gdb_load $binfile
>  
>      if { [mi_runto_main] < 0 } {
> -	fail "can't run to main"
>  	return
>      }
>  
> diff --git a/gdb/testsuite/gdb.modula2/max-depth.exp b/gdb/testsuite/gdb.modula2/max-depth.exp
> index 631bc1f085c..be8f8a8f629 100644
> --- a/gdb/testsuite/gdb.modula2/max-depth.exp
> +++ b/gdb/testsuite/gdb.modula2/max-depth.exp
> @@ -22,7 +22,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug quiet}]}
>  }
>  
>  if { ![runto_main] } then {
> -    fail "can't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
> index c2b9bcead10..584916be6ea 100644
> --- a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
> +++ b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
> @@ -50,7 +50,6 @@ clean_restart ${exec1}
>  # Start the program running, and stop at main.
>  #
>  if ![runto_main] then {
> -    perror "Couldn't run ${binfile1}"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.multi/dummy-frame-restore.exp b/gdb/testsuite/gdb.multi/dummy-frame-restore.exp
> index 617862fbfee..1ddc39d6c08 100644
> --- a/gdb/testsuite/gdb.multi/dummy-frame-restore.exp
> +++ b/gdb/testsuite/gdb.multi/dummy-frame-restore.exp
> @@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} {
>  # Inferior 1 stops at f1.
>  
>  if ![runto f1] then {
> -    fail "can't run to f1"
>      return 0
>  }
>  
> @@ -42,7 +41,6 @@ delete_breakpoints
>  # Inferior 2 stops at f2.
>  
>  if ![runto f2] then {
> -    fail "can't run to f2"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.multi/multi-arch-exec.exp b/gdb/testsuite/gdb.multi/multi-arch-exec.exp
> index 4f36ec82dde..e9a8abd6748 100644
> --- a/gdb/testsuite/gdb.multi/multi-arch-exec.exp
> +++ b/gdb/testsuite/gdb.multi/multi-arch-exec.exp
> @@ -150,7 +150,6 @@ proc do_test { first_arch mode selected_thread } {
>  
>  	clean_restart ${from_exec}
>  	if ![runto all_started] then {
> -	    fail "couldn't run to all_started"
>  	    return -1
>  	}
>  
> diff --git a/gdb/testsuite/gdb.multi/multi-arch.exp b/gdb/testsuite/gdb.multi/multi-arch.exp
> index c1c77917e45..3340e884df4 100644
> --- a/gdb/testsuite/gdb.multi/multi-arch.exp
> +++ b/gdb/testsuite/gdb.multi/multi-arch.exp
> @@ -79,7 +79,7 @@ if { [build_executable "failed to prepare" ${exec2} "${srcfile2}" \
>  
>  clean_restart ${exec1}
>  if ![runto_main] then {
> -    fail "starting inferior 1"
> +    return
>  }
>  
>  # Add and start inferior 2
> @@ -89,7 +89,7 @@ gdb_test "inferior 2" "Switching to inferior 2.*" "switch to inferior 2"
>  gdb_load ${binfile2}
>  
>  if ![runto_main] then {
> -    fail "starting inferior 2"
> +    return
>  }
>  
>  # Check we do have two inferiors loaded.
> diff --git a/gdb/testsuite/gdb.multi/multi-re-run.exp b/gdb/testsuite/gdb.multi/multi-re-run.exp
> index 6eda6fafb5b..4d51c1f87a1 100644
> --- a/gdb/testsuite/gdb.multi/multi-re-run.exp
> +++ b/gdb/testsuite/gdb.multi/multi-re-run.exp
> @@ -80,8 +80,7 @@ proc test_re_run {re_run_inf} {
>  
>      # Run the steady inferior to a breakpoint, and let it stay stopped
>      # there.
> -    if ![runto all_started message] then {
> -	untested "setup failed"
> +    if ![runto all_started] then {
>  	return 0
>      }
>  
> @@ -95,7 +94,7 @@ proc test_re_run {re_run_inf} {
>      foreach_with_prefix iter {1 2} {
>  	delete_breakpoints
>  
> -	if ![runto all_started message] {
> +	if ![runto all_started] {
>  	    return 0
>  	}
>  
> diff --git a/gdb/testsuite/gdb.multi/multi-term-settings.exp b/gdb/testsuite/gdb.multi/multi-term-settings.exp
> index dcc6f2ece0f..2bf20142fa6 100644
> --- a/gdb/testsuite/gdb.multi/multi-term-settings.exp
> +++ b/gdb/testsuite/gdb.multi/multi-term-settings.exp
> @@ -57,7 +57,6 @@ proc create_inferior {which_inf inf_how} {
>      # Run to main and delete breakpoints.
>      proc my_runto_main {} {
>  	if ![runto_main] {
> -	    fail "run to main"
>  	    return 0
>  	} else {
>  	    # Delete breakpoints otherwise GDB would try to step over
> diff --git a/gdb/testsuite/gdb.multi/remove-inferiors.exp b/gdb/testsuite/gdb.multi/remove-inferiors.exp
> index bd56f3ca7cb..c0bd5bd1599 100644
> --- a/gdb/testsuite/gdb.multi/remove-inferiors.exp
> +++ b/gdb/testsuite/gdb.multi/remove-inferiors.exp
> @@ -54,7 +54,6 @@ proc test_remove_inferiors { } {
>  	"load binary"
>  
>      if {![runto_main]} {
> -	fail "couldn't run to main."
>  	return
>      }
>  
> diff --git a/gdb/testsuite/gdb.multi/stop-all-on-exit.exp b/gdb/testsuite/gdb.multi/stop-all-on-exit.exp
> index 5d164381a4f..4a89ec83ffe 100644
> --- a/gdb/testsuite/gdb.multi/stop-all-on-exit.exp
> +++ b/gdb/testsuite/gdb.multi/stop-all-on-exit.exp
> @@ -25,7 +25,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
>  }
>  
>  if {![runto_main]} {
> -    fail "starting inferior 1"
>      return -1
>  }
>  
> @@ -42,7 +41,6 @@ gdb_test "add-inferior -exec $binfile" "Added inferior 2.*" \
>      "add the second inferior"
>  gdb_test "inferior 2" ".*Switching to inferior 2.*"
>  if {![runto_main]} {
> -    fail "starting inferior 2"
>      return -1
>  }
>  gdb_test "print duration=10" "= 10"
> diff --git a/gdb/testsuite/gdb.multi/tids-gid-reset.exp b/gdb/testsuite/gdb.multi/tids-gid-reset.exp
> index e1755f9a689..e79da426447 100644
> --- a/gdb/testsuite/gdb.multi/tids-gid-reset.exp
> +++ b/gdb/testsuite/gdb.multi/tids-gid-reset.exp
> @@ -67,7 +67,6 @@ with_test_prefix "multi-inferior" {
>      gdb_load ${binfile}
>  
>      if ![runto_main] then {
> -	fail "starting inferior 2"
>  	return
>      }
>  
> diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp b/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp
> index 1dff0832255..24ad1f8d345 100644
> --- a/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp
> +++ b/gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp
> @@ -35,7 +35,6 @@ proc do_test {dispose} {
>      gdb_test_no_output "set detach-on-fork off"
>  
>      if ![runto "child_function"] {
> -	fail "can't run to child_function"
>  	return
>      }
>  
> diff --git a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
> index 8ad7257c9cd..b63cd9cc4e1 100644
> --- a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
> +++ b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
> @@ -32,7 +32,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
>  }
>  
>  if { ![runto start_sequence] } then {
> -   fail "run to start_sequence"
>     return
>  }
>  
> diff --git a/gdb/testsuite/gdb.opt/inline-break.exp b/gdb/testsuite/gdb.opt/inline-break.exp
> index c96966ee275..9804b63ae36 100644
> --- a/gdb/testsuite/gdb.opt/inline-break.exp
> +++ b/gdb/testsuite/gdb.opt/inline-break.exp
> @@ -191,7 +191,6 @@ foreach_with_prefix cmd [list "break" "tbreak"] {
>      # Start with a clean state.
>      delete_breakpoints
>      if {![runto_main]} {
> -	untested "could not run to main"
>  	return -1
>      }
>  
> @@ -247,7 +246,6 @@ foreach_with_prefix func {
>      clean_restart $binfile
>  
>      if {![runto_main]} {
> -	untested "could not run to main"
>  	continue
>      }
>  
> @@ -265,7 +263,6 @@ with_test_prefix "line number" {
>      clean_restart $binfile
>  
>      if {![runto_main]} {
> -	untested "could not run to main"
>  	continue
>      }
>  
> @@ -290,7 +287,6 @@ with_test_prefix "address" {
>      clean_restart $binfile
>  
>      if {![runto_main]} {
> -	untested "could not run to main"
>  	continue
>      }
>  
> @@ -309,7 +305,6 @@ with_test_prefix "check alignment" {
>      clean_restart $binfile
>  
>      if {![runto_main]} {
> -	untested "could not run to main"
>  	continue
>      }
>  
> diff --git a/gdb/testsuite/gdb.perf/backtrace.exp b/gdb/testsuite/gdb.perf/backtrace.exp
> index ced653c4b84..30156189183 100644
> --- a/gdb/testsuite/gdb.perf/backtrace.exp
> +++ b/gdb/testsuite/gdb.perf/backtrace.exp
> @@ -52,7 +52,6 @@ PerfTest::assemble {
>      clean_restart $binfile
>  
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> diff --git a/gdb/testsuite/gdb.perf/single-step.exp b/gdb/testsuite/gdb.perf/single-step.exp
> index 7a5d068f153..a5f33c0e65d 100644
> --- a/gdb/testsuite/gdb.perf/single-step.exp
> +++ b/gdb/testsuite/gdb.perf/single-step.exp
> @@ -44,7 +44,6 @@ PerfTest::assemble {
>      clean_restart $binfile
>  
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>      return 0
> diff --git a/gdb/testsuite/gdb.perf/skip-command.exp b/gdb/testsuite/gdb.perf/skip-command.exp
> index d9f31a7e8f5..e57f0a21954 100644
> --- a/gdb/testsuite/gdb.perf/skip-command.exp
> +++ b/gdb/testsuite/gdb.perf/skip-command.exp
> @@ -94,7 +94,6 @@ proc run_skip_bench { kind text } {
>      global SKIP_STEP_COUNT SKIP_DIRECTIVE_COUNT
>  
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> diff --git a/gdb/testsuite/gdb.perf/skip-prologue.exp b/gdb/testsuite/gdb.perf/skip-prologue.exp
> index 7caff667a0d..d4b0ed770e4 100644
> --- a/gdb/testsuite/gdb.perf/skip-prologue.exp
> +++ b/gdb/testsuite/gdb.perf/skip-prologue.exp
> @@ -56,7 +56,6 @@ PerfTest::assemble {
>      clean_restart $binfile
>  
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>      return 0
> diff --git a/gdb/testsuite/gdb.perf/solib.exp b/gdb/testsuite/gdb.perf/solib.exp
> index e0cd341bf31..512fd0d10fb 100644
> --- a/gdb/testsuite/gdb.perf/solib.exp
> +++ b/gdb/testsuite/gdb.perf/solib.exp
> @@ -77,7 +77,6 @@ PerfTest::assemble {
>      clean_restart $binfile
>  
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>      return 0
> diff --git a/gdb/testsuite/gdb.perf/template-breakpoints.exp b/gdb/testsuite/gdb.perf/template-breakpoints.exp
> index 96c1209e96c..0fa7fd8ecf0 100644
> --- a/gdb/testsuite/gdb.perf/template-breakpoints.exp
> +++ b/gdb/testsuite/gdb.perf/template-breakpoints.exp
> @@ -52,7 +52,6 @@ PerfTest::assemble {
>  	clean_restart $binfile
>  
>  	if ![runto_main] {
> -		fail "can't run to main"
>  		return -1
>  	}
>  
> diff --git a/gdb/testsuite/gdb.python/lib-types.exp b/gdb/testsuite/gdb.python/lib-types.exp
> index fbc74990f59..f928b223aad 100644
> --- a/gdb/testsuite/gdb.python/lib-types.exp
> +++ b/gdb/testsuite/gdb.python/lib-types.exp
> @@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
>  if { [skip_python_tests] } { continue }
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-as-string.exp b/gdb/testsuite/gdb.python/py-as-string.exp
> index 92db25e2581..e327d6997eb 100644
> --- a/gdb/testsuite/gdb.python/py-as-string.exp
> +++ b/gdb/testsuite/gdb.python/py-as-string.exp
> @@ -25,7 +25,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
>  }
>  
>  if ![runto_main] {
> -    fail "couldn't run to main."
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event.exp b/gdb/testsuite/gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event.exp
> index 96ae41b0752..0180fea55cc 100644
> --- a/gdb/testsuite/gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event.exp
> +++ b/gdb/testsuite/gdb.python/py-autoloaded-pretty-printers-in-newobjfile-event.exp
> @@ -66,7 +66,6 @@ gdb_load ${binfile}
>  gdb_test_no_output "set print pretty on"
>  
>  if { ![runto_main] } {
> -    fail "failed to run to main"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-bad-printers.exp b/gdb/testsuite/gdb.python/py-bad-printers.exp
> index 708f0e0c5c9..dde64c08baf 100644
> --- a/gdb/testsuite/gdb.python/py-bad-printers.exp
> +++ b/gdb/testsuite/gdb.python/py-bad-printers.exp
> @@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
>  if { [skip_python_tests] } { continue }
>  
>  if ![runto_main ] then {
> -    fail "can't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp
> index fdb7c097e20..8c4c9a522a2 100644
> --- a/gdb/testsuite/gdb.python/py-block.exp
> +++ b/gdb/testsuite/gdb.python/py-block.exp
> @@ -28,7 +28,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.python/py-breakpoint-create-fail.exp b/gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp
> index 4d0e9c58200..7eefaa8dd52 100644
> --- a/gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp
> +++ b/gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp
> @@ -29,8 +29,7 @@ if { [skip_python_tests] } { continue }
>  
>  clean_restart "${testfile}"
>  if ![runto_main] {
> -    perror "could not run to main"
> -    continue
> +    return
>  }
>  
>  # The following will create a breakpoint Python wrapper whose construction will
> diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp
> index bd99452dd5f..bac9b6ed292 100644
> --- a/gdb/testsuite/gdb.python/py-breakpoint.exp
> +++ b/gdb/testsuite/gdb.python/py-breakpoint.exp
> @@ -39,7 +39,6 @@ proc_with_prefix test_bkpt_basic { } {
>      gdb_test "python print (gdb.breakpoints())" "\\(\\)"
>  
>      if ![runto_main] then {
> -	fail "cannot run to main."
>  	return 0
>      }
>  
> @@ -122,7 +121,6 @@ proc_with_prefix test_bkpt_deletion { } {
>      clean_restart ${testfile}
>  
>      if ![runto_main] then {
> -	fail "cannot run to main."
>  	return 0
>      }
>  
> @@ -158,7 +156,6 @@ proc_with_prefix test_bkpt_cond_and_cmds { } {
>      clean_restart ${testfile}
>  
>      if ![runto_main] then {
> -	fail "cannot run to main."
>  	return 0
>      }
>  
> @@ -216,7 +213,6 @@ proc_with_prefix test_bkpt_invisible { } {
>      clean_restart ${testfile}
>  
>      if ![runto_main] then {
> -	fail "cannot run to main."
>  	return 0
>      }
>  
> @@ -262,7 +258,6 @@ proc_with_prefix test_hardware_breakpoints { } {
>      clean_restart ${testfile}
>  
>      if ![runto_main] then {
> -	fail "cannot run to main."
>  	return 0
>      }
>  
> @@ -290,7 +285,6 @@ proc_with_prefix test_watchpoints { } {
>      }
>  
>      if ![runto_main] then {
> -	fail "cannot run to main."
>  	return 0
>      }
>  
> @@ -313,7 +307,6 @@ proc_with_prefix test_bkpt_internal { } {
>  	gdb_test_no_output "set can-use-hw-watchpoints 0" ""
>      }
>      if ![runto_main] then {
> -	fail "cannot run to main."
>  	return 0
>      }
>      delete_breakpoints
> @@ -341,7 +334,6 @@ proc_with_prefix test_bkpt_eval_funcs { } {
>  	gdb_test_no_output "set can-use-hw-watchpoints 0" ""
>      }
>      if ![runto_main] then {
> -	fail "cannot run to main."
>  	return 0
>      }
>      delete_breakpoints
> @@ -455,7 +447,6 @@ proc_with_prefix test_bkpt_temporary { } {
>      clean_restart ${testfile}
>  
>      if ![runto_main] then {
> -	fail "cannot run to main."
>  	return 0
>      }
>      delete_breakpoints
> @@ -574,7 +565,6 @@ proc_with_prefix test_bkpt_explicit_loc {} {
>      clean_restart ${testfile}
>  
>      if ![runto_main] then {
> -	fail "cannot run to main."
>  	return 0
>      }
>  
> @@ -660,7 +650,6 @@ proc_with_prefix test_bkpt_qualified {} {
>      set two_location_re "Breakpoint $decimal at $hex:.*2 locations."
>  
>      if ![runto_main] then {
> -	fail "cannot run to main."
>  	return 0
>      }
>  
> @@ -730,7 +719,6 @@ proc_with_prefix test_bkpt_probe {} {
>      }
>  
>      if ![runto_main] then {
> -	fail "cannot run to main."
>  	return 0
>      }
>  
> @@ -748,7 +736,6 @@ proc_with_prefix test_catchpoints {} {
>      clean_restart ${testfile}
>  
>      if ![runto_main] then {
> -	fail "cannot run to main."
>  	return 0
>      }
>  
> @@ -808,7 +795,6 @@ proc_with_prefix test_bkpt_auto_disable { } {
>      clean_restart ${testfile}
>  
>      if ![runto_main] then {
> -	fail "cannot run to main."
>  	return 0
>      }
>      delete_breakpoints
> diff --git a/gdb/testsuite/gdb.python/py-cmd.exp b/gdb/testsuite/gdb.python/py-cmd.exp
> index a1c2a9b3377..43a96a75419 100644
> --- a/gdb/testsuite/gdb.python/py-cmd.exp
> +++ b/gdb/testsuite/gdb.python/py-cmd.exp
> @@ -28,7 +28,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
>  if { [skip_python_tests] } { continue }
>  
>  if ![runto_main] then {
> -    fail "cannot run to main."
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
> index 456d14b9633..5ecd9df954d 100644
> --- a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
> +++ b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
> @@ -54,7 +54,6 @@ clean_restart ${testfile}
>  gdb_load_shlib ${lib_sl}
>  
>  if ![runto_main] then {
> -    fail "cannot run to main."
>      return 0
>  }
>  
> @@ -105,7 +104,6 @@ gdb_test "source $python_file" "Python script imported.*" \
>  set cond_line [gdb_get_line_number "Condition Break."]
>  
>  if ![runto_main] then {
> -    fail "cannot run to main."
>      return 0
>  }
>  
> @@ -131,8 +129,7 @@ gdb_test "source $python_file" "Python script imported.*" \
>           "import python scripts, 3"
>  
>  if ![runto call_longjmp_1] then {
> -    perror "couldn't run to breakpoint call_longjmp"
> -    continue
> +    return
>  }
>  
>  gdb_test "python finishbp = SimpleFinishBreakpoint(gdb.newest_frame())" \
> @@ -158,7 +155,6 @@ gdb_test "source $python_file" "Python script imported.*" \
>  
>  
>  if ![runto_main] then {
> -    fail "cannot run to main."
>      return 0
>  }
>           
> @@ -184,7 +180,6 @@ gdb_test "source $python_file" "Python script imported.*" \
>           "import python scripts, 5"
>  
>  if ![runto_main] then {
> -    fail "cannot run to main."
>      return 0
>  }
>  
> @@ -212,7 +207,6 @@ gdb_test "source $python_file" "Python script imported.*" \
>           "import python scripts, 6"
>  
>  if ![runto_main] then {
> -    fail "cannot run to main."
>      return 0
>  }
>  
> @@ -239,7 +233,6 @@ gdb_test "print increase(&i)" \
>  #
>  
>  if ![runto "test_exec_exit"] then {
> -    fail "cannot run to test_exec_exit."
>      return 0
>  }
>  
> @@ -252,7 +245,6 @@ gdb_test "continue" "SimpleFinishBreakpoint out of scope.*" "catch out of scope
>  #
>  
>  if ![runto "test_exec_exit"] then {
> -    fail "cannot run to test_exec_exit."
>      return 0
>  }     
>  
> diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
> index 58e086ad3b4..1d4974b3c9b 100644
> --- a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
> +++ b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
> @@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
>  if { [skip_python_tests] } { continue }
>  
>  if ![runto_main] then {
> -    fail "cannot run to main."
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-frame-inline.exp b/gdb/testsuite/gdb.python/py-frame-inline.exp
> index 211c930ce50..59789f9b6d4 100644
> --- a/gdb/testsuite/gdb.python/py-frame-inline.exp
> +++ b/gdb/testsuite/gdb.python/py-frame-inline.exp
> @@ -25,7 +25,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
>  if { [skip_python_tests] } { continue }
>  
>  if ![runto_main] then {
> -    fail "can't run to function f"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp
> index 05c7fb00dfd..4c6ede8da33 100644
> --- a/gdb/testsuite/gdb.python/py-frame.exp
> +++ b/gdb/testsuite/gdb.python/py-frame.exp
> @@ -30,7 +30,6 @@ if { [skip_python_tests] } { continue }
>  # The following tests require execution.
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-inferior.exp b/gdb/testsuite/gdb.python/py-inferior.exp
> index 2252215b721..894b90a85fc 100644
> --- a/gdb/testsuite/gdb.python/py-inferior.exp
> +++ b/gdb/testsuite/gdb.python/py-inferior.exp
> @@ -38,7 +38,6 @@ switch [get_endianness] {
>  # The following tests require execution.
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-infthread.exp b/gdb/testsuite/gdb.python/py-infthread.exp
> index e68986bdfa7..5bbf7ea7f30 100644
> --- a/gdb/testsuite/gdb.python/py-infthread.exp
> +++ b/gdb/testsuite/gdb.python/py-infthread.exp
> @@ -40,7 +40,6 @@ gdb_test_multiline "install new_thread event handler" \
>  # The following tests require execution.
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-objfile.exp b/gdb/testsuite/gdb.python/py-objfile.exp
> index 89a98a6ed5b..bf569f4df68 100644
> --- a/gdb/testsuite/gdb.python/py-objfile.exp
> +++ b/gdb/testsuite/gdb.python/py-objfile.exp
> @@ -28,7 +28,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
>  }
>  
> @@ -121,7 +120,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile}2 ${srcfile} {nodebug l
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-pending-frame-level.exp b/gdb/testsuite/gdb.python/py-pending-frame-level.exp
> index 1aadcaeacae..7fab31d83e1 100644
> --- a/gdb/testsuite/gdb.python/py-pending-frame-level.exp
> +++ b/gdb/testsuite/gdb.python/py-pending-frame-level.exp
> @@ -27,7 +27,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.python/py-pp-maint.exp b/gdb/testsuite/gdb.python/py-pp-maint.exp
> index 4bda85a8aed..b0b42487856 100644
> --- a/gdb/testsuite/gdb.python/py-pp-maint.exp
> +++ b/gdb/testsuite/gdb.python/py-pp-maint.exp
> @@ -33,7 +33,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
>  if { [skip_python_tests] } { continue }
>  
>  if ![runto_main ] then {
> -    fail "can't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-pp-registration.exp b/gdb/testsuite/gdb.python/py-pp-registration.exp
> index f35640a88b3..e08cb60db31 100644
> --- a/gdb/testsuite/gdb.python/py-pp-registration.exp
> +++ b/gdb/testsuite/gdb.python/py-pp-registration.exp
> @@ -31,7 +31,6 @@ set remote_python_file [gdb_remote_download host \
>  			    ${srcdir}/${subdir}/${testfile}.py]
>  
>  if ![runto_main ] {
> -    fail "can't run to main"
>      return -1
>  }
>  
> @@ -42,7 +41,7 @@ proc prepare_test { } {
>      clean_restart ${testfile}
>  
>      set run_to_here [gdb_get_line_number {break to inspect} ${testfile}.c ]
> -    if ![runto ${testfile}.c:$run_to_here message] {
> +    if ![runto ${testfile}.c:$run_to_here] {
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.python/py-progspace.exp b/gdb/testsuite/gdb.python/py-progspace.exp
> index 39e3324a11f..0a945821db8 100644
> --- a/gdb/testsuite/gdb.python/py-progspace.exp
> +++ b/gdb/testsuite/gdb.python/py-progspace.exp
> @@ -53,7 +53,6 @@ gdb_test "python print (progspace.random_attribute)" "42" \
>      "Verify set of random attribute in progspace"
>  
>  if {![runto_main]} {
> -    fail "can't run to main"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-rbreak.exp b/gdb/testsuite/gdb.python/py-rbreak.exp
> index c045290729c..bd93bd814be 100644
> --- a/gdb/testsuite/gdb.python/py-rbreak.exp
> +++ b/gdb/testsuite/gdb.python/py-rbreak.exp
> @@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" ${testfile} [list $srcfile $srcfile
>  if { [skip_python_tests] } { continue }
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-record-btrace-threads.exp b/gdb/testsuite/gdb.python/py-record-btrace-threads.exp
> index 3df8e7480ff..be3b501de08 100644
> --- a/gdb/testsuite/gdb.python/py-record-btrace-threads.exp
> +++ b/gdb/testsuite/gdb.python/py-record-btrace-threads.exp
> @@ -39,7 +39,6 @@ if { [skip_python_tests] } {
>  }
>  
>  if { ![runto_main] } {
> -    untested "failed to run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-record-btrace.exp b/gdb/testsuite/gdb.python/py-record-btrace.exp
> index bf0fa18720e..acb3651b77a 100644
> --- a/gdb/testsuite/gdb.python/py-record-btrace.exp
> +++ b/gdb/testsuite/gdb.python/py-record-btrace.exp
> @@ -36,7 +36,6 @@ if { [skip_python_tests] } {
>  }
>  
>  if ![runto_main ] then {
> -    fail "can't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-record-full.exp b/gdb/testsuite/gdb.python/py-record-full.exp
> index 34c4cadf40c..0b86f6b4318 100644
> --- a/gdb/testsuite/gdb.python/py-record-full.exp
> +++ b/gdb/testsuite/gdb.python/py-record-full.exp
> @@ -36,7 +36,6 @@ if { [skip_python_tests] } {
>  }
>  
>  if ![runto_main ] then {
> -    fail "can't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-recurse-unwind.exp b/gdb/testsuite/gdb.python/py-recurse-unwind.exp
> index 0466131db7d..4f750d213e8 100644
> --- a/gdb/testsuite/gdb.python/py-recurse-unwind.exp
> +++ b/gdb/testsuite/gdb.python/py-recurse-unwind.exp
> @@ -41,7 +41,6 @@ gdb_test "source ${pyfile}" "Python script imported" \
>  # The following tests require execution.
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-rvalue-ref-value-cc.exp b/gdb/testsuite/gdb.python/py-rvalue-ref-value-cc.exp
> index f7e80bfeada..e336c225e35 100644
> --- a/gdb/testsuite/gdb.python/py-rvalue-ref-value-cc.exp
> +++ b/gdb/testsuite/gdb.python/py-rvalue-ref-value-cc.exp
> @@ -30,7 +30,6 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile \
>  if {[skip_python_tests]} { continue }
>  
>  if {![runto_main]} {
> -    untested "couldn't run to main"
>     return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-shared.exp b/gdb/testsuite/gdb.python/py-shared.exp
> index 5ce786f8998..891f21b64ea 100644
> --- a/gdb/testsuite/gdb.python/py-shared.exp
> +++ b/gdb/testsuite/gdb.python/py-shared.exp
> @@ -49,7 +49,6 @@ if { [skip_python_tests] } { continue }
>  # The following tests require execution.
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-symbol.exp b/gdb/testsuite/gdb.python/py-symbol.exp
> index 98acdbe3621..cbc482c4ed9 100644
> --- a/gdb/testsuite/gdb.python/py-symbol.exp
> +++ b/gdb/testsuite/gdb.python/py-symbol.exp
> @@ -105,7 +105,6 @@ gdb_test "python print (gdb.lookup_static_symbol ('qq') is None)" \
>      "True" "lookup_static_symbol for global var"
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> @@ -214,7 +213,6 @@ gdb_test "python print (gdb.lookup_static_symbol ('(anonymous namespace)::anon')
>      "10" "print value of anon"
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> @@ -243,7 +241,6 @@ gdb_test "python print (cplusfunc.addr_class == gdb.SYMBOL_LOC_BLOCK)" "True" "t
>  # Start with a fresh gdb.
>  clean_restart ${binfile}
>  if ![runto_main] then {
> -    fail "cannot run to main."
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-symtab.exp b/gdb/testsuite/gdb.python/py-symtab.exp
> index 3236b63eecd..695bbe8cfe7 100644
> --- a/gdb/testsuite/gdb.python/py-symtab.exp
> +++ b/gdb/testsuite/gdb.python/py-symtab.exp
> @@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
>  if { [skip_python_tests] } { continue }
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-unwind-inline.exp b/gdb/testsuite/gdb.python/py-unwind-inline.exp
> index 36d918a5bd4..5619895abed 100644
> --- a/gdb/testsuite/gdb.python/py-unwind-inline.exp
> +++ b/gdb/testsuite/gdb.python/py-unwind-inline.exp
> @@ -30,7 +30,6 @@ if { [skip_python_tests] } { continue }
>  
>  # The following tests require execution.
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-unwind-maint.exp b/gdb/testsuite/gdb.python/py-unwind-maint.exp
> index 8e22cbf7d43..6604fd36242 100644
> --- a/gdb/testsuite/gdb.python/py-unwind-maint.exp
> +++ b/gdb/testsuite/gdb.python/py-unwind-maint.exp
> @@ -30,7 +30,6 @@ if { [skip_python_tests] } { continue }
>  set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py]
>  
>  if ![runto_main ] then {
> -    fail "can't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-unwind-user-regs.exp b/gdb/testsuite/gdb.python/py-unwind-user-regs.exp
> index 7ae3a5bb19f..773bc70e482 100644
> --- a/gdb/testsuite/gdb.python/py-unwind-user-regs.exp
> +++ b/gdb/testsuite/gdb.python/py-unwind-user-regs.exp
> @@ -48,7 +48,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.python/py-unwind.exp b/gdb/testsuite/gdb.python/py-unwind.exp
> index c4364a97979..df4b8400536 100644
> --- a/gdb/testsuite/gdb.python/py-unwind.exp
> +++ b/gdb/testsuite/gdb.python/py-unwind.exp
> @@ -38,7 +38,6 @@ if { ![istarget x86_64-*-* ] || ![is_lp64_target] } { continue }
>  # The following tests require execution.
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
> index d9f1a76a388..f4b7c23fb7d 100644
> --- a/gdb/testsuite/gdb.python/py-value.exp
> +++ b/gdb/testsuite/gdb.python/py-value.exp
> @@ -624,7 +624,6 @@ test_add_to_history
>  # The following tests require execution.
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
> index bc670ce25c1..a81cd5c850e 100644
> --- a/gdb/testsuite/gdb.python/python.exp
> +++ b/gdb/testsuite/gdb.python/python.exp
> @@ -218,7 +218,6 @@ clean_restart ${testfile}
>  # The following tests require execution.
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> @@ -433,7 +432,6 @@ clean_restart ${testfile}
>  # The following tests require execution.
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> @@ -489,7 +487,6 @@ clean_restart ${testfile}
>  # The following tests require execution.
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
> index 5ebc8b5d11b..27c2a77f210 100644
> --- a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
> +++ b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
> @@ -30,7 +30,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.reverse/insn-reverse.exp b/gdb/testsuite/gdb.reverse/insn-reverse.exp
> index baebaaed1f7..47f0166a762 100644
> --- a/gdb/testsuite/gdb.reverse/insn-reverse.exp
> +++ b/gdb/testsuite/gdb.reverse/insn-reverse.exp
> @@ -24,7 +24,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
>      return -1
>  }
>  if { ![runto_main] } then {
> -    fail "run to main"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp b/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
> index d4802eb123c..d0d6454293f 100644
> --- a/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
> +++ b/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp
> @@ -34,7 +34,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.reverse/step-indirect-call-thunk.exp b/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp
> index dad43d78e6b..7537a01eeb8 100644
> --- a/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp
> +++ b/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp
> @@ -27,7 +27,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.server/extended-remote-restart.exp b/gdb/testsuite/gdb.server/extended-remote-restart.exp
> index 9480a0f5a6f..b9604592187 100644
> --- a/gdb/testsuite/gdb.server/extended-remote-restart.exp
> +++ b/gdb/testsuite/gdb.server/extended-remote-restart.exp
> @@ -61,7 +61,6 @@ proc test_reload { do_kill_p follow_child_p } {
>      clean_restart ${binfile}
>  
>      if ![runto_main] then {
> -	fail "can't run to main"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.stabs/gdb11479.exp b/gdb/testsuite/gdb.stabs/gdb11479.exp
> index e14999f3448..75caf1cc2e3 100644
> --- a/gdb/testsuite/gdb.stabs/gdb11479.exp
> +++ b/gdb/testsuite/gdb.stabs/gdb11479.exp
> @@ -22,7 +22,6 @@ set testfile "gdb11479"
>  
>  proc do_test {version} {
>      if ![runto_main] {
> -        fail "can't run to main $version"
>          return -1
>      }
>      gdb_test "rb test" "" "set breakpoints $version"
> diff --git a/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp b/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp
> index b2fef9fca6a..4c2e2b776e4 100644
> --- a/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp
> +++ b/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp
> @@ -53,7 +53,6 @@ proc test { non_stop } {
>      }
>  
>      if ![runto_main] {
> -	fail "cannot run to main"
>  	return -1
>      }
>  
> @@ -84,7 +83,6 @@ proc test { non_stop } {
>  	gdb_load $binfile
>  
>  	if ![runto_main] {
> -	    fail "cannot run to main"
>  	    return -1
>  	}
>      }
> diff --git a/gdb/testsuite/gdb.threads/async.exp b/gdb/testsuite/gdb.threads/async.exp
> index c49deb1f8b5..112965eda96 100644
> --- a/gdb/testsuite/gdb.threads/async.exp
> +++ b/gdb/testsuite/gdb.threads/async.exp
> @@ -35,7 +35,6 @@ proc test_current_thread {expected_thr} {
>      clean_restart $binfile
>  
>      if {![runto "all_started"]} {
> -	fail "could not run to all_started"
>  	return
>      }
>  
> diff --git a/gdb/testsuite/gdb.threads/clone-new-thread-event.exp b/gdb/testsuite/gdb.threads/clone-new-thread-event.exp
> index 4911a73fd9a..562c3a62e4a 100644
> --- a/gdb/testsuite/gdb.threads/clone-new-thread-event.exp
> +++ b/gdb/testsuite/gdb.threads/clone-new-thread-event.exp
> @@ -25,7 +25,6 @@ if { [prepare_for_testing "failed to prepare" clone-new-thread-event] } {
>  }
>  
>  if { ![runto_main] } {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/clone-thread_db.exp b/gdb/testsuite/gdb.threads/clone-thread_db.exp
> index 91608c38855..2d1f8ef9583 100644
> --- a/gdb/testsuite/gdb.threads/clone-thread_db.exp
> +++ b/gdb/testsuite/gdb.threads/clone-thread_db.exp
> @@ -27,7 +27,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}]
>  }
>  
>  if ![runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/continue-pending-status.exp b/gdb/testsuite/gdb.threads/continue-pending-status.exp
> index c0321c39d11..2c3bc12e250 100644
> --- a/gdb/testsuite/gdb.threads/continue-pending-status.exp
> +++ b/gdb/testsuite/gdb.threads/continue-pending-status.exp
> @@ -29,7 +29,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}]
>  }
>  
>  if ![runto_main] {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/current-lwp-dead.exp b/gdb/testsuite/gdb.threads/current-lwp-dead.exp
> index 09b21d42760..2111ea2d670 100644
> --- a/gdb/testsuite/gdb.threads/current-lwp-dead.exp
> +++ b/gdb/testsuite/gdb.threads/current-lwp-dead.exp
> @@ -28,7 +28,6 @@ if { [prepare_for_testing "failed to prepare" current-lwp-dead] } {
>  }
>  
>  if {[runto_main] <= 0} {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/fork-child-threads.exp b/gdb/testsuite/gdb.threads/fork-child-threads.exp
> index 2142fffb89c..fffb0de5517 100644
> --- a/gdb/testsuite/gdb.threads/fork-child-threads.exp
> +++ b/gdb/testsuite/gdb.threads/fork-child-threads.exp
> @@ -27,7 +27,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
>  clean_restart ${binfile}
>  
>  if ![runto_main] then {
> -   fail "can't run to main"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/fork-plus-threads.exp b/gdb/testsuite/gdb.threads/fork-plus-threads.exp
> index 7fe3c603bcd..2300279254e 100644
> --- a/gdb/testsuite/gdb.threads/fork-plus-threads.exp
> +++ b/gdb/testsuite/gdb.threads/fork-plus-threads.exp
> @@ -46,7 +46,6 @@ proc do_test { detach-on-fork } {
>      set GDBFLAGS $saved_gdbflags
>  
>      if ![runto_main] then {
> -	fail "can't run to main"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.threads/fork-thread-pending.exp b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
> index 8f38f783b47..ec6d9839dcc 100644
> --- a/gdb/testsuite/gdb.threads/fork-thread-pending.exp
> +++ b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
> @@ -28,7 +28,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
>  clean_restart ${binfile}
>  
>  if ![runto_main] then {
> -   fail "can't run to main"
>     return 0
>  }
>  
> @@ -86,7 +85,6 @@ gdb_reinitialize_dir $srcdir/$subdir
>  
>  gdb_load ${binfile}
>  if ![runto_main] then {
> -   fail "can't run to main"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
> index 288ee9b1f5f..c1e910bfc1c 100644
> --- a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
> +++ b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
> @@ -39,7 +39,6 @@ proc probe_displaced_stepping_support {} {
>  
>  	gdb_test_no_output "set displaced on"
>  	if ![runto_main] then {
> -	    fail "can't run to main"
>  	    return 0
>  	}
>  
> @@ -79,7 +78,6 @@ proc do_test { cond_bp_target detach_on_fork displaced } {
>      set GDBFLAGS $saved_gdbflags
>  
>      if ![runto_main] then {
> -	fail "can't run to main"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.threads/gcore-thread.exp b/gdb/testsuite/gdb.threads/gcore-thread.exp
> index 35c75f7a499..142c04bcab2 100644
> --- a/gdb/testsuite/gdb.threads/gcore-thread.exp
> +++ b/gdb/testsuite/gdb.threads/gcore-thread.exp
> @@ -56,7 +56,6 @@ set nl "\[\r\n\]+"
>  set timeout 30
>  
>  if { ! [ runto_main ] } then {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
> index 11c45c3dce4..8914eaa0478 100644
> --- a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
> +++ b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
> @@ -50,7 +50,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.threads/interrupt-while-step-over.exp b/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp
> index a9304fc1af0..5f22392f5fd 100644
> --- a/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp
> +++ b/gdb/testsuite/gdb.threads/interrupt-while-step-over.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
>  }
>  
> @@ -175,7 +174,6 @@ proc testdriver {displaced} {
>      gdb_test_no_output "set displaced-stepping $displaced"
>  
>      if ![runto all_started] {
> -	fail "couldn't run to all_started"
>  	return
>      }
>      set break_line [gdb_get_line_number "set breakpoint here"]
> diff --git a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
> index e6d806699f2..b9d4034f341 100644
> --- a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
> +++ b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
> @@ -34,7 +34,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.threads/kill.exp b/gdb/testsuite/gdb.threads/kill.exp
> index c984d45e6be..27464d2f5e8 100644
> --- a/gdb/testsuite/gdb.threads/kill.exp
> +++ b/gdb/testsuite/gdb.threads/kill.exp
> @@ -39,7 +39,6 @@ proc test {threaded} {
>  	}
>  
>  	if { ![runto_main] } then {
> -	    fail "run to main"
>  	    return
>  	}
>  
> diff --git a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
> index 46a8af825ba..0a23fde579e 100644
> --- a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
> +++ b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
> @@ -35,7 +35,6 @@ clean_restart ${binfile}
>  gdb_test_no_output "set can-use-hw-watchpoints 1" ""
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp b/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
> index 5ffe9293b55..921c213721f 100644
> --- a/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
> +++ b/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
> @@ -30,7 +30,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
>  clean_restart "${binfile}"
>  
>  if ![runto_main] then {
> -   fail "can't run to main"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp b/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
> index b0716bb31fa..2401cf51671 100644
> --- a/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
> +++ b/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
> @@ -28,7 +28,6 @@ if {[prepare_for_testing "failed to prepare" \
>  }
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/non-ldr-exit.exp b/gdb/testsuite/gdb.threads/non-ldr-exit.exp
> index f3ed9a0cf7e..beab8afb9a7 100644
> --- a/gdb/testsuite/gdb.threads/non-ldr-exit.exp
> +++ b/gdb/testsuite/gdb.threads/non-ldr-exit.exp
> @@ -23,7 +23,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/omp-par-scope.exp b/gdb/testsuite/gdb.threads/omp-par-scope.exp
> index b07855c87db..f250965612a 100644
> --- a/gdb/testsuite/gdb.threads/omp-par-scope.exp
> +++ b/gdb/testsuite/gdb.threads/omp-par-scope.exp
> @@ -53,7 +53,6 @@ if {[info procs gdb_openmp_setup] != ""} {
>  }
>  
>  if {![runto_main]} {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/pending-step.exp b/gdb/testsuite/gdb.threads/pending-step.exp
> index 208a93f7232..22691d87301 100644
> --- a/gdb/testsuite/gdb.threads/pending-step.exp
> +++ b/gdb/testsuite/gdb.threads/pending-step.exp
> @@ -57,7 +57,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
>  clean_restart ${binfile}
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp b/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp
> index ab5a82bef71..cabbc4faacc 100644
> --- a/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp
> +++ b/gdb/testsuite/gdb.threads/process-dies-while-detaching.exp
> @@ -217,7 +217,6 @@ proc test_detach {multi_process cmd} {
>  	clean_restart ${binfile}
>  
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  
> @@ -246,7 +245,6 @@ proc test_detach_watch {wp multi_process cmd} {
>  	clean_restart ${binfile}
>  
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  
> @@ -295,7 +293,6 @@ proc test_detach_killed_outside {multi_process cmd} {
>  	clean_restart ${binfile}
>  
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  
> diff --git a/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp b/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
> index 7a234e5c37a..7558d37fc5a 100644
> --- a/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
> +++ b/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
> @@ -46,7 +46,6 @@ proc do_test { non_stop cond_bp_target } {
>      set GDBFLAGS $saved_gdbflags
>  
>      if ![runto_main] then {
> -	fail "can't run to main"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.threads/queue-signal.exp b/gdb/testsuite/gdb.threads/queue-signal.exp
> index ca06ce789d2..ae46ff1eb21 100644
> --- a/gdb/testsuite/gdb.threads/queue-signal.exp
> +++ b/gdb/testsuite/gdb.threads/queue-signal.exp
> @@ -23,7 +23,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
>  clean_restart ${binfile}
>  
>  if ![runto_main] {
> -   fail "can't run to main"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/reconnect-signal.exp b/gdb/testsuite/gdb.threads/reconnect-signal.exp
> index 2b5ba5daa82..a1816193755 100644
> --- a/gdb/testsuite/gdb.threads/reconnect-signal.exp
> +++ b/gdb/testsuite/gdb.threads/reconnect-signal.exp
> @@ -34,7 +34,6 @@ if { [gdb_compile_pthreads \
>  clean_restart $executable
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp b/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
> index bef125c8ab4..4d754ef887a 100644
> --- a/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
> +++ b/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
> @@ -41,7 +41,6 @@ proc test { step_over } {
>  	clean_restart ${binfile}
>  
>  	if ![runto_main] then {
> -	    fail "can't run to main"
>  	    return 0
>  	}
>  
> diff --git a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
> index 78ded0db4c2..bb58b7e3342 100644
> --- a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
> +++ b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
> @@ -38,7 +38,6 @@ proc test { schedlock } {
>  	clean_restart ${binfile}
>  
>  	if ![runto_main] then {
> -	    fail "can't run to main"
>  	    return 0
>  	}
>  
> diff --git a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
> index c635facca2d..138e836dec6 100644
> --- a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
> +++ b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
> @@ -35,7 +35,6 @@ proc test { command } {
>  	clean_restart ${binfile}
>  
>  	if ![runto_main] then {
> -	    fail "can't run to main"
>  	    return 0
>  	}
>  
> diff --git a/gdb/testsuite/gdb.threads/signal-sigtrap.exp b/gdb/testsuite/gdb.threads/signal-sigtrap.exp
> index f5dc7fe6e74..3e4ceebb05c 100644
> --- a/gdb/testsuite/gdb.threads/signal-sigtrap.exp
> +++ b/gdb/testsuite/gdb.threads/signal-sigtrap.exp
> @@ -38,7 +38,6 @@ proc test { sigtrap_thread } {
>  	clean_restart ${binfile}
>  
>  	if ![runto "thread_function"] then {
> -	    fail "can't run to thread_function"
>  	    return 0
>  	}
>  
> diff --git a/gdb/testsuite/gdb.threads/sigthread.exp b/gdb/testsuite/gdb.threads/sigthread.exp
> index 867aef9a710..a9d168865d4 100644
> --- a/gdb/testsuite/gdb.threads/sigthread.exp
> +++ b/gdb/testsuite/gdb.threads/sigthread.exp
> @@ -24,7 +24,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
>  clean_restart ${binfile}
>  
>  if ![runto_main] then {
> -   fail "can't run to main"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/stop-with-handle.exp b/gdb/testsuite/gdb.threads/stop-with-handle.exp
> index 5e0f4da00e1..2cbe0e13ba4 100644
> --- a/gdb/testsuite/gdb.threads/stop-with-handle.exp
> +++ b/gdb/testsuite/gdb.threads/stop-with-handle.exp
> @@ -29,7 +29,6 @@ if {[prepare_for_testing "failed to prepare" \
>  }
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/thread-specific-bp.exp b/gdb/testsuite/gdb.threads/thread-specific-bp.exp
> index c59a65b3150..331f9470c22 100644
> --- a/gdb/testsuite/gdb.threads/thread-specific-bp.exp
> +++ b/gdb/testsuite/gdb.threads/thread-specific-bp.exp
> @@ -50,7 +50,6 @@ proc check_thread_specific_breakpoint {mode} {
>  	global gdb_prompt
>  
>  	if ![runto_main] {
> -	    untested "could not run to main"
>  	    return -1
>  	}
>  
> diff --git a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
> index 042691b1709..3c46b8a1db6 100644
> --- a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
> +++ b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp
> @@ -34,7 +34,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.threads/thread_check.exp b/gdb/testsuite/gdb.threads/thread_check.exp
> index 441e3feb78b..89f76edc14f 100644
> --- a/gdb/testsuite/gdb.threads/thread_check.exp
> +++ b/gdb/testsuite/gdb.threads/thread_check.exp
> @@ -42,7 +42,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
>  clean_restart ${binfile}
>  
>  if ![runto_main] then {
> -   fail "can't run to main"
>        return 1
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/thread_events.exp b/gdb/testsuite/gdb.threads/thread_events.exp
> index 31e4d025b9b..2082d346325 100644
> --- a/gdb/testsuite/gdb.threads/thread_events.exp
> +++ b/gdb/testsuite/gdb.threads/thread_events.exp
> @@ -113,7 +113,6 @@ proc test_thread_messages {enabled} {
>    # The initial thread may log a 'New Thread' message, but we don't
>    # check for it.
>    if ![runto_main] then {
> -     fail "can't run to main $enabled_string"
>       return 1
>    }
>  
> diff --git a/gdb/testsuite/gdb.threads/threadapply.exp b/gdb/testsuite/gdb.threads/threadapply.exp
> index ebc1cf15ad6..958339d2870 100644
> --- a/gdb/testsuite/gdb.threads/threadapply.exp
> +++ b/gdb/testsuite/gdb.threads/threadapply.exp
> @@ -32,7 +32,6 @@ clean_restart ${binfile}
>  #
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> @@ -77,7 +76,6 @@ proc thr_apply_detach {thread_set} {
>  	clean_restart ${binfile}
>  
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  
> diff --git a/gdb/testsuite/gdb.threads/tid-reuse.exp b/gdb/testsuite/gdb.threads/tid-reuse.exp
> index 8ac1f5b2ceb..422736402b0 100644
> --- a/gdb/testsuite/gdb.threads/tid-reuse.exp
> +++ b/gdb/testsuite/gdb.threads/tid-reuse.exp
> @@ -23,7 +23,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile { debug pthreads
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/tls-nodebug.exp b/gdb/testsuite/gdb.threads/tls-nodebug.exp
> index 19eb9a02be2..ad637d3abf9 100644
> --- a/gdb/testsuite/gdb.threads/tls-nodebug.exp
> +++ b/gdb/testsuite/gdb.threads/tls-nodebug.exp
> @@ -28,7 +28,6 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
>  
>  clean_restart ${binfile}
>  if ![runto_main] then {
> -   fail "can't run to main"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/tls-shared.exp b/gdb/testsuite/gdb.threads/tls-shared.exp
> index 4efa226c8a6..6c3c2d8c45d 100644
> --- a/gdb/testsuite/gdb.threads/tls-shared.exp
> +++ b/gdb/testsuite/gdb.threads/tls-shared.exp
> @@ -39,7 +39,6 @@ clean_restart ${binfile}
>  gdb_load_shlib ${binfile_lib}
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/tls-so_extern.exp b/gdb/testsuite/gdb.threads/tls-so_extern.exp
> index c3f114bf894..2f358a3886f 100644
> --- a/gdb/testsuite/gdb.threads/tls-so_extern.exp
> +++ b/gdb/testsuite/gdb.threads/tls-so_extern.exp
> @@ -38,7 +38,6 @@ clean_restart ${binfile}
>  gdb_load_shlib ${binfile_lib}
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp
> index 954e2925e7f..a416d81dc82 100644
> --- a/gdb/testsuite/gdb.threads/tls.exp
> +++ b/gdb/testsuite/gdb.threads/tls.exp
> @@ -165,7 +165,6 @@ gdb_test_multiple "print a_thread_local" "" {
>  }
>  
>  if ![runto_main] then {
> -   fail "can't run to main"
>     return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp b/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp
> index c7839d0e5d8..351a8dd77c7 100644
> --- a/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp
> +++ b/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp
> @@ -31,7 +31,6 @@ proc test_vfork {detach} {
>      clean_restart $binfile
>  
>      if ![runto_main] then {
> -	fail "can't run to main"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp b/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp
> index 4b37836e955..7a0ec6e7326 100644
> --- a/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp
> +++ b/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp
> @@ -31,7 +31,6 @@ proc test_vfork {detach} {
>      clean_restart $binfile
>  
>      if ![runto_main] then {
> -	fail "can't run to main"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.threads/watchthreads.exp b/gdb/testsuite/gdb.threads/watchthreads.exp
> index 57630025e11..011e952882b 100644
> --- a/gdb/testsuite/gdb.threads/watchthreads.exp
> +++ b/gdb/testsuite/gdb.threads/watchthreads.exp
> @@ -45,7 +45,6 @@ gdb_test_no_output "set can-use-hw-watchpoints 1" ""
>  #
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/watchthreads2.exp b/gdb/testsuite/gdb.threads/watchthreads2.exp
> index 0b60b0e702e..bd9f0cd399a 100644
> --- a/gdb/testsuite/gdb.threads/watchthreads2.exp
> +++ b/gdb/testsuite/gdb.threads/watchthreads2.exp
> @@ -42,7 +42,6 @@ gdb_test_no_output "set can-use-hw-watchpoints 1" ""
>  #
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.threads/wp-replication.exp b/gdb/testsuite/gdb.threads/wp-replication.exp
> index 81eee1595d5..3515f8c0afd 100644
> --- a/gdb/testsuite/gdb.threads/wp-replication.exp
> +++ b/gdb/testsuite/gdb.threads/wp-replication.exp
> @@ -43,7 +43,6 @@ gdb_test_no_output "set can-use-hw-watchpoints 1" ""
>  
>  # Run to `main' where we begin our tests.
>  if ![runto_main] then {
> -    fail "failed to run to main"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/actions-changed.exp b/gdb/testsuite/gdb.trace/actions-changed.exp
> index 453af1f3b19..44e9ad0d7d2 100644
> --- a/gdb/testsuite/gdb.trace/actions-changed.exp
> +++ b/gdb/testsuite/gdb.trace/actions-changed.exp
> @@ -165,7 +165,6 @@ proc test_actions_changed { } {
>  clean_restart $testfile
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
> index 787df23e3ae..7d3bd652945 100644
> --- a/gdb/testsuite/gdb.trace/actions.exp
> +++ b/gdb/testsuite/gdb.trace/actions.exp
> @@ -247,7 +247,6 @@ gdb_load $binfile
>  gdb_breakpoint "main"
>  gdb_run_cmd
>  if {[gdb_test "" "Breakpoint .*"] != 0} {
> -    fail "can't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
> index 9a03ca4a7a5..dccd9ada8e7 100644
> --- a/gdb/testsuite/gdb.trace/backtrace.exp
> +++ b/gdb/testsuite/gdb.trace/backtrace.exp
> @@ -32,7 +32,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp
> index f2ed8fd50b8..f3caa74eafa 100644
> --- a/gdb/testsuite/gdb.trace/change-loc.exp
> +++ b/gdb/testsuite/gdb.trace/change-loc.exp
> @@ -54,7 +54,6 @@ gdb_load_shlib $lib_sl1
>  gdb_load_shlib $lib_sl2
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -75,7 +74,6 @@ proc tracepoint_change_loc_1 { trace_type } {
>  
>  	clean_restart ${testfile}
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  	gdb_test_no_output "delete break 1"
> @@ -303,7 +301,6 @@ proc tracepoint_install_in_trace_disabled { trace_type } {
>  
>  	clean_restart ${testfile}
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  
> diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp
> index 820f5693ece..f3c6b6cb73f 100644
> --- a/gdb/testsuite/gdb.trace/circ.exp
> +++ b/gdb/testsuite/gdb.trace/circ.exp
> @@ -74,7 +74,6 @@ proc run_trace_experiment { } {
>  }
>  
>  if { ![runto_main] } {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -210,7 +209,6 @@ with_test_prefix "normal buffer" {
>      clean_restart $testfile
>  
>      if { ![runto_main] } {
> -	fail "can't run to main"
>  	return 1
>      }
>  
> @@ -234,7 +232,6 @@ with_test_prefix "small buffer" {
>      clean_restart $testfile
>  
>      if { ![runto_main] } {
> -	fail "can't run to main"
>  	return 1
>      }
>  
> @@ -260,7 +257,6 @@ with_test_prefix "circular buffer" {
>      clean_restart $testfile
>  
>      if { ![runto_main] } {
> -	fail "can't run to main"
>  	return 1
>      }
>  
> diff --git a/gdb/testsuite/gdb.trace/disconnected-tracing.exp b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
> index 88e8c9eb9eb..b26c80e517e 100644
> --- a/gdb/testsuite/gdb.trace/disconnected-tracing.exp
> +++ b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
> @@ -33,7 +33,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -53,7 +52,6 @@ proc disconnected_tracing {  } {
>  	# Start with a fresh gdb.
>  	clean_restart ${executable}
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  
> @@ -116,7 +114,6 @@ proc disconnected_tfind {  } {
>  	# Start with a fresh gdb.
>  	clean_restart ${executable}
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  
> diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp
> index 3695a1ee114..bd8a8c5559f 100644
> --- a/gdb/testsuite/gdb.trace/entry-values.exp
> +++ b/gdb/testsuite/gdb.trace/entry-values.exp
> @@ -173,7 +173,6 @@ if  {[gdb_compile [list ${binfile}1.o ${binfile}2.o] \
>  clean_restart ${testfile}
>  
>  if ![runto_main] {
> -    fail "can't run to main"
>      return -1
>  }
>  
> @@ -208,7 +207,6 @@ clean_restart $binfile
>  load_lib "trace-support.exp"
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/ftrace-lock.exp b/gdb/testsuite/gdb.trace/ftrace-lock.exp
> index 2c87b853ea2..33842cf58ff 100644
> --- a/gdb/testsuite/gdb.trace/ftrace-lock.exp
> +++ b/gdb/testsuite/gdb.trace/ftrace-lock.exp
> @@ -45,7 +45,6 @@ if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $optio
>  clean_restart ${testfile}
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -68,7 +67,6 @@ if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $optio
>  clean_restart ${executable}
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp
> index 902d172f9cc..18ce9c74639 100644
> --- a/gdb/testsuite/gdb.trace/ftrace.exp
> +++ b/gdb/testsuite/gdb.trace/ftrace.exp
> @@ -36,7 +36,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -60,7 +59,6 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
>  clean_restart ${executable}
>  
>  if ![runto_main] {
> -    fail "can't run to main for ftrace tests"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
> index 16f18979ece..d100e165b70 100644
> --- a/gdb/testsuite/gdb.trace/infotrace.exp
> +++ b/gdb/testsuite/gdb.trace/infotrace.exp
> @@ -108,7 +108,6 @@ gdb_trace_setactions "collect on tracepoint 1" "1" \
>  	"collect gdb_struct1_test" "^$"
>  gdb_run_cmd
>  if {[gdb_test "" "Breakpoint ${decimal}, main.*"] != 0} {
> -    fail "can't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
> index eefbb4bbff4..832f87a3fa3 100644
> --- a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
> +++ b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
> @@ -27,7 +27,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug}] }
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
> index 27194a1263d..72824546542 100644
> --- a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
> +++ b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
> @@ -22,7 +22,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug nopi
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
> index d4416899348..e0d3135f7d5 100644
> --- a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
> +++ b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
> @@ -107,7 +107,6 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
>  clean_restart $executable
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
> index 58503a3e103..d2e9ae49c65 100644
> --- a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
> +++ b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
> @@ -70,7 +70,6 @@ proc test_reconnect { } {
>  	gdb_load_shlib $lib_sl1
>  	gdb_load_shlib $lib_sl2
>  	if ![runto_main] then {
> -	    fail "can't run to main"
>  	    return 0
>  	}
>  	# Create tracepoints on marker and main, and leave them in the
> @@ -251,7 +250,6 @@ gdb_load_shlib $lib_sl1
>  gdb_load_shlib $lib_sl2
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
> index b3d01e828a3..577e3422d03 100644
> --- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
> +++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
> @@ -71,7 +71,6 @@ proc test_create_delete_modify_tsv { } {
>  	clean_restart $testfile
>  
>  	if ![runto_main] {
> -	    fail "can't run to main to check for trace support"
>  	    return -1
>  	}
>  
> @@ -153,7 +152,6 @@ proc test_upload_tsv { } {
>  
>  	clean_restart $testfile
>  	if ![runto_main] then {
> -	    fail "can't run to main"
>  	    return 0
>  	}
>  
> @@ -239,7 +237,6 @@ proc test_upload_tsv { } {
>  clean_restart $testfile
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/no-attach-trace.exp b/gdb/testsuite/gdb.trace/no-attach-trace.exp
> index 5bd730fa24d..552446aef52 100644
> --- a/gdb/testsuite/gdb.trace/no-attach-trace.exp
> +++ b/gdb/testsuite/gdb.trace/no-attach-trace.exp
> @@ -43,7 +43,6 @@ gdb_test "tstart" "Target returns error code.*\."
>  
>  with_test_prefix "after tstart" {
>      if ![runto_main] {
> -	fail "can't run to main, target may have died unexpectedly"
>  	return -1
>      }
>  }
> diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp
> index bbff2238f53..94a1e271e1e 100644
> --- a/gdb/testsuite/gdb.trace/pending.exp
> +++ b/gdb/testsuite/gdb.trace/pending.exp
> @@ -52,7 +52,6 @@ gdb_load_shlib $lib_sl1
>  gdb_load_shlib $lib_sl2
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -188,7 +187,6 @@ proc pending_tracepoint_resolved_during_trace { trace_type } \
>      # Start with a fresh gdb.
>      clean_restart $executable
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> @@ -257,7 +255,6 @@ proc pending_tracepoint_installed_during_trace { trace_type } \
>      # Start with a fresh gdb.
>      clean_restart $executable
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> @@ -331,7 +328,6 @@ proc pending_tracepoint_disconnect_during_trace { trace_type } \
>      # Start with a fresh gdb.
>      clean_restart $executable
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> @@ -379,7 +375,6 @@ proc pending_tracepoint_disconnect_after_resolved { trace_type } \
>      # Start with a fresh gdb.
>      clean_restart $executable
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> @@ -432,7 +427,6 @@ proc pending_tracepoint_with_action_resolved { trace_type } \
>      # Start with a fresh gdb.
>      clean_restart $executable
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> diff --git a/gdb/testsuite/gdb.trace/pr16508.exp b/gdb/testsuite/gdb.trace/pr16508.exp
> index d0ecaddc7b1..2070648f05b 100644
> --- a/gdb/testsuite/gdb.trace/pr16508.exp
> +++ b/gdb/testsuite/gdb.trace/pr16508.exp
> @@ -23,7 +23,6 @@ if [prepare_for_testing "failed to prepare for trace tests" \
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/qtro.exp b/gdb/testsuite/gdb.trace/qtro.exp
> index 0fadfa66b13..b1298834ec0 100644
> --- a/gdb/testsuite/gdb.trace/qtro.exp
> +++ b/gdb/testsuite/gdb.trace/qtro.exp
> @@ -27,7 +27,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nopie}]}
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/range-stepping.exp b/gdb/testsuite/gdb.trace/range-stepping.exp
> index 156d86207ed..cc3c7a81af7 100644
> --- a/gdb/testsuite/gdb.trace/range-stepping.exp
> +++ b/gdb/testsuite/gdb.trace/range-stepping.exp
> @@ -25,7 +25,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -82,7 +81,6 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
>  clean_restart ${executable}
>  
>  if ![runto_main] {
> -    fail "can't run to main for ftrace tests"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/read-memory.exp b/gdb/testsuite/gdb.trace/read-memory.exp
> index 295784c297e..cad2f7d73b1 100644
> --- a/gdb/testsuite/gdb.trace/read-memory.exp
> +++ b/gdb/testsuite/gdb.trace/read-memory.exp
> @@ -22,7 +22,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nopie}]}
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -39,7 +38,6 @@ proc set_tracepoint_and_collect { } {
>      # Start with a fresh gdb.
>      clean_restart ${testfile}
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>      gdb_breakpoint "end" qualified
> diff --git a/gdb/testsuite/gdb.trace/signal.exp b/gdb/testsuite/gdb.trace/signal.exp
> index 218c7ba32fb..df257cddf8b 100644
> --- a/gdb/testsuite/gdb.trace/signal.exp
> +++ b/gdb/testsuite/gdb.trace/signal.exp
> @@ -40,7 +40,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -67,7 +66,6 @@ if { [istarget "i\[34567\]86-*-linux*"] || [istarget "x86_64-*-linux*"] } {
>  # Start with a fresh gdb.
>  clean_restart ${testfile}
>  if ![runto_main] {
> -    fail "can't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp
> index e129f011be7..1960b6464c6 100644
> --- a/gdb/testsuite/gdb.trace/status-stop.exp
> +++ b/gdb/testsuite/gdb.trace/status-stop.exp
> @@ -25,7 +25,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -44,7 +43,6 @@ proc test_tstart_tstop_tstart { } {
>  	# Start with a fresh gdb.
>  	clean_restart ${executable}
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  
> @@ -71,7 +69,6 @@ proc test_tstart_tstart { } {
>  	# Start with a fresh gdb.
>  	clean_restart ${executable}
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  
> @@ -98,7 +95,6 @@ proc test_buffer_full_tstart { } {
>  	# Start with a fresh gdb.
>  	clean_restart ${executable}
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  
> diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp
> index 82d62fc3b54..1038b87a3f9 100644
> --- a/gdb/testsuite/gdb.trace/strace.exp
> +++ b/gdb/testsuite/gdb.trace/strace.exp
> @@ -51,7 +51,6 @@ proc strace_remove_socket { action } {
>      clean_restart $executable
>      gdb_load_shlib $libipa
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> @@ -136,7 +135,6 @@ proc strace_info_marker { } {
>  	clean_restart $executable
>  	gdb_load_shlib $libipa
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  
> @@ -173,7 +171,6 @@ proc strace_probe_marker { } {
>  	clean_restart $executable
>  	gdb_load_shlib $libipa
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  
> @@ -213,7 +210,6 @@ proc strace_trace_on_same_addr { type } {
>  	clean_restart $executable
>  	gdb_load_shlib $libipa
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  
> @@ -317,7 +313,6 @@ proc strace_trace_on_diff_addr { } {
>  	clean_restart $executable
>  	gdb_load_shlib $libipa
>  	if ![runto_main] {
> -	    fail "can't run to main"
>  	    return -1
>  	}
>  
> @@ -377,7 +372,6 @@ if { [istarget "x86_64-*-linux*"] || [istarget "i\[34567\]86-*-linux*"] } {
>  clean_restart $executable
>  gdb_load_shlib $libipa
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  if { ![gdb_target_supports_trace] } then {
> diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp
> index cf60bfad448..2e55d5cb4b0 100644
> --- a/gdb/testsuite/gdb.trace/trace-break.exp
> +++ b/gdb/testsuite/gdb.trace/trace-break.exp
> @@ -32,7 +32,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -52,7 +51,6 @@ proc break_trace_same_addr_1 { trace_type option } \
>      # Start with a fresh gdb.
>      clean_restart ${executable}
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> @@ -87,7 +85,6 @@ proc break_trace_same_addr_2 { trace_type1 trace_type2 option } \
>      # Start with a fresh gdb.
>      clean_restart ${executable}
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> @@ -126,7 +123,6 @@ proc break_trace_same_addr_3 { trace_type option } \
>      # Start with a fresh gdb.
>      clean_restart ${executable}
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> @@ -164,7 +160,6 @@ proc break_trace_same_addr_4 { trace_type option } \
>      # Start with a fresh gdb.
>      clean_restart ${executable}
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> @@ -208,7 +203,6 @@ proc break_trace_same_addr_5 { trace1 trace2 trace3 trace3_at_first_loc } \
>      # Start with a fresh gdb.
>      clean_restart ${executable}
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> @@ -282,7 +276,6 @@ proc break_trace_same_addr_6 { trace1 enable1 trace2 enable2 } \
>      # Start with a fresh gdb.
>      clean_restart ${executable}
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> @@ -371,7 +364,6 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
>  clean_restart ${executable}
>  
>  if ![runto_main] {
> -    fail "can't run to main for ftrace tests"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/trace-buffer-size.exp b/gdb/testsuite/gdb.trace/trace-buffer-size.exp
> index e3962fa0a8c..2b2bb425cff 100644
> --- a/gdb/testsuite/gdb.trace/trace-buffer-size.exp
> +++ b/gdb/testsuite/gdb.trace/trace-buffer-size.exp
> @@ -23,7 +23,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile \
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gdb.trace/trace-condition.exp
> index 3b23b4fa8d0..4eb376e8265 100644
> --- a/gdb/testsuite/gdb.trace/trace-condition.exp
> +++ b/gdb/testsuite/gdb.trace/trace-condition.exp
> @@ -36,7 +36,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -61,7 +60,6 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
>  clean_restart ${executable}
>  
>  if ![runto_main] {
> -    fail "can't run to main for ftrace tests"
>      return 0
>  }
>  
> @@ -76,7 +74,6 @@ proc test_tracepoints { trace_command condition num_frames { kfail_proc 0 } } {
>      clean_restart ${executable}
>  
>      if ![runto_main] {
> -	fail "can't run to main for ftrace tests"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/gdb.trace/trace-enable-disable.exp b/gdb/testsuite/gdb.trace/trace-enable-disable.exp
> index 3733cd6700f..4ceae1a595f 100644
> --- a/gdb/testsuite/gdb.trace/trace-enable-disable.exp
> +++ b/gdb/testsuite/gdb.trace/trace-enable-disable.exp
> @@ -38,7 +38,6 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != ""
>  clean_restart ${testfile}
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -70,7 +69,6 @@ proc test_tracepoint_enable_disable { tracepoint_cmd } {
>  	set expected 0
>  
>  	if ![runto_main] {
> -	    fail "can't run to main."
>  	    return -1
>  	}
>  
> diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace/trace-mt.exp
> index 1c81b2ec59d..634c1e7a4dd 100644
> --- a/gdb/testsuite/gdb.trace/trace-mt.exp
> +++ b/gdb/testsuite/gdb.trace/trace-mt.exp
> @@ -35,7 +35,6 @@ if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
>  clean_restart ${testfile}
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> @@ -55,7 +54,6 @@ proc step_over_tracepoint { trace_type } \
>      # Make sure inferior is running in all-stop mode.
>      gdb_test_no_output "set non-stop 0"
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> @@ -80,7 +78,6 @@ proc break_trace_same_addr { trace_type option } \
>      # Start with a fresh gdb.
>      clean_restart ${executable}
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return -1
>      }
>  
> @@ -127,7 +124,6 @@ if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
>  clean_restart ${executable}
>  
>  if ![runto_main] {
> -    fail "can't run to main for ftrace tests"
>      return 0
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
> index eafab1d174b..7746a806c23 100644
> --- a/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
> +++ b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
> @@ -27,7 +27,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/tspeed.exp b/gdb/testsuite/gdb.trace/tspeed.exp
> index 5728194eda6..59cea40b912 100644
> --- a/gdb/testsuite/gdb.trace/tspeed.exp
> +++ b/gdb/testsuite/gdb.trace/tspeed.exp
> @@ -36,7 +36,6 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != ""
>  clean_restart ${testfile}
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/tstatus.exp b/gdb/testsuite/gdb.trace/tstatus.exp
> index 69edda65aa8..bbecfe44be2 100644
> --- a/gdb/testsuite/gdb.trace/tstatus.exp
> +++ b/gdb/testsuite/gdb.trace/tstatus.exp
> @@ -29,7 +29,6 @@ if [prepare_for_testing "failed to prepare" $executable $srcfile \
>  }
>  
>  if ![runto_main] {
> -    fail "can't run to main to check for trace support"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
> index ff49aff52e5..210ee98835c 100644
> --- a/gdb/testsuite/gdb.trace/tsv.exp
> +++ b/gdb/testsuite/gdb.trace/tsv.exp
> @@ -201,7 +201,6 @@ gdb_test_multiple "target ctf ${tracefile}.ctf" "" {
>  clean_restart ${binfile}
>  
>  if ![runto_main] then {
> -    fail "can't run to main"
>      return
>  }
>  
> diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp
> index db32a36f78c..3cea488aff4 100644
> --- a/gdb/testsuite/gdb.trace/while-stepping.exp
> +++ b/gdb/testsuite/gdb.trace/while-stepping.exp
> @@ -112,7 +112,6 @@ gdb_load $binfile
>  gdb_breakpoint "main"
>  gdb_run_cmd
>  if {[gdb_test "" "Breakpoint .*"] != 0} {
> -    fail "can't run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.tui/corefile-run.exp b/gdb/testsuite/gdb.tui/corefile-run.exp
> index d53149fb648..f000ff6a93a 100644
> --- a/gdb/testsuite/gdb.tui/corefile-run.exp
> +++ b/gdb/testsuite/gdb.tui/corefile-run.exp
> @@ -35,7 +35,6 @@ if { [use_gdb_stub] || [target_info gdb_protocol] == "extended-remote" } {
>  }
>  
>  if { ![runto_main] } {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/gdb.tui/tui-layout.exp b/gdb/testsuite/gdb.tui/tui-layout.exp
> index b867ab5498b..34b56c7a75b 100644
> --- a/gdb/testsuite/gdb.tui/tui-layout.exp
> +++ b/gdb/testsuite/gdb.tui/tui-layout.exp
> @@ -36,7 +36,6 @@ proc test_layout {layout execution} {
>  
>      if {$execution} {
>  	if ![runto_main] then {
> -	    fail "can't run to main"
>  	    return 0
>  	}
>      }
> diff --git a/gdb/testsuite/gdb.xml/tdesc-reload.exp b/gdb/testsuite/gdb.xml/tdesc-reload.exp
> index a3bb2fb166a..5d6409dfa75 100644
> --- a/gdb/testsuite/gdb.xml/tdesc-reload.exp
> +++ b/gdb/testsuite/gdb.xml/tdesc-reload.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
>  }
>  
> @@ -64,7 +63,6 @@ gdb_load ${binfile}
>  
>  # Run to `main' where we begin our tests.
>  if ![runto_main] then {
> -    untested "could not run to main"
>      return -1
>  }
>  
> diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp
> index 857b079b9e5..efbcc7b9884 100644
> --- a/gdb/testsuite/lib/ada.exp
> +++ b/gdb/testsuite/lib/ada.exp
> @@ -181,7 +181,6 @@ gdb_caching_proc gnat_runtime_has_debug_info {
>      clean_restart $dst
>  
>      if { ! [runto "GNAT_Debug_Info_Test"] } {
> -	fail "failed to run to GNAT_Debug_Info_Test"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/lib/gdb-guile.exp b/gdb/testsuite/lib/gdb-guile.exp
> index c118ffeda50..25b8801362e 100644
> --- a/gdb/testsuite/lib/gdb-guile.exp
> +++ b/gdb/testsuite/lib/gdb-guile.exp
> @@ -105,7 +105,6 @@ proc gdb_install_guile_module { } {
>  
>  proc gdb_guile_runto_main { } {
>      if ![runto_main] {
> -	fail "can't run to main"
>  	return 0
>      }
>  
> diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
> index afdc92eec3f..6de49c15492 100644
> --- a/gdb/testsuite/lib/gdb.exp
> +++ b/gdb/testsuite/lib/gdb.exp
> @@ -707,7 +707,7 @@ proc runto { function args } {
>  # If you don't want that, use gdb_start_cmd.
>  
>  proc runto_main { } {
> -    return [runto main no-message qualified]
> +    return [runto main qualified]
>  }
>  
>  ### Continue, and expect to hit a breakpoint.
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gdb/testsuite: make runto_main not pass no-message to runto
  2021-09-30 15:52 [PATCH] gdb/testsuite: make runto_main not pass no-message to runto Simon Marchi
  2021-09-30 17:19 ` Tom de Vries
@ 2021-09-30 18:03 ` Tom Tromey
  2021-09-30 19:29   ` Simon Marchi
  2021-12-07  9:51 ` Tom de Vries
  2 siblings, 1 reply; 8+ messages in thread
From: Tom Tromey @ 2021-09-30 18:03 UTC (permalink / raw)
  To: Simon Marchi via Gdb-patches; +Cc: Simon Marchi

>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:

Simon> Without this, we rely on tests logging a failure if runto_main fails,
Simon> otherwise.  They do so in a very inconsisteny mannet, sometimes using

Typos "inconsistent" and "manner".

This looks good to me.  Thanks for doing this.

Tom

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gdb/testsuite: make runto_main not pass no-message to runto
  2021-09-30 18:03 ` Tom Tromey
@ 2021-09-30 19:29   ` Simon Marchi
  0 siblings, 0 replies; 8+ messages in thread
From: Simon Marchi @ 2021-09-30 19:29 UTC (permalink / raw)
  To: Tom Tromey, Simon Marchi via Gdb-patches, Tom de Vries; +Cc: Simon Marchi



On 2021-09-30 14:03, Tom Tromey wrote:
>>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:
> 
> Simon> Without this, we rely on tests logging a failure if runto_main fails,
> Simon> otherwise.  They do so in a very inconsisteny mannet, sometimes using
> 
> Typos "inconsistent" and "manner".
> 
> This looks good to me.  Thanks for doing this.
> 
> Tom
> 

Thanks to both, pushed.

Simon

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gdb/testsuite: make runto_main not pass no-message to runto
  2021-09-30 15:52 [PATCH] gdb/testsuite: make runto_main not pass no-message to runto Simon Marchi
  2021-09-30 17:19 ` Tom de Vries
  2021-09-30 18:03 ` Tom Tromey
@ 2021-12-07  9:51 ` Tom de Vries
  2021-12-07 16:31   ` Simon Marchi
  2 siblings, 1 reply; 8+ messages in thread
From: Tom de Vries @ 2021-12-07  9:51 UTC (permalink / raw)
  To: Simon Marchi, gdb-patches

On 9/30/21 5:52 PM, Simon Marchi via Gdb-patches wrote:
> From: Simon Marchi <simon.marchi@polymtl.ca>
> 
> 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.
> 

I ran test-case gdb.arch/amd64-disp-step-avx.exp with gcc 4.8.5 and
target board unix/-pie/-fPIE and gdb 11.1, and ran into a reported
failure to run to main.

I then tried to reproduce with trunk, and saw the failure message
disappear, while the test-case still failed to run to main.

This patch removes the fail in the test-case, and then does:
...
 proc runto_main { } {
-    return [runto main no-message qualified]
+    return [runto main qualified]
 }
...
but runto sets no-message as default argument, so there's no actual
change in behaviour for runto.

This fixes it for me:
...
@@ -628,9 +627,6 @@ proc runto { function args } {

     delete_breakpoints

-    # Default to "no-message".
-    set args "no-message $args"
-
     set print_pass 0
     set print_fail 1
...

The submission of the patch introducing the default no-message is here (
 https://sourceware.org/pipermail/gdb-patches/2012-October/096637.html ).

Thanks,
- Tom


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gdb/testsuite: make runto_main not pass no-message to runto
  2021-12-07  9:51 ` Tom de Vries
@ 2021-12-07 16:31   ` Simon Marchi
  2021-12-07 16:45     ` Tom de Vries
  0 siblings, 1 reply; 8+ messages in thread
From: Simon Marchi @ 2021-12-07 16:31 UTC (permalink / raw)
  To: Tom de Vries, Simon Marchi, gdb-patches

On 2021-12-07 4:51 a.m., Tom de Vries via Gdb-patches wrote:
> On 9/30/21 5:52 PM, Simon Marchi via Gdb-patches wrote:
>> From: Simon Marchi <simon.marchi@polymtl.ca>
>>
>> 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.
>>
>
> I ran test-case gdb.arch/amd64-disp-step-avx.exp with gcc 4.8.5 and
> target board unix/-pie/-fPIE and gdb 11.1, and ran into a reported
> failure to run to main.
>
> I then tried to reproduce with trunk, and saw the failure message
> disappear, while the test-case still failed to run to main.
>
> This patch removes the fail in the test-case, and then does:
> ...
>  proc runto_main { } {
> -    return [runto main no-message qualified]
> +    return [runto main qualified]
>  }
> ...
> but runto sets no-message as default argument, so there's no actual
> change in behaviour for runto.
>
> This fixes it for me:
> ...
> @@ -628,9 +627,6 @@ proc runto { function args } {
>
>      delete_breakpoints
>
> -    # Default to "no-message".
> -    set args "no-message $args"
> -
>      set print_pass 0
>      set print_fail 1
> ...
>
> The submission of the patch introducing the default no-message is here (
>  https://sourceware.org/pipermail/gdb-patches/2012-October/096637.html ).
>
> Thanks,
> - Tom
>

Oh, so you are telling me that my patch did actually hide all failures
to run to main?  Damn :(.

In fact, I don't understand the current code in runto.  I think the
original intention of that code was to not show PASSes but we show
FAILs.  But by adding no-message to args, that defaults to not showing
anything.  And your change seems to change it to its documented /
intended behavior, or am I missing something?

Simon


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gdb/testsuite: make runto_main not pass no-message to runto
  2021-12-07 16:31   ` Simon Marchi
@ 2021-12-07 16:45     ` Tom de Vries
  2021-12-07 17:07       ` Simon Marchi
  0 siblings, 1 reply; 8+ messages in thread
From: Tom de Vries @ 2021-12-07 16:45 UTC (permalink / raw)
  To: Simon Marchi, Simon Marchi, gdb-patches

On 12/7/21 5:31 PM, Simon Marchi wrote:
> On 2021-12-07 4:51 a.m., Tom de Vries via Gdb-patches wrote:
>> On 9/30/21 5:52 PM, Simon Marchi via Gdb-patches wrote:
>>> From: Simon Marchi <simon.marchi@polymtl.ca>
>>>
>>> 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.
>>>
>>
>> I ran test-case gdb.arch/amd64-disp-step-avx.exp with gcc 4.8.5 and
>> target board unix/-pie/-fPIE and gdb 11.1, and ran into a reported
>> failure to run to main.
>>
>> I then tried to reproduce with trunk, and saw the failure message
>> disappear, while the test-case still failed to run to main.
>>
>> This patch removes the fail in the test-case, and then does:
>> ...
>>  proc runto_main { } {
>> -    return [runto main no-message qualified]
>> +    return [runto main qualified]
>>  }
>> ...
>> but runto sets no-message as default argument, so there's no actual
>> change in behaviour for runto.
>>
>> This fixes it for me:
>> ...
>> @@ -628,9 +627,6 @@ proc runto { function args } {
>>
>>      delete_breakpoints
>>
>> -    # Default to "no-message".
>> -    set args "no-message $args"
>> -
>>      set print_pass 0
>>      set print_fail 1
>> ...
>>
>> The submission of the patch introducing the default no-message is here (
>>  https://sourceware.org/pipermail/gdb-patches/2012-October/096637.html ).
>>
>> Thanks,
>> - Tom
>>
> 
> Oh, so you are telling me that my patch did actually hide all failures
> to run to main?  Damn :(.
> 

Indeed.

> In fact, I don't understand the current code in runto.  I think the
> original intention of that code was to not show PASSes but we show
> FAILs.  But by adding no-message to args, that defaults to not showing
> anything.  And your change seems to change it to its documented /
> intended behavior, or am I missing something?

That's my understanding as well.

Thanks,
- Tom




^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] gdb/testsuite: make runto_main not pass no-message to runto
  2021-12-07 16:45     ` Tom de Vries
@ 2021-12-07 17:07       ` Simon Marchi
  0 siblings, 0 replies; 8+ messages in thread
From: Simon Marchi @ 2021-12-07 17:07 UTC (permalink / raw)
  To: Tom de Vries, Simon Marchi, gdb-patches

On 2021-12-07 11:45 a.m., Tom de Vries via Gdb-patches wrote:
> On 12/7/21 5:31 PM, Simon Marchi wrote:
>> On 2021-12-07 4:51 a.m., Tom de Vries via Gdb-patches wrote:
>>> On 9/30/21 5:52 PM, Simon Marchi via Gdb-patches wrote:
>>>> From: Simon Marchi <simon.marchi@polymtl.ca>
>>>>
>>>> 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.
>>>>
>>>
>>> I ran test-case gdb.arch/amd64-disp-step-avx.exp with gcc 4.8.5 and
>>> target board unix/-pie/-fPIE and gdb 11.1, and ran into a reported
>>> failure to run to main.
>>>
>>> I then tried to reproduce with trunk, and saw the failure message
>>> disappear, while the test-case still failed to run to main.
>>>
>>> This patch removes the fail in the test-case, and then does:
>>> ...
>>>  proc runto_main { } {
>>> -    return [runto main no-message qualified]
>>> +    return [runto main qualified]
>>>  }
>>> ...
>>> but runto sets no-message as default argument, so there's no actual
>>> change in behaviour for runto.
>>>
>>> This fixes it for me:
>>> ...
>>> @@ -628,9 +627,6 @@ proc runto { function args } {
>>>
>>>      delete_breakpoints
>>>
>>> -    # Default to "no-message".
>>> -    set args "no-message $args"
>>> -
>>>      set print_pass 0
>>>      set print_fail 1
>>> ...
>>>
>>> The submission of the patch introducing the default no-message is here (
>>>  https://sourceware.org/pipermail/gdb-patches/2012-October/096637.html ).
>>>
>>> Thanks,
>>> - Tom
>>>
>>
>> Oh, so you are telling me that my patch did actually hide all failures
>> to run to main?  Damn :(.
>>
> 
> Indeed.
> 
>> In fact, I don't understand the current code in runto.  I think the
>> original intention of that code was to not show PASSes but we show
>> FAILs.  But by adding no-message to args, that defaults to not showing
>> anything.  And your change seems to change it to its documented /
>> intended behavior, or am I missing something?
> 
> That's my understanding as well.
> 
> Thanks,
> - Tom

Ok, I am able to make gdb.base/template.exp reproduce the issue with this modification:

diff --git a/gdb/testsuite/gdb.base/template.c b/gdb/testsuite/gdb.base/template.c
index bcf39c377d9..8eab9548fad 100644
--- a/gdb/testsuite/gdb.base/template.c
+++ b/gdb/testsuite/gdb.base/template.c
@@ -15,6 +15,14 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

+#include <stdlib.h>
+__attribute__((constructor))
+static void
+c (void)
+{
+  exit(1);
+}
+
 int
 main (void)
 {


I confirm that without your change, we don't see a failure (bad) and with your
change, we ese the failure (good).

Simon



^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-12-07 17:07 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-30 15:52 [PATCH] gdb/testsuite: make runto_main not pass no-message to runto Simon Marchi
2021-09-30 17:19 ` Tom de Vries
2021-09-30 18:03 ` Tom Tromey
2021-09-30 19:29   ` Simon Marchi
2021-12-07  9:51 ` Tom de Vries
2021-12-07 16:31   ` Simon Marchi
2021-12-07 16:45     ` Tom de Vries
2021-12-07 17:07       ` Simon Marchi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).