[v2,13/37] GDB: testsuite: base: Don't return -1 from top-level (sed)

Message ID 20260429230432.60487-14-thiago.bauermann@linaro.org
State New
Headers
Series GDB: testsuite: Fix top-level returns |

Commit Message

Thiago Jung Bauermann April 29, 2026, 11:04 p.m. UTC
  This patch is purely the result of running:

$ sed -i 's/^    return -1/    return/' *.exp*

inside gdb/testsuite/gdb.base.

I didn't include changes made to return statements inside procedures.
---
 gdb/testsuite/gdb.base/a2-run.exp             |  2 +-
 gdb/testsuite/gdb.base/access-mem-running.exp |  2 +-
 .../gdb.base/add-symbol-file-attach.exp       |  2 +-
 .../advance-until-multiple-locations.exp      |  2 +-
 gdb/testsuite/gdb.base/advance.exp            |  2 +-
 gdb/testsuite/gdb.base/all-bin.exp            |  2 +-
 .../gdb.base/annota-input-while-running.exp   |  2 +-
 gdb/testsuite/gdb.base/annota1.exp            |  2 +-
 gdb/testsuite/gdb.base/annota3.exp            |  2 +-
 gdb/testsuite/gdb.base/annotate-symlink.exp   |  6 +++---
 gdb/testsuite/gdb.base/anon.exp               |  2 +-
 gdb/testsuite/gdb.base/args.exp               |  2 +-
 gdb/testsuite/gdb.base/argv0-symlink.exp      |  2 +-
 gdb/testsuite/gdb.base/arithmet.exp           |  2 +-
 gdb/testsuite/gdb.base/array-indices.exp.tcl  |  2 +-
 gdb/testsuite/gdb.base/array-repeat.exp.tcl   |  2 +-
 gdb/testsuite/gdb.base/asmlabel.exp           |  2 +-
 gdb/testsuite/gdb.base/async.exp              |  2 +-
 .../gdb.base/attach-deleted-exec.exp          |  2 +-
 gdb/testsuite/gdb.base/attach-fail-twice.exp  |  2 +-
 .../gdb.base/attach-non-pgrp-leader.exp       |  2 +-
 gdb/testsuite/gdb.base/attach-pie-misread.exp |  4 ++--
 gdb/testsuite/gdb.base/attach-pie-noexec.exp  |  2 +-
 gdb/testsuite/gdb.base/attach-twice.exp       |  2 +-
 gdb/testsuite/gdb.base/attach-wait-input.exp  |  2 +-
 gdb/testsuite/gdb.base/attach.exp             |  6 +++---
 .../gdb.base/auto-connect-native-target.exp   |  2 +-
 gdb/testsuite/gdb.base/auto-load.exp          |  2 +-
 gdb/testsuite/gdb.base/auxv.exp               |  2 +-
 gdb/testsuite/gdb.base/backtrace.exp          |  2 +-
 gdb/testsuite/gdb.base/bang.exp               |  2 +-
 .../gdb.base/batch-preserve-term-settings.exp |  2 +-
 gdb/testsuite/gdb.base/bfd-errors.exp         |  8 ++++----
 .../gdb.base/bg-exec-sigint-bp-cond.exp       |  2 +-
 .../gdb.base/bg-execution-repeat.exp          |  2 +-
 gdb/testsuite/gdb.base/bitfields.exp          |  2 +-
 gdb/testsuite/gdb.base/bitfields2.exp         |  2 +-
 .../gdb.base/bp-cmds-continue-ctrl-c.exp      |  2 +-
 .../gdb.base/bp-cmds-execution-x-script.exp   |  2 +-
 .../gdb.base/bp-cmds-run-with-ex.exp          |  2 +-
 .../gdb.base/bp-cmds-sourced-script.exp       |  2 +-
 gdb/testsuite/gdb.base/bp-cond-failure.exp    |  2 +-
 gdb/testsuite/gdb.base/bp-permanent.exp       |  2 +-
 gdb/testsuite/gdb.base/branch-to-self.exp     |  2 +-
 gdb/testsuite/gdb.base/break-always.exp       |  2 +-
 gdb/testsuite/gdb.base/break-caller-line.exp  |  2 +-
 gdb/testsuite/gdb.base/break-entry.exp        |  2 +-
 gdb/testsuite/gdb.base/break-include.exp      |  2 +-
 gdb/testsuite/gdb.base/break-inline.exp       |  2 +-
 gdb/testsuite/gdb.base/break-interp.exp       |  4 ++--
 .../gdb.base/break-main-file-remove-fail.exp  |  2 +-
 .../gdb.base/break-on-linker-gcd-function.exp |  2 +-
 gdb/testsuite/gdb.base/break-probes.exp       |  8 ++++----
 gdb/testsuite/gdb.base/break-unload-file.exp  |  2 +-
 gdb/testsuite/gdb.base/break.exp              |  4 ++--
 .../gdb.base/breakpoint-in-ro-region.exp      |  6 +++---
 gdb/testsuite/gdb.base/breakpoint-shadow.exp  |  4 ++--
 .../gdb.base/bt-on-error-and-warning.exp      |  4 ++--
 gdb/testsuite/gdb.base/bt-on-fatal-signal.exp |  4 ++--
 gdb/testsuite/gdb.base/bt-selected-frame.exp  |  2 +-
 gdb/testsuite/gdb.base/build-id-seqno.exp     |  4 ++--
 gdb/testsuite/gdb.base/c-linkage-name.exp     |  2 +-
 gdb/testsuite/gdb.base/cached-source-file.exp |  6 +++---
 gdb/testsuite/gdb.base/call-ar-st.exp         |  2 +-
 gdb/testsuite/gdb.base/call-strs.exp          |  2 +-
 gdb/testsuite/gdb.base/cast-call.exp          |  4 ++--
 gdb/testsuite/gdb.base/cast-indirection.exp   |  4 ++--
 gdb/testsuite/gdb.base/catch-fork-static.exp  |  2 +-
 .../gdb.base/catch-gdb-caused-signals.exp     |  4 ++--
 gdb/testsuite/gdb.base/catch-load.exp         |  4 ++--
 gdb/testsuite/gdb.base/catch-signal-fork.exp  |  4 ++--
 .../gdb.base/catch-signal-siginfo-cond.exp    |  4 ++--
 gdb/testsuite/gdb.base/catch-signal.exp       |  2 +-
 gdb/testsuite/gdb.base/catch-syscall.exp      |  2 +-
 gdb/testsuite/gdb.base/charset.exp            |  4 ++--
 gdb/testsuite/gdb.base/commands.exp           |  2 +-
 gdb/testsuite/gdb.base/compare-sections.exp   |  2 +-
 gdb/testsuite/gdb.base/complete-empty.exp     |  2 +-
 gdb/testsuite/gdb.base/completion.exp         |  4 ++--
 gdb/testsuite/gdb.base/complex-parts.exp      |  2 +-
 gdb/testsuite/gdb.base/complex.exp            |  2 +-
 gdb/testsuite/gdb.base/cond-eval-mode.exp     |  2 +-
 .../gdb.base/condbreak-call-false.exp         |  2 +-
 gdb/testsuite/gdb.base/condbreak.exp          |  2 +-
 .../gdb.base/consecutive-step-over.exp        |  2 +-
 gdb/testsuite/gdb.base/consecutive.exp        |  2 +-
 .../continue-after-aborted-step-over.exp      |  2 +-
 .../gdb.base/coredump-filter-build-id.exp     |  8 ++++----
 gdb/testsuite/gdb.base/coredump-filter.exp    |  8 ++++----
 .../gdb.base/corefile-exec-context.exp        |  4 ++--
 gdb/testsuite/gdb.base/corefile-find-exec.exp |  2 +-
 gdb/testsuite/gdb.base/corefile.exp           |  2 +-
 gdb/testsuite/gdb.base/corefile2.exp          |  2 +-
 gdb/testsuite/gdb.base/ctf-ptype.exp          |  8 ++++----
 gdb/testsuite/gdb.base/ctxobj.exp             |  8 ++++----
 gdb/testsuite/gdb.base/cursal.exp             |  8 ++++----
 gdb/testsuite/gdb.base/dcache-flush.exp       |  4 ++--
 .../gdb.base/dcache-line-read-error.exp       |  4 ++--
 gdb/testsuite/gdb.base/debug-expr.exp         |  4 ++--
 gdb/testsuite/gdb.base/debug-frame.exp        |  4 ++--
 gdb/testsuite/gdb.base/decl-before-def.exp    |  2 +-
 gdb/testsuite/gdb.base/default-args.exp       |  2 +-
 gdb/testsuite/gdb.base/define.exp             |  2 +-
 gdb/testsuite/gdb.base/del.exp                |  2 +-
 gdb/testsuite/gdb.base/disabled-location.exp  |  2 +-
 gdb/testsuite/gdb.base/disasm-end-cu.exp      |  6 +++---
 gdb/testsuite/gdb.base/disasm-optim.exp       |  4 ++--
 .../gdb.base/displaced-step-closure.exp       |  4 ++--
 gdb/testsuite/gdb.base/display.exp            |  2 +-
 gdb/testsuite/gdb.base/dmsym.exp              |  2 +-
 gdb/testsuite/gdb.base/document.exp           |  2 +-
 .../gdb.base/dprintf-bp-same-addr.exp         |  2 +-
 gdb/testsuite/gdb.base/dprintf-detach.exp     |  2 +-
 .../gdb.base/dprintf-execution-x-script.exp   |  4 ++--
 gdb/testsuite/gdb.base/dprintf-next.exp       |  4 ++--
 gdb/testsuite/gdb.base/dprintf-non-stop.exp   |  4 ++--
 gdb/testsuite/gdb.base/dprintf-pending.exp    |  2 +-
 gdb/testsuite/gdb.base/dprintf.exp            |  4 ++--
 gdb/testsuite/gdb.base/dump.exp               |  2 +-
 gdb/testsuite/gdb.base/dup-sect.exp           |  2 +-
 gdb/testsuite/gdb.base/duplicate-bp.exp       |  2 +-
 gdb/testsuite/gdb.base/early-init-file.exp    |  2 +-
 gdb/testsuite/gdb.base/eh_return.exp          |  2 +-
 gdb/testsuite/gdb.base/ena-dis-br.exp         |  2 +-
 gdb/testsuite/gdb.base/endianity.exp          |  2 +-
 gdb/testsuite/gdb.base/ending-run.exp         |  2 +-
 gdb/testsuite/gdb.base/enum_cond.exp          |  2 +-
 gdb/testsuite/gdb.base/enumval.exp            |  2 +-
 gdb/testsuite/gdb.base/eu-strip-infcall.exp   |  4 ++--
 .../gdb.base/eval-avoid-side-effects.exp      |  4 ++--
 gdb/testsuite/gdb.base/examine-backward.exp   |  4 ++--
 gdb/testsuite/gdb.base/exe-lock.exp           |  2 +-
 .../gdb.base/execl-update-breakpoints.exp     |  8 ++++----
 gdb/testsuite/gdb.base/execution-termios.exp  |  2 +-
 gdb/testsuite/gdb.base/exitsignal.exp         |  8 ++++----
 gdb/testsuite/gdb.base/expand-psymtabs.exp    |  2 +-
 gdb/testsuite/gdb.base/fileio.exp             |  2 +-
 gdb/testsuite/gdb.base/filesym.exp            |  4 ++--
 gdb/testsuite/gdb.base/find-unmapped.exp      |  4 ++--
 gdb/testsuite/gdb.base/finish-pretty.exp      |  2 +-
 gdb/testsuite/gdb.base/finish.exp             |  2 +-
 gdb/testsuite/gdb.base/float.exp              |  2 +-
 gdb/testsuite/gdb.base/float128.exp           |  2 +-
 gdb/testsuite/gdb.base/floatn.exp             |  2 +-
 gdb/testsuite/gdb.base/foll-fork-syscall.exp  |  2 +-
 gdb/testsuite/gdb.base/foll-fork.exp          |  2 +-
 gdb/testsuite/gdb.base/foll-vfork.exp         |  6 +++---
 .../gdb.base/fork-print-inferior-events.exp   |  2 +-
 gdb/testsuite/gdb.base/fortran-sym-case.exp   |  4 ++--
 .../gdb.base/frame-info-consistent.exp        |  2 +-
 gdb/testsuite/gdb.base/frame-selection.exp    |  2 +-
 .../gdb.base/frame-unwind-disable.exp         |  2 +-
 gdb/testsuite/gdb.base/frameapply.exp         |  2 +-
 gdb/testsuite/gdb.base/freebpcmd.exp          |  2 +-
 gdb/testsuite/gdb.base/fullname.exp           |  6 +++---
 gdb/testsuite/gdb.base/fullpath-expand.exp    |  4 ++--
 gdb/testsuite/gdb.base/func-ptr.exp           |  2 +-
 gdb/testsuite/gdb.base/func-ptrs.exp          |  4 ++--
 gdb/testsuite/gdb.base/funcargs.exp           |  2 +-
 .../gdb.base/gcore-buffer-overflow.exp        |  2 +-
 gdb/testsuite/gdb.base/gcore-memory-usage.exp |  2 +-
 gdb/testsuite/gdb.base/gcore-relro-pie.exp    |  8 ++++----
 gdb/testsuite/gdb.base/gcore-tls-pie.exp      | 10 +++++-----
 gdb/testsuite/gdb.base/gcore.exp              |  4 ++--
 gdb/testsuite/gdb.base/gdb-index-err.exp      |  4 ++--
 gdb/testsuite/gdb.base/gdb-sigterm.exp        |  2 +-
 gdb/testsuite/gdb.base/gdb1090.exp            |  2 +-
 gdb/testsuite/gdb.base/gdb11530.exp           |  2 +-
 gdb/testsuite/gdb.base/gdb11531.exp           |  2 +-
 gdb/testsuite/gdb.base/gdb1821.exp            |  2 +-
 gdb/testsuite/gdb.base/gdbvars.exp            |  2 +-
 gdb/testsuite/gdb.base/gnu-debugdata.exp      | 20 +++++++++----------
 gdb/testsuite/gdb.base/gnu_vector.exp         |  2 +-
 gdb/testsuite/gdb.base/gstack.exp             |  2 +-
 gdb/testsuite/gdb.base/hashline1.exp          |  2 +-
 gdb/testsuite/gdb.base/hashline2.exp          |  2 +-
 gdb/testsuite/gdb.base/hashline3.exp          |  2 +-
 .../gdb.base/hbreak-in-shr-unsupported.exp    |  2 +-
 gdb/testsuite/gdb.base/hbreak-unmapped.exp    |  4 ++--
 gdb/testsuite/gdb.base/hbreak.exp             |  4 ++--
 gdb/testsuite/gdb.base/hbreak2.exp            |  4 ++--
 gdb/testsuite/gdb.base/history-duplicates.exp |  2 +-
 gdb/testsuite/gdb.base/hook-stop.exp          |  2 +-
 .../gdb.base/hw-sw-break-same-address.exp     |  4 ++--
 gdb/testsuite/gdb.base/include-main.exp       |  2 +-
 gdb/testsuite/gdb.base/included.exp           |  2 +-
 gdb/testsuite/gdb.base/infcall-exec.exp       |  6 +++---
 gdb/testsuite/gdb.base/infcall-input.exp      |  4 ++--
 gdb/testsuite/gdb.base/inferior-died.exp      |  2 +-
 gdb/testsuite/gdb.base/infnan.exp             |  2 +-
 .../info-locals-unused-static-var.exp         |  2 +-
 gdb/testsuite/gdb.base/info-macros.exp        |  4 ++--
 gdb/testsuite/gdb.base/info-os.exp            |  6 +++---
 gdb/testsuite/gdb.base/info-proc.exp          |  2 +-
 gdb/testsuite/gdb.base/info-shared.exp        |  6 +++---
 gdb/testsuite/gdb.base/info-target.exp        |  2 +-
 gdb/testsuite/gdb.base/info-var.exp           |  2 +-
 gdb/testsuite/gdb.base/info_minsym.exp        |  2 +-
 gdb/testsuite/gdb.base/info_qt.exp            |  2 +-
 gdb/testsuite/gdb.base/info_sources.exp       |  4 ++--
 gdb/testsuite/gdb.base/info_sources_2.exp     |  2 +-
 .../infoline-reloc-main-from-zero.exp         |  2 +-
 gdb/testsuite/gdb.base/infoline.exp           |  2 +-
 .../gdb.base/inline-frame-cycle-unwind.exp    |  2 +-
 gdb/testsuite/gdb.base/interp.exp             |  2 +-
 gdb/testsuite/gdb.base/interrupt-a.exp        |  4 ++--
 .../gdb.base/interrupt-daemon-attach.exp      |  2 +-
 gdb/testsuite/gdb.base/interrupt-daemon.exp   |  2 +-
 gdb/testsuite/gdb.base/interrupt-noterm.exp   |  4 ++--
 gdb/testsuite/gdb.base/interrupt.exp          |  2 +-
 gdb/testsuite/gdb.base/jit-attach-pie.exp     |  2 +-
 gdb/testsuite/gdb.base/jit-reader-simple.exp  |  4 ++--
 gdb/testsuite/gdb.base/jit-reader.exp         |  4 ++--
 gdb/testsuite/gdb.base/jump-inline.exp        |  4 ++--
 gdb/testsuite/gdb.base/jump.exp               |  4 ++--
 .../gdb.base/jump_multiple_objfiles.exp       |  4 ++--
 gdb/testsuite/gdb.base/kill-after-signal.exp  |  4 ++--
 .../gdb.base/kill-detach-inferiors-cmd.exp    |  2 +-
 gdb/testsuite/gdb.base/kill-during-detach.exp |  2 +-
 gdb/testsuite/gdb.base/killed-outside.exp     |  2 +-
 .../gdb.base/label-without-address.exp        |  4 ++--
 gdb/testsuite/gdb.base/label.exp              |  2 +-
 gdb/testsuite/gdb.base/langs.exp              |  2 +-
 gdb/testsuite/gdb.base/ldbl_e308.exp          |  4 ++--
 gdb/testsuite/gdb.base/limited-length.exp     |  2 +-
 gdb/testsuite/gdb.base/line-symtabs.exp       |  4 ++--
 gdb/testsuite/gdb.base/line65535.exp          |  2 +-
 gdb/testsuite/gdb.base/list-ambiguous.exp     |  2 +-
 gdb/testsuite/gdb.base/list-before-start.exp  |  2 +-
 .../gdb.base/list-missing-source.exp          |  2 +-
 gdb/testsuite/gdb.base/list-nodebug.exp       |  2 +-
 gdb/testsuite/gdb.base/list.exp               |  2 +-
 gdb/testsuite/gdb.base/load-command.exp       |  4 ++--
 .../gdb.base/long-inferior-output.exp         |  2 +-
 gdb/testsuite/gdb.base/longest-types.exp      |  2 +-
 gdb/testsuite/gdb.base/macscp.exp             |  2 +-
 gdb/testsuite/gdb.base/main-c.exp             |  2 +-
 .../maint-expand-symbols-header-file.exp      |  4 ++--
 .../maint-info-inline-frames-and-blocks.exp   |  2 +-
 .../gdb.base/maint-info-sections.exp          |  4 ++--
 .../gdb.base/maint-print-frame-id.exp         |  4 ++--
 gdb/testsuite/gdb.base/maint.exp              |  2 +-
 gdb/testsuite/gdb.base/many-completions.exp   |  2 +-
 gdb/testsuite/gdb.base/many-headers.exp       |  4 ++--
 gdb/testsuite/gdb.base/max-value-size.exp     |  2 +-
 gdb/testsuite/gdb.base/memattr.exp            |  2 +-
 gdb/testsuite/gdb.base/memops-watchpoint.exp  |  4 ++--
 gdb/testsuite/gdb.base/memtag.exp             |  6 +++---
 gdb/testsuite/gdb.base/mips_pro.exp           |  2 +-
 gdb/testsuite/gdb.base/morestack.exp          |  4 ++--
 gdb/testsuite/gdb.base/msym-lang.exp          |  2 +-
 gdb/testsuite/gdb.base/nested-addr.exp        |  4 ++--
 gdb/testsuite/gdb.base/nested-subp1.exp       |  4 ++--
 gdb/testsuite/gdb.base/nested-subp2.exp       |  4 ++--
 gdb/testsuite/gdb.base/nested-subp3.exp       |  4 ++--
 gdb/testsuite/gdb.base/new-ui-echo.exp        |  2 +-
 .../gdb.base/new-ui-pending-input.exp         |  2 +-
 gdb/testsuite/gdb.base/new-ui.exp             |  2 +-
 gdb/testsuite/gdb.base/nextoverexit.exp       |  4 ++--
 .../gdb.base/non-lazy-array-index.exp         |  4 ++--
 gdb/testsuite/gdb.base/noreturn-finish.exp    |  2 +-
 gdb/testsuite/gdb.base/noreturn-return.exp    |  2 +-
 gdb/testsuite/gdb.base/offsets.exp            |  2 +-
 gdb/testsuite/gdb.base/opaque.exp             |  2 +-
 gdb/testsuite/gdb.base/options.exp            |  4 ++--
 .../paginate-after-ctrl-c-running.exp         |  2 +-
 .../gdb.base/paginate-bg-execution.exp        |  2 +-
 .../gdb.base/paginate-execution-startup.exp   |  2 +-
 .../gdb.base/paginate-inferior-exit.exp       |  2 +-
 gdb/testsuite/gdb.base/patch.exp              |  2 +-
 gdb/testsuite/gdb.base/pc-fp.exp              |  2 +-
 gdb/testsuite/gdb.base/pending.exp            |  2 +-
 gdb/testsuite/gdb.base/permissions.exp        |  2 +-
 gdb/testsuite/gdb.base/persistent-lang.exp    |  2 +-
 gdb/testsuite/gdb.base/pie-execl.exp          |  4 ++--
 gdb/testsuite/gdb.base/pr10179.exp            |  4 ++--
 gdb/testsuite/gdb.base/prelink.exp            |  8 ++++----
 .../premature-dummy-frame-removal.exp         |  2 +-
 gdb/testsuite/gdb.base/pretty-array.exp       |  4 ++--
 gdb/testsuite/gdb.base/pretty-print.exp       |  4 ++--
 .../gdb.base/print-internal-string.exp        |  2 +-
 .../gdb.base/print-symbol-loading.exp         |  8 ++++----
 gdb/testsuite/gdb.base/printf-wchar_t.exp     |  4 ++--
 gdb/testsuite/gdb.base/prologue-include.exp   |  2 +-
 gdb/testsuite/gdb.base/psym-external-decl.exp |  4 ++--
 gdb/testsuite/gdb.base/psymtab.exp            |  2 +-
 gdb/testsuite/gdb.base/ptype-offsets-c.exp    |  2 +-
 gdb/testsuite/gdb.base/ptype-offsets.exp      |  2 +-
 gdb/testsuite/gdb.base/ptype.exp              | 10 +++++-----
 gdb/testsuite/gdb.base/random-signal.exp      |  2 +-
 gdb/testsuite/gdb.base/randomize.exp          |  4 ++--
 gdb/testsuite/gdb.base/range-stepping.exp     |  6 +++---
 gdb/testsuite/gdb.base/readline-ask.exp       |  4 ++--
 .../gdb.base/readline-commands-eof.exp        |  4 ++--
 gdb/testsuite/gdb.base/readnever.exp          |  2 +-
 gdb/testsuite/gdb.base/realname-expand.exp    |  4 ++--
 gdb/testsuite/gdb.base/recpar.exp             |  4 ++--
 gdb/testsuite/gdb.base/recurse.exp            |  2 +-
 gdb/testsuite/gdb.base/reggroups.exp          |  2 +-
 gdb/testsuite/gdb.base/relational.exp         |  2 +-
 gdb/testsuite/gdb.base/remote.exp             |  2 +-
 gdb/testsuite/gdb.base/reread-readsym.exp     |  2 +-
 gdb/testsuite/gdb.base/restore.exp            |  4 ++--
 gdb/testsuite/gdb.base/return-3.exp           |  4 ++--
 gdb/testsuite/gdb.base/return.exp             |  2 +-
 .../gdb.base/retval-large-struct.exp          |  4 ++--
 gdb/testsuite/gdb.base/rtld-step.exp          |  6 +++---
 gdb/testsuite/gdb.base/run-after-attach.exp   |  2 +-
 gdb/testsuite/gdb.base/run-fail-twice.exp     |  2 +-
 gdb/testsuite/gdb.base/save-bp.exp            |  6 +++---
 .../gdb.base/scope-hw-watch-disable.exp       |  4 ++--
 gdb/testsuite/gdb.base/scope.exp              |  2 +-
 gdb/testsuite/gdb.base/sect-cmd.exp           |  2 +-
 gdb/testsuite/gdb.base/sepdebug.exp           |  4 ++--
 gdb/testsuite/gdb.base/sepsymtab.exp          |  4 ++--
 gdb/testsuite/gdb.base/server-del-break.exp   |  2 +-
 gdb/testsuite/gdb.base/set-cwd.exp            |  2 +-
 gdb/testsuite/gdb.base/set-inferior-tty.exp   |  2 +-
 gdb/testsuite/gdb.base/set-lang-auto.exp      |  2 +-
 gdb/testsuite/gdb.base/set-noassign.exp       |  2 +-
 gdb/testsuite/gdb.base/settings.exp           |  4 ++--
 gdb/testsuite/gdb.base/setvar.exp             |  2 +-
 .../gdb.base/share-env-with-gdbserver.exp     |  2 +-
 gdb/testsuite/gdb.base/share-psymtabs-bt.exp  |  6 +++---
 gdb/testsuite/gdb.base/sigall.exp             |  2 +-
 gdb/testsuite/gdb.base/sigbpt.exp             |  2 +-
 gdb/testsuite/gdb.base/siginfo-addr.exp       |  2 +-
 gdb/testsuite/gdb.base/siginfo-infcall.exp    |  4 ++--
 gdb/testsuite/gdb.base/siginfo-obj.exp        |  2 +-
 gdb/testsuite/gdb.base/siginfo.exp            |  2 +-
 .../gdb.base/signals-state-child.exp          |  8 ++++----
 gdb/testsuite/gdb.base/signals.exp            |  2 +-
 .../gdb.base/signed-builtin-types.exp         |  8 ++++----
 gdb/testsuite/gdb.base/signest.exp            |  6 +++---
 gdb/testsuite/gdb.base/sigstep.exp            |  2 +-
 gdb/testsuite/gdb.base/sizeof.exp             |  2 +-
 gdb/testsuite/gdb.base/skip-inline.exp        |  2 +-
 gdb/testsuite/gdb.base/skip-solib.exp         |  6 +++---
 gdb/testsuite/gdb.base/skip.exp               |  2 +-
 gdb/testsuite/gdb.base/skipcxx.exp            |  2 +-
 gdb/testsuite/gdb.base/solib-corrupted.exp    |  2 +-
 gdb/testsuite/gdb.base/solib-nodir.exp        |  2 +-
 .../gdb.base/solib-probes-nosharedlibrary.exp |  2 +-
 gdb/testsuite/gdb.base/solib-search.exp       |  4 ++--
 gdb/testsuite/gdb.base/solib-vanish.exp       |  4 ++--
 gdb/testsuite/gdb.base/source-execution.exp   |  2 +-
 gdb/testsuite/gdb.base/source-open.exp        |  2 +-
 .../gdb.base/sss-bp-on-user-bp-2.exp          |  2 +-
 gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp  |  4 ++--
 gdb/testsuite/gdb.base/stale-infcall.exp      |  4 ++--
 gdb/testsuite/gdb.base/start-cpp.exp          |  4 ++--
 gdb/testsuite/gdb.base/start.exp              |  4 ++--
 gdb/testsuite/gdb.base/starti.exp             |  4 ++--
 gdb/testsuite/gdb.base/startup-with-shell.exp |  2 +-
 gdb/testsuite/gdb.base/step-bt.exp            |  2 +-
 .../gdb.base/step-indirect-call-thunk.exp     |  4 ++--
 .../gdb.base/step-into-other-file.exp         |  4 ++--
 gdb/testsuite/gdb.base/step-line.exp          |  2 +-
 gdb/testsuite/gdb.base/step-over-exit.exp     |  6 +++---
 .../gdb.base/step-over-no-symbols.exp         |  2 +-
 gdb/testsuite/gdb.base/step-over-syscall.exp  |  4 ++--
 .../gdb.base/step-resume-infcall.exp          |  6 +++---
 .../gdb.base/step-sw-breakpoint-adjust-pc.exp |  2 +-
 gdb/testsuite/gdb.base/step-symless.exp       |  4 ++--
 gdb/testsuite/gdb.base/store.exp              |  2 +-
 gdb/testsuite/gdb.base/structs2.exp           |  2 +-
 gdb/testsuite/gdb.base/structs3.exp           |  4 ++--
 gdb/testsuite/gdb.base/style.exp              |  2 +-
 gdb/testsuite/gdb.base/symbol-alias.exp       |  2 +-
 .../symbol-without-target_section.exp         |  4 ++--
 gdb/testsuite/gdb.base/symfile-warn.exp       |  2 +-
 gdb/testsuite/gdb.base/symlink-sourcefile.exp |  4 ++--
 .../gdb.base/symtab-search-order.exp          |  2 +-
 gdb/testsuite/gdb.base/term.exp               |  2 +-
 .../gdb.base/thread-bp-multi-loc.exp          |  6 +++---
 gdb/testsuite/gdb.base/tls-dlobj.exp          | 12 +++++------
 gdb/testsuite/gdb.base/tls-multiobj.exp       |  6 +++---
 gdb/testsuite/gdb.base/traced-thread.exp      |  2 +-
 gdb/testsuite/gdb.base/ui-redirect.exp        |  4 ++--
 gdb/testsuite/gdb.base/until-nodebug.exp      |  2 +-
 .../gdb.base/until-trailing-insns.exp         |  6 +++---
 gdb/testsuite/gdb.base/until.exp              |  2 +-
 .../gdb.base/unwind-on-each-insn.exp.tcl      |  2 +-
 gdb/testsuite/gdb.base/unwindonsignal.exp     |  2 +-
 gdb/testsuite/gdb.base/utf8-identifiers.exp   |  4 ++--
 gdb/testsuite/gdb.base/valgrind-bt.exp        |  4 ++--
 gdb/testsuite/gdb.base/valgrind-disp-step.exp |  4 ++--
 gdb/testsuite/gdb.base/valgrind-infcall-2.exp |  4 ++--
 gdb/testsuite/gdb.base/valgrind-infcall.exp   |  4 ++--
 gdb/testsuite/gdb.base/value-double-free.exp  |  4 ++--
 .../gdb.base/value-history-unavailable.exp    |  2 +-
 gdb/testsuite/gdb.base/vdso-warning.exp       |  2 +-
 .../gdb.base/vfork-follow-parent.exp          |  2 +-
 gdb/testsuite/gdb.base/vla-datatypes.exp      |  4 ++--
 gdb/testsuite/gdb.base/vla-ptr.exp            |  4 ++--
 gdb/testsuite/gdb.base/vla-sideeffect.exp     |  4 ++--
 gdb/testsuite/gdb.base/vla-struct-fields.exp  |  4 ++--
 gdb/testsuite/gdb.base/vla-stub.exp           |  2 +-
 gdb/testsuite/gdb.base/volatile.exp           |  2 +-
 gdb/testsuite/gdb.base/watch-bitfields.exp    |  2 +-
 gdb/testsuite/gdb.base/watch-cond-infcall.exp |  2 +-
 gdb/testsuite/gdb.base/watch-cond.exp         |  2 +-
 gdb/testsuite/gdb.base/watch-non-mem.exp      |  2 +-
 gdb/testsuite/gdb.base/watch-read.exp         |  2 +-
 gdb/testsuite/gdb.base/watch-vfork.exp        |  2 +-
 .../gdb.base/watchpoint-cond-gone.exp         |  4 ++--
 gdb/testsuite/gdb.base/watchpoint-delete.exp  |  4 ++--
 .../gdb.base/watchpoint-hw-attach.exp         |  2 +-
 .../gdb.base/watchpoint-hw-hit-once.exp       |  4 ++--
 gdb/testsuite/gdb.base/watchpoint-hw.exp      |  4 ++--
 .../gdb.base/watchpoint-reuse-slot.exp        |  2 +-
 gdb/testsuite/gdb.base/watchpoint-running.exp |  2 +-
 .../watchpoint-stops-at-right-insn.exp        |  2 +-
 .../gdb.base/watchpoint-unaligned.exp         |  4 ++--
 gdb/testsuite/gdb.base/watchpoints.exp        |  2 +-
 gdb/testsuite/gdb.base/wchar.exp              |  2 +-
 gdb/testsuite/gdb.base/whatis-exp.exp         |  2 +-
 gdb/testsuite/gdb.base/with-mf.exp            |  4 ++--
 gdb/testsuite/gdb.base/with.exp               |  2 +-
 gdb/testsuite/gdb.base/write_mem.exp          |  2 +-
 .../gdb.base/wrong_frame_bt_full.exp          |  4 ++--
 421 files changed, 648 insertions(+), 648 deletions(-)
  

Patch

diff --git a/gdb/testsuite/gdb.base/a2-run.exp b/gdb/testsuite/gdb.base/a2-run.exp
index c5df2cce4695..725f8fac5349 100644
--- a/gdb/testsuite/gdb.base/a2-run.exp
+++ b/gdb/testsuite/gdb.base/a2-run.exp
@@ -29,11 +29,11 @@  standard_testfile run.c
 set flags {}
 lappend flags debug
 lappend_include_file flags $srcdir/lib/unbuffer_output.c
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile $flags] } {
-    return -1
+    return
 }
 
 # Run with no arguments.
 gdb_run_cmd
 
diff --git a/gdb/testsuite/gdb.base/access-mem-running.exp b/gdb/testsuite/gdb.base/access-mem-running.exp
index 7a5468d5307f..11dea64a6338 100644
--- a/gdb/testsuite/gdb.base/access-mem-running.exp
+++ b/gdb/testsuite/gdb.base/access-mem-running.exp
@@ -16,11 +16,11 @@ 
 # Test that we can access memory while the inferior is running.
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug}] == -1} {
-    return -1
+    return
 }
 
 # The test proper.  NON_STOP indicates whether we're testing in
 # non-stop, or all-stop mode.
 
diff --git a/gdb/testsuite/gdb.base/add-symbol-file-attach.exp b/gdb/testsuite/gdb.base/add-symbol-file-attach.exp
index 44faa8dbd3cf..b76c4d588d95 100644
--- a/gdb/testsuite/gdb.base/add-symbol-file-attach.exp
+++ b/gdb/testsuite/gdb.base/add-symbol-file-attach.exp
@@ -34,11 +34,11 @@  require can_spawn_for_attach
 
 standard_testfile
 
 if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Use 'spawn_wait_for_attach' to start the test program running.  It'll
 # also sleep for a short time in order to make sure that it's running
 # so that GDB may attach to it.
diff --git a/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp b/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp
index 85fd20ae6984..102c68bf9f53 100644
--- a/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp
+++ b/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp
@@ -20,11 +20,11 @@  standard_testfile .cc
 
 require allow_cplus_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 	  {debug c++}] } {
-    return -1
+    return
 }
 
 set lineno [gdb_get_line_number "multiple locations here"]
 
 # advance/until to an inlined line number, which has been inlined
diff --git a/gdb/testsuite/gdb.base/advance.exp b/gdb/testsuite/gdb.base/advance.exp
index dda32c05c830..fe05dd3a3c37 100644
--- a/gdb/testsuite/gdb.base/advance.exp
+++ b/gdb/testsuite/gdb.base/advance.exp
@@ -16,11 +16,11 @@ 
 # advance.exp -- Expect script to test 'advance' in gdb
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/all-bin.exp b/gdb/testsuite/gdb.base/all-bin.exp
index 9c8345218d14..12b530be77d8 100644
--- a/gdb/testsuite/gdb.base/all-bin.exp
+++ b/gdb/testsuite/gdb.base/all-bin.exp
@@ -28,11 +28,11 @@ 
 #
 
 standard_testfile all-types.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 #
 # set it up at a breakpoint so we can play with the variable values
 #
diff --git a/gdb/testsuite/gdb.base/annota-input-while-running.exp b/gdb/testsuite/gdb.base/annota-input-while-running.exp
index a1908d449605..747175f0ab5f 100644
--- a/gdb/testsuite/gdb.base/annota-input-while-running.exp
+++ b/gdb/testsuite/gdb.base/annota-input-while-running.exp
@@ -17,11 +17,11 @@ 
 # into effect when we run a foreground command.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 # 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]} {
diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
index d8c8abcbf569..35eaf26103e2 100644
--- a/gdb/testsuite/gdb.base/annota1.exp
+++ b/gdb/testsuite/gdb.base/annota1.exp
@@ -33,11 +33,11 @@  set breakpoints_invalid "\r\n\032\032breakpoints-invalid\r\n"
 #
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 #
 # break in main
 #
diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
index 6824e4d70980..8a69350f1d5d 100644
--- a/gdb/testsuite/gdb.base/annota3.exp
+++ b/gdb/testsuite/gdb.base/annota3.exp
@@ -27,11 +27,11 @@  require target_can_use_run_cmd
 #
 
 standard_testfile
 
 if  { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 
 #
 # break in main
diff --git a/gdb/testsuite/gdb.base/annotate-symlink.exp b/gdb/testsuite/gdb.base/annotate-symlink.exp
index acf4b540e804..9d6f8fe3a680 100644
--- a/gdb/testsuite/gdb.base/annotate-symlink.exp
+++ b/gdb/testsuite/gdb.base/annotate-symlink.exp
@@ -24,23 +24,23 @@  set srcfilelink [build_standard_output_file realname-expand-link.c]
 
 remote_exec build "ln -sf ${srcdirabs}/${subdir}/${srcfile2} $srcfilelink"
 
 if { [file type $srcfilelink] != "link" } {
     unsupported "target directory cannot have symbolic links"
-    return -1
+    return
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcfilelink}" "${binfile}" \
 		  executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint func message
 
 gdb_test_no_output "set annotate 1"
diff --git a/gdb/testsuite/gdb.base/anon.exp b/gdb/testsuite/gdb.base/anon.exp
index 700744e6631b..6a077aa267cb 100644
--- a/gdb/testsuite/gdb.base/anon.exp
+++ b/gdb/testsuite/gdb.base/anon.exp
@@ -15,11 +15,11 @@ 
 #
 
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.base/args.exp b/gdb/testsuite/gdb.base/args.exp
index bd10c90b6cd7..d2d5a601b1ee 100644
--- a/gdb/testsuite/gdb.base/args.exp
+++ b/gdb/testsuite/gdb.base/args.exp
@@ -25,11 +25,11 @@  require {expr {[have_startup_shell] != -1}}
 
 standard_testfile
 
 if {[build_executable $testfile.exp $testfile $srcfile] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Assuming a running GDB.  Check the status of the single inferior
 # argument feature.  When this feature is on GDB passes inferior
 # arguments as a single combined string.  When this feature is off GDB
diff --git a/gdb/testsuite/gdb.base/argv0-symlink.exp b/gdb/testsuite/gdb.base/argv0-symlink.exp
index 3ddc1f7356d4..6b05bba205d6 100644
--- a/gdb/testsuite/gdb.base/argv0-symlink.exp
+++ b/gdb/testsuite/gdb.base/argv0-symlink.exp
@@ -27,11 +27,11 @@  require {!is_remote host}
 standard_testfile
 
 set has_argv0 [gdb_has_argv0]
 
 if { [build_executable ${testfile}.exp ${testfile} ${srcfile}] == -1 } {
-    return -1
+    return
 }
 
 with_test_prefix "file symlink" {
 
     set test "kept name"
diff --git a/gdb/testsuite/gdb.base/arithmet.exp b/gdb/testsuite/gdb.base/arithmet.exp
index 2d03a62c5306..2911d70afdb3 100644
--- a/gdb/testsuite/gdb.base/arithmet.exp
+++ b/gdb/testsuite/gdb.base/arithmet.exp
@@ -27,11 +27,11 @@ 
 #
 
 standard_testfile int-type.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings}]} {
-    return -1
+    return
 }
 
 
 #
 # set it up at a breakpoint so we can play with the variable values
diff --git a/gdb/testsuite/gdb.base/array-indices.exp.tcl b/gdb/testsuite/gdb.base/array-indices.exp.tcl
index 8f3c0ad03d4e..82f1d2918992 100644
--- a/gdb/testsuite/gdb.base/array-indices.exp.tcl
+++ b/gdb/testsuite/gdb.base/array-indices.exp.tcl
@@ -17,11 +17,11 @@ 
 
 standard_testfile ${srcdir}/gdb.base/array-repeat.c
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	[list debug ${lang}]]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set print array-indexes on"
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/array-repeat.exp.tcl b/gdb/testsuite/gdb.base/array-repeat.exp.tcl
index d10d441325b5..e4c19ac205c3 100644
--- a/gdb/testsuite/gdb.base/array-repeat.exp.tcl
+++ b/gdb/testsuite/gdb.base/array-repeat.exp.tcl
@@ -17,11 +17,11 @@ 
 
 standard_testfile ${srcdir}/gdb.base/array-repeat.c
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	[list debug ${lang}]]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     perror "Could not run to main."
     continue
diff --git a/gdb/testsuite/gdb.base/asmlabel.exp b/gdb/testsuite/gdb.base/asmlabel.exp
index 163ef2dc5c8d..15f3695d796c 100644
--- a/gdb/testsuite/gdb.base/asmlabel.exp
+++ b/gdb/testsuite/gdb.base/asmlabel.exp
@@ -32,11 +32,11 @@ 
 #
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/async.exp b/gdb/testsuite/gdb.base/async.exp
index c9318b9b2487..a3b40882f9b8 100644
--- a/gdb/testsuite/gdb.base/async.exp
+++ b/gdb/testsuite/gdb.base/async.exp
@@ -19,11 +19,11 @@ 
 #
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 #
 # set it up at a breakpoint so we can play with it
 #
diff --git a/gdb/testsuite/gdb.base/attach-deleted-exec.exp b/gdb/testsuite/gdb.base/attach-deleted-exec.exp
index 7bd8db07ca49..61ee8647c9c4 100644
--- a/gdb/testsuite/gdb.base/attach-deleted-exec.exp
+++ b/gdb/testsuite/gdb.base/attach-deleted-exec.exp
@@ -21,11 +21,11 @@  require can_spawn_for_attach
 require {istarget *-linux*}
 
 standard_testfile
 
 if { [build_executable "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 set test_spawn_id [spawn_wait_for_attach $binfile]
 set testpid [spawn_id_get_pid $test_spawn_id]
 
diff --git a/gdb/testsuite/gdb.base/attach-fail-twice.exp b/gdb/testsuite/gdb.base/attach-fail-twice.exp
index 226ade56f7dc..b3a40ca9a7d6 100644
--- a/gdb/testsuite/gdb.base/attach-fail-twice.exp
+++ b/gdb/testsuite/gdb.base/attach-fail-twice.exp
@@ -18,11 +18,11 @@ 
 require can_spawn_for_attach
 
 standard_testfile
 
 if {[build_executable "failed to build" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 set test_spawn_id [spawn_wait_for_attach $binfile]
 set testpid [spawn_id_get_pid $test_spawn_id]
 
diff --git a/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp b/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp
index 3a9730d99c7c..ded09db5d137 100644
--- a/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp
+++ b/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp
@@ -21,11 +21,11 @@ 
 require can_spawn_for_attach
 
 standard_testfile
 
 if { [build_executable ${testfile}.exp ${testfile} $srcfile {debug}] == -1 } {
-    return -1
+    return
 }
 
 proc do_test {} {
     global binfile
     global decimal
diff --git a/gdb/testsuite/gdb.base/attach-pie-misread.exp b/gdb/testsuite/gdb.base/attach-pie-misread.exp
index be10db7e3a1e..a8002119d962 100644
--- a/gdb/testsuite/gdb.base/attach-pie-misread.exp
+++ b/gdb/testsuite/gdb.base/attach-pie-misread.exp
@@ -24,11 +24,11 @@  standard_testfile .c
 set genfile [standard_output_file ${testfile}-gen.h]
 set executable $testfile
 
 if {[build_executable_own_libs ${testfile}.exp $executable $srcfile \
 	 {pie}] == ""} {
-    return -1
+    return
 }
 
 # Program Headers:
 #   Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align
 #   LOAD           0x000000 0x0000000000400000 0x0000000000400000 0x134f5ec 0x134f5ec R E 0x200000
@@ -108,11 +108,11 @@  file delete -- $genfile
 
 set phdr [read_phdr $binfile "readelf rebuilt with stub_size"]
 set dynamic_vaddr_prelinkno [lindex $phdr 0]
 
 if {![prelink_yes $prelink_args]} {
-    return -1
+    return
 }
 
 set phdr [read_phdr $binfile "readelf with prelink -R"]
 set dynamic_vaddr_prelinkyes [lindex $phdr 0]
 
diff --git a/gdb/testsuite/gdb.base/attach-pie-noexec.exp b/gdb/testsuite/gdb.base/attach-pie-noexec.exp
index ab613d2543ad..54a4b0bffae7 100644
--- a/gdb/testsuite/gdb.base/attach-pie-noexec.exp
+++ b/gdb/testsuite/gdb.base/attach-pie-noexec.exp
@@ -17,11 +17,11 @@  require can_spawn_for_attach
 
 standard_testfile .c
 set executable ${testfile}
 
 if { [prepare_for_testing "failed to prepare" $executable "" [list debug pie]] } {
-    return -1
+    return
 }
 
 set arch ""
 set test "show architecture"
 gdb_test_multiple $test $test {
diff --git a/gdb/testsuite/gdb.base/attach-twice.exp b/gdb/testsuite/gdb.base/attach-twice.exp
index 96292d12818a..a3677f2fad92 100644
--- a/gdb/testsuite/gdb.base/attach-twice.exp
+++ b/gdb/testsuite/gdb.base/attach-twice.exp
@@ -17,11 +17,11 @@  require can_spawn_for_attach
 
 standard_testfile
 set executable ${testfile}
 
 if { [prepare_for_testing "failed to prepare" $executable] } {
-    return -1
+    return
 }
 
 # Start the program running and then wait for a bit, to be sure
 # that it can be attached to.
 
diff --git a/gdb/testsuite/gdb.base/attach-wait-input.exp b/gdb/testsuite/gdb.base/attach-wait-input.exp
index f7651abdcfd8..68979b3c9f97 100644
--- a/gdb/testsuite/gdb.base/attach-wait-input.exp
+++ b/gdb/testsuite/gdb.base/attach-wait-input.exp
@@ -32,11 +32,11 @@ 
 require !use_gdb_stub
 
 standard_testfile
 
 if {[build_executable "failed to build" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Start the program running, and return its PID, ready for attaching.
 
 proc start_program {testfile} {
diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp
index bffdfd9b1aa9..9b7814b40baf 100644
--- a/gdb/testsuite/gdb.base/attach.exp
+++ b/gdb/testsuite/gdb.base/attach.exp
@@ -28,25 +28,25 @@  remote_exec build "rm -f ${binfile} ${binfile2} ${binfile3}"
 
 # build the first test case
 #
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Build the in-system-call test
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
     untested "failed to compile in-system-call test"
-    return -1
+    return
 }
 
 # Build the third file, used to check attach when the exec-file has changed.
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile3}" "${binfile3}" executable {debug}] != "" } {
     untested "failed to compile attach exec-file changed test"
-    return -1
+    return
 }
 
 # This is a test of the error cases for gdb's ability to attach to a
 # running process.
 
diff --git a/gdb/testsuite/gdb.base/auto-connect-native-target.exp b/gdb/testsuite/gdb.base/auto-connect-native-target.exp
index 26434396cc6a..4529d68e16c6 100644
--- a/gdb/testsuite/gdb.base/auto-connect-native-target.exp
+++ b/gdb/testsuite/gdb.base/auto-connect-native-target.exp
@@ -17,11 +17,11 @@ 
 # native targets.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 require have_native_target
 
 # Returns the topmost target pushed on the target stack.  TEST is used
diff --git a/gdb/testsuite/gdb.base/auto-load.exp b/gdb/testsuite/gdb.base/auto-load.exp
index c890117bd951..0b974d43d6d9 100644
--- a/gdb/testsuite/gdb.base/auto-load.exp
+++ b/gdb/testsuite/gdb.base/auto-load.exp
@@ -23,11 +23,11 @@  set targetscriptdir "${targetdir}/[file dirname ${binfile}]"
 set targetscript "${targetscriptdir}/${testfile}-gdb.gdb"
 
 remote_exec host "rm -rf ${targetdir}"
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 remote_exec host "mkdir -p ${targetscriptdir}"
 remote_exec host "cp ${sourcescript} ${targetscript}"
 
diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
index ec0172c88bb7..79e897078e5d 100644
--- a/gdb/testsuite/gdb.base/auxv.exp
+++ b/gdb/testsuite/gdb.base/auxv.exp
@@ -28,11 +28,11 @@  set gcorefile ${binfile}.gcore
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 		  {debug additional_flags=-DUSE_RLIMIT}] != ""
      && [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 		  {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Use a fresh directory to confine the native core dumps.
 # Make it the working directory for the inferior.
 set coredir [standard_output_file coredir.[getpid]]
diff --git a/gdb/testsuite/gdb.base/backtrace.exp b/gdb/testsuite/gdb.base/backtrace.exp
index 00e4681b93aa..612dd2ad6a87 100644
--- a/gdb/testsuite/gdb.base/backtrace.exp
+++ b/gdb/testsuite/gdb.base/backtrace.exp
@@ -16,11 +16,11 @@ 
 # A place for miscellaneous tests related to backtrace.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/bang.exp b/gdb/testsuite/gdb.base/bang.exp
index d6d7adf9d8e7..8a341d95fe56 100644
--- a/gdb/testsuite/gdb.base/bang.exp
+++ b/gdb/testsuite/gdb.base/bang.exp
@@ -18,11 +18,11 @@ 
 
 standard_testfile args.c
 
 if {[prepare_for_testing "failed to prepare" ${testfile}! $srcfile \
 	 {debug nowarnings}]} {
-    return -1
+    return
 }
 
 # Verify that we can run the program and that it terminates normally.
 
 runto_main
diff --git a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
index 6587e71fd7ed..2aae194e1187 100644
--- a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
+++ b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
@@ -17,11 +17,11 @@ 
 # wrong state.
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 set file_arg $binfile
 if {[is_remote host]} {
   set file_arg [remote_download host $file_arg]
diff --git a/gdb/testsuite/gdb.base/bfd-errors.exp b/gdb/testsuite/gdb.base/bfd-errors.exp
index 93d108cc1488..d4e12f78d99e 100644
--- a/gdb/testsuite/gdb.base/bfd-errors.exp
+++ b/gdb/testsuite/gdb.base/bfd-errors.exp
@@ -55,11 +55,11 @@  set binfile_lib [standard_output_file ${lib_basename}.so]
 set lib_flags debug
 
 # Compile shared library:
 if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Open the shared library and determine some basic facts.  The key
 # things that we need to learn are 1) whether the solib is 32-bit or
 # 64-bit ELF file, and 2) the endianness.
@@ -69,11 +69,11 @@  fconfigure $solib_fp -translation binary
 # Read and check EI_MAG to verify that it's really an ELF file.
 set data [read $solib_fp 4]
 if { ![string equal $data "\x7fELF"] } {
     close $solib_fp
     untested "shared library is not an ELF file"
-    return -1
+    return
 }
 
 # Read EI_CLASS for ELF32 versus ELF64.
 set data [read $solib_fp 1]
 set is_elf64 [string equal $data "\x02"]
@@ -91,11 +91,11 @@  if { [catch {exec $objcopy_program \
 		 --dump-section .dynsym=${binfile_lib}.dynsym \
 		 --dump-section .dynstr=${binfile_lib}.dynstr \
 		 ${binfile_lib}} output] } {
     untested "failed objcopy dump-section"
     verbose -log "objcopy output: $output"
-    return -1
+    return
 }
 
 # Determine length of .dynstr.  We'll use the length for creating invalid
 # offsets into .dynstr.
 set dynstr_len [file size ${binfile_lib}.dynstr]
@@ -142,11 +142,11 @@  close $dynsym_fp
 if { [catch {exec $objcopy_program \
 		 --update-section .dynsym=${binfile_lib}.dynsym \
 		 ${binfile_lib}} output] } {
     untested "failed objcopy update-section"
     verbose -log "objcopy output: $output"
-    return -1
+    return
 }
 
 clean_restart
 
 # Count number of distinct BFD error messages via 'bfd_error_count'
diff --git a/gdb/testsuite/gdb.base/bg-exec-sigint-bp-cond.exp b/gdb/testsuite/gdb.base/bg-exec-sigint-bp-cond.exp
index 43ef98e16da6..44b84b3755dc 100644
--- a/gdb/testsuite/gdb.base/bg-exec-sigint-bp-cond.exp
+++ b/gdb/testsuite/gdb.base/bg-exec-sigint-bp-cond.exp
@@ -21,11 +21,11 @@ 
 require {!is_remote host}
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Run the test.  Sets a breakpoint with a condition that sends a
 # SIGINT to GDB, and ensures that that doesn't make the breakpoint hit
 # cause a premature stop.  This emulates pressing Ctrl-C just while
diff --git a/gdb/testsuite/gdb.base/bg-execution-repeat.exp b/gdb/testsuite/gdb.base/bg-execution-repeat.exp
index 7567a0fbba55..48d650c02533 100644
--- a/gdb/testsuite/gdb.base/bg-execution-repeat.exp
+++ b/gdb/testsuite/gdb.base/bg-execution-repeat.exp
@@ -18,11 +18,11 @@ 
 # PR gdb/17471.
 
 standard_testfile
 
 if { [build_executable "failed to prepare" ${testfile} $srcfile] } {
-    return -1
+    return
 }
 
 set linenum [gdb_get_line_number "set break here"]
 
 # Run the test proper.  CONTINUE_CMD is the background continue
diff --git a/gdb/testsuite/gdb.base/bitfields.exp b/gdb/testsuite/gdb.base/bitfields.exp
index 6f4ace22371a..8ec8e00393c7 100644
--- a/gdb/testsuite/gdb.base/bitfields.exp
+++ b/gdb/testsuite/gdb.base/bitfields.exp
@@ -17,11 +17,11 @@ 
 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 #
 # Test bitfield locating and uniqueness.
 # For each member, set that member to 1 and verify that the member (and only
diff --git a/gdb/testsuite/gdb.base/bitfields2.exp b/gdb/testsuite/gdb.base/bitfields2.exp
index 0f86a56db97b..dac6a32fc9fe 100644
--- a/gdb/testsuite/gdb.base/bitfields2.exp
+++ b/gdb/testsuite/gdb.base/bitfields2.exp
@@ -25,11 +25,11 @@ 
 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set has_signed_bitfields 1
 
 #
diff --git a/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp b/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp
index 4163c4c32b3d..368507b2409c 100644
--- a/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp
+++ b/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp
@@ -25,11 +25,11 @@  require {!target_info exists gdb,nosignals}
 require {!target_info exists gdb,nointerrupts}
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # See intro.
 
 proc do_test {} {
diff --git a/gdb/testsuite/gdb.base/bp-cmds-execution-x-script.exp b/gdb/testsuite/gdb.base/bp-cmds-execution-x-script.exp
index 491f1e2609f6..7204a3736c09 100644
--- a/gdb/testsuite/gdb.base/bp-cmds-execution-x-script.exp
+++ b/gdb/testsuite/gdb.base/bp-cmds-execution-x-script.exp
@@ -18,11 +18,11 @@ 
 # that has "continue" in its command list, and then does "run".
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 set x_file ${srcdir}/${subdir}/$testfile.gdb
 
 # Run the test proper.
diff --git a/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp
index 698c85c3e409..95c2811a3e03 100644
--- a/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp
+++ b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp
@@ -20,11 +20,11 @@ 
 # '-ex' option.
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 set script_file $srcdir/$subdir/$testfile.gdb
 
 save_vars { GDBFLAGS } {
diff --git a/gdb/testsuite/gdb.base/bp-cmds-sourced-script.exp b/gdb/testsuite/gdb.base/bp-cmds-sourced-script.exp
index e12016f2fc5e..2fa46d5bc093 100644
--- a/gdb/testsuite/gdb.base/bp-cmds-sourced-script.exp
+++ b/gdb/testsuite/gdb.base/bp-cmds-sourced-script.exp
@@ -17,11 +17,11 @@ 
 # expected when the commands are defined for multiple breakpoints.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 set script_file ${srcdir}/${subdir}/$testfile.gdb
 
 gdb_test "source $script_file" \
diff --git a/gdb/testsuite/gdb.base/bp-cond-failure.exp b/gdb/testsuite/gdb.base/bp-cond-failure.exp
index bde1eab21bd8..f6ca85027e4c 100644
--- a/gdb/testsuite/gdb.base/bp-cond-failure.exp
+++ b/gdb/testsuite/gdb.base/bp-cond-failure.exp
@@ -34,11 +34,11 @@  if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 # Run to main so that we connect to the target if using 'target
 # remote'.  This means that the is_address_zero_readable, and the
 # 'show breakpoint condition-evaluation' checks below will be
 # performed with the remote connection in place.
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 # This test relies on reading address zero triggering a SIGSEGV.
 if { [is_address_zero_readable] } {
     return
diff --git a/gdb/testsuite/gdb.base/bp-permanent.exp b/gdb/testsuite/gdb.base/bp-permanent.exp
index eb716cac6b5b..dac54fadef1c 100644
--- a/gdb/testsuite/gdb.base/bp-permanent.exp
+++ b/gdb/testsuite/gdb.base/bp-permanent.exp
@@ -23,11 +23,11 @@  set options { debug }
 if { ![target_info exists gdb,nosignals] } {
     lappend options "additional_flags=-DSIGNALS"
 }
 
 if {[build_executable "failed to prepare" $testfile $srcfile $options]} {
-    return -1
+    return
 }
 
 set line_bp [gdb_get_line_number "write permanent bp"]
 
 # The test proper.  ALWAYS_INSERTED indicates whether testing in
diff --git a/gdb/testsuite/gdb.base/branch-to-self.exp b/gdb/testsuite/gdb.base/branch-to-self.exp
index 03758ebb9427..ffd15780d724 100644
--- a/gdb/testsuite/gdb.base/branch-to-self.exp
+++ b/gdb/testsuite/gdb.base/branch-to-self.exp
@@ -18,11 +18,11 @@ 
 require {!target_info exists gdb,nosignals}
 
 standard_testfile
 
 if { [build_executable ${testfile}.exp ${testfile} $srcfile {debug}] == -1 } {
-    return -1
+    return
 }
 
 with_test_prefix "single-step" {
     global testfile
 
diff --git a/gdb/testsuite/gdb.base/break-always.exp b/gdb/testsuite/gdb.base/break-always.exp
index 050eac05942a..f2eb1a3ba8b9 100644
--- a/gdb/testsuite/gdb.base/break-always.exp
+++ b/gdb/testsuite/gdb.base/break-always.exp
@@ -16,11 +16,11 @@ 
 # Test that 'set breakpoint always-inserted 1' is not a brick
 # Also verifies that breakpoint enabling/disabling works properly
 # with duplicated breakpoints.
 
 if { [prepare_for_testing "failed to prepare" break-always break-always.c] } {
-    return -1
+    return
 }
 
 set bar_location [gdb_get_line_number "break in bar" break-always.c]
 
 gdb_test_no_output "set breakpoint always-inserted on"
diff --git a/gdb/testsuite/gdb.base/break-caller-line.exp b/gdb/testsuite/gdb.base/break-caller-line.exp
index 0bdda52caab8..7fdef95cc607 100644
--- a/gdb/testsuite/gdb.base/break-caller-line.exp
+++ b/gdb/testsuite/gdb.base/break-caller-line.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 if {![runto callee]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/break-entry.exp b/gdb/testsuite/gdb.base/break-entry.exp
index 2b51c822c0c4..2629d99c7ef0 100644
--- a/gdb/testsuite/gdb.base/break-entry.exp
+++ b/gdb/testsuite/gdb.base/break-entry.exp
@@ -28,11 +28,11 @@ 
 standard_testfile start.c
 
 require !use_gdb_stub
 
 if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile {additional_flags=-static}] } {
-    return -1
+    return
 }
 
 set test "info files"
 set entry ""
 gdb_test_multiple $test $test {
diff --git a/gdb/testsuite/gdb.base/break-include.exp b/gdb/testsuite/gdb.base/break-include.exp
index d9b0a6b64413..5a66dbf1fced 100644
--- a/gdb/testsuite/gdb.base/break-include.exp
+++ b/gdb/testsuite/gdb.base/break-include.exp
@@ -16,11 +16,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if { [prepare_for_testing ${testfile}.exp $testfile] } {
-    return -1
+    return
 }
 
 set bp_line [gdb_get_line_number "break here" ${testfile}.c]
 set bp_line_actual [gdb_get_line_number "ANCHOR" ${testfile}.inc]
 
diff --git a/gdb/testsuite/gdb.base/break-inline.exp b/gdb/testsuite/gdb.base/break-inline.exp
index 99f55f64f837..057dd3b03b91 100644
--- a/gdb/testsuite/gdb.base/break-inline.exp
+++ b/gdb/testsuite/gdb.base/break-inline.exp
@@ -13,11 +13,11 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 if { [prepare_for_testing "failed to prepare" "break-inline" {} {debug nowarnings optimize=-O2}] } {
-    return -1
+    return
 }
 
 gdb_breakpoint "main" "temporary"
 gdb_run_cmd
 gdb_test "" "Temporary breakpoint.*foo\\(\\).*"
diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp
index 2b9a66d9aa1c..527eece5d867 100644
--- a/gdb/testsuite/gdb.base/break-interp.exp
+++ b/gdb/testsuite/gdb.base/break-interp.exp
@@ -29,15 +29,15 @@  set binfile_lib ${binprefix}.so
 set srcfile "${test}-main.c"
 set srcfile_lib "${test}-lib.c"
 
 if {[build_executable "build library" ${binfile_lib} ${srcfile_lib} \
 	 {debug shlib}] == -1} {
-    return -1
+    return
 }
 
 if {[build_executable ${test}.exp $binfile_test ${srcfile_test} {}] == -1} {
-    return -1
+    return
 }
 
 # Note: The separate debug info file content build-id/crc32 are not verified
 # contrary to the GDB search algorithm skipping non-matching ones.
 proc system_debug_get {exec} {
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 face6205da77..b0a22962bba8 100644
--- a/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp
+++ b/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp
@@ -19,11 +19,11 @@ 
 # PROGRAM".
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Run the test proper.  INITIAL_LOAD determines whether the program is
 # initially loaded by the "file" command or by passing it to GDB on
 # the command line.
diff --git a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp b/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp
index 780b226a3731..f430c51f946e 100644
--- a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp
+++ b/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp
@@ -29,11 +29,11 @@  standard_testfile .cc
 
 if {[build_executable_from_specs $testfile.exp $testfile \
        {c++ ldflags=-Wl,--gc-sections} \
        $srcfile {debug c++ additional_flags=-ffunction-sections}]} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 proc set_breakpoint_on_gcd_function {} {
diff --git a/gdb/testsuite/gdb.base/break-probes.exp b/gdb/testsuite/gdb.base/break-probes.exp
index 81ceb99d9836..12a3c55b081f 100644
--- a/gdb/testsuite/gdb.base/break-probes.exp
+++ b/gdb/testsuite/gdb.base/break-probes.exp
@@ -21,18 +21,18 @@  set libname $testfile-solib
 set srcfile_lib $srcdir/$subdir/$libname.c
 set binfile_lib [standard_output_file $libname.so]
 
 if { [gdb_compile_shlib $srcfile_lib $binfile_lib {}] != "" } {
     untested "failed to compile shared library"
-    return -1
+    return
 }
 
 set binfile_lib_target [gdb_download_shlib $binfile_lib]
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 	  [list debug shlib_load additional_flags=-DSHLIB_NAME=\"$binfile_lib_target\"]] } {
-    return -1
+    return
 }
 
 gdb_locate_shlib $binfile_lib
 
 # Enable stop-on-solib-events
@@ -55,11 +55,11 @@  gdb_test_multiple "p /x \$pc" "" {
     -re -wrap "" {
     }
 }
 if { $pc == "" } {
     unsupported "Couldn't get $pc"
-    return -1
+    return
 }
 regsub "0x0*" $pc "" pc
 
 # Verify that pc is at info_start probe address.
 gdb_test_multiple "info probes stap rtld" "" {
@@ -70,11 +70,11 @@  gdb_test_multiple "info probes stap rtld" "" {
     }
 }
 
 if { ! $using_probes } {
     unsupported "probes not present on this system"
-    return -1
+    return
 }
 
 set sysroot ""
 set test "show sysroot"
 gdb_test_multiple $test $test {
diff --git a/gdb/testsuite/gdb.base/break-unload-file.exp b/gdb/testsuite/gdb.base/break-unload-file.exp
index 63e0c9462a15..1b7e8b0a5b01 100644
--- a/gdb/testsuite/gdb.base/break-unload-file.exp
+++ b/gdb/testsuite/gdb.base/break-unload-file.exp
@@ -17,11 +17,11 @@ 
 # target.
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Run the test proper.  INITIAL_LOAD determines whether the program is
 # initially loaded by the "file" command or by passing it to GDB on
 # the command line.  ALWAYS_INSERT determines whether always-inserted
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index d5f92e469ac9..2f5fa3d8e59a 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This file was written by Rob Savoye. (rob@cygnus.com)
 
 if { [build_executable "failed to prepare" "break" {break.c break1.c} {debug nowarnings}] } {
-    return -1
+    return
 }
 set srcfile break.c
 set srcfile1 break1.c
 
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
@@ -803,11 +803,11 @@  test_next_with_recursion
 
 # build a new file with optimization enabled so that we can try breakpoints
 # on targets with optimized prologues
 
 if { [build_executable "failed to prepare" "breako2" {break.c break1.c} {debug nowarnings optimize=-O2}] } {
-    return -1
+    return
 }
 
 proc_with_prefix test_break_optimized_prologue {} {
     clean_restart breako2
 
diff --git a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp b/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp
index 2ab0354ee8c2..b7ae91155d4b 100644
--- a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp
+++ b/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp
@@ -20,15 +20,15 @@ 
 require !gdb_debug_enabled
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Delete all target-supplied memory regions.
 delete_memory_regions
 
@@ -139,11 +139,11 @@  proc get_next_insn {} {
 
 set hw_step [probe_target_hardware_step]
 
 if {![get_function_bounds "main" main_lo main_hi]} {
     # Can't do the following tests if main's bounds are unknown.
-    return -1
+    return
 }
 
 # Manually create a read-only memory region that covers 'main'.
 gdb_test_no_output "mem $main_lo $main_hi ro" \
     "create read-only mem region covering main"
diff --git a/gdb/testsuite/gdb.base/breakpoint-shadow.exp b/gdb/testsuite/gdb.base/breakpoint-shadow.exp
index 9d270e8b148f..1be637848eb5 100644
--- a/gdb/testsuite/gdb.base/breakpoint-shadow.exp
+++ b/gdb/testsuite/gdb.base/breakpoint-shadow.exp
@@ -14,16 +14,16 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # We need to start the inferior to place the breakpoints in the memory at all.
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # The default "auto" mode removes all the breakpoints when we stop (and not
 # running the nonstop mode).  We would not be able to test the shadow.
 gdb_test_no_output "set breakpoint always-inserted on"
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 a710b9c5908a..a9a1db344d21 100644
--- a/gdb/testsuite/gdb.base/bt-on-error-and-warning.exp
+++ b/gdb/testsuite/gdb.base/bt-on-error-and-warning.exp
@@ -18,17 +18,17 @@ 
 # switched off.
 
 standard_testfile bt-on-fatal-signal.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 # 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]} {
-    return -1
+    return
 }
 
 # Check that the backtrace-on-fatal-signal feature is supported.  If
 # this target doesn't have the backtrace function available then
 # trying to turn this on will give an error, in which case we just
diff --git a/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp b/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp
index ae9463f2369c..9bf5f09c566f 100644
--- a/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp
+++ b/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp
@@ -24,17 +24,17 @@  standard_testfile
 # established the connection to the remote host?), so just skip this
 # test for remote host setups.
 require {!is_remote host}
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 # 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]} {
-    return -1
+    return
 }
 
 # Check that the backtrace-on-fatal-signal feature is supported.  If
 # this target doesn't have the backtrace function available then
 # trying to turn this on will give an error, in which case we just
diff --git a/gdb/testsuite/gdb.base/bt-selected-frame.exp b/gdb/testsuite/gdb.base/bt-selected-frame.exp
index f6c34b1a1815..0bd1024e9874 100644
--- a/gdb/testsuite/gdb.base/bt-selected-frame.exp
+++ b/gdb/testsuite/gdb.base/bt-selected-frame.exp
@@ -16,11 +16,11 @@ 
 # Check that the selected stack frame doesn't change after a backtrace.
 
 standard_testfile
 
 if { [build_executable "failed to prepare" $testfile $srcfile debug] } {
-    return -1
+    return
 }
 
 proc check_selected_frame_after_bt { bt_cmd stack_pattern } {
     clean_restart $::testfile
 
diff --git a/gdb/testsuite/gdb.base/build-id-seqno.exp b/gdb/testsuite/gdb.base/build-id-seqno.exp
index 907c4b74cafc..68ac4208f1d8 100644
--- a/gdb/testsuite/gdb.base/build-id-seqno.exp
+++ b/gdb/testsuite/gdb.base/build-id-seqno.exp
@@ -29,16 +29,16 @@  require {!is_remote host}
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile \
 	 {debug build-id}] == -1} {
-    return -1
+    return
 }
 
 # Split out BINFILE.debug.  Remove debug from BINFILE.
 if {[gdb_gnu_strip_debug $binfile] != 0} {
-    return -1
+    return
 }
 
 # Get the '.build-id/xx/xxx...xxx' part of the filename.
 set build_id_filename [build_id_debug_filename_get $binfile]
 
diff --git a/gdb/testsuite/gdb.base/c-linkage-name.exp b/gdb/testsuite/gdb.base/c-linkage-name.exp
index f0c0f6e87ecb..70115709e3dd 100644
--- a/gdb/testsuite/gdb.base/c-linkage-name.exp
+++ b/gdb/testsuite/gdb.base/c-linkage-name.exp
@@ -20,11 +20,11 @@ 
 standard_testfile c-linkage-name.c c-linkage-name-2.c
 
 set sources "${srcdir}/${subdir}/${srcfile} ${srcdir}/${subdir}/${srcfile2}"
 if { [gdb_compile "${sources}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
 gdb_test_no_output "set language c"
 gdb_load ${binfile}
diff --git a/gdb/testsuite/gdb.base/cached-source-file.exp b/gdb/testsuite/gdb.base/cached-source-file.exp
index 19b62a4a3760..ec523b298305 100644
--- a/gdb/testsuite/gdb.base/cached-source-file.exp
+++ b/gdb/testsuite/gdb.base/cached-source-file.exp
@@ -24,22 +24,22 @@ 
 standard_testfile
 
 # Only run on native boards.
 require !use_gdb_stub
 if { [target_info gdb_protocol] == "extended-remote" } {
-    return -1
+    return
 }
 
 # Because we need to modify the source file later, it's better if we
 # just copy it to our output directory (instead of messing with the
 # user's source directory).
 set newsrc [standard_output_file $testfile].c
 file copy -force -- $srcdir/$subdir/$srcfile $newsrc
 set srcfile $newsrc
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 # Get the line number for the line with the "break-here" marker.
 set bp_line [gdb_get_line_number "break-here" $srcfile]
 
@@ -77,11 +77,11 @@  file rename -force -- $bkpsrc $srcfile
 sleep 1
 
 # Recompile the modified source.  We use "gdb_compile" here instead of
 # "prepare_for_testing" because we don't want to call "clean_restart".
 if { [gdb_compile "${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 # Rerun the program.  This should not only force GDB to reload the
 # source cache, but also to break at BP_LINE again, which now has
 # different contents.
diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp
index 9337c2433c9b..0f8d65d2eaa4 100644
--- a/gdb/testsuite/gdb.base/call-ar-st.exp
+++ b/gdb/testsuite/gdb.base/call-ar-st.exp
@@ -31,11 +31,11 @@  set allow_float_test [allow_float_test]
 set flags {}
 lappend flags debug
 lappend_include_file flags $srcdir/lib/unbuffer_output.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
-    return -1
+    return
 }
 
 
 set oldtimeout $timeout
 set timeout [expr {$timeout + 60}]
diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp
index dff0e95be11d..d9d011ed8113 100644
--- a/gdb/testsuite/gdb.base/call-strs.exp
+++ b/gdb/testsuite/gdb.base/call-strs.exp
@@ -32,11 +32,11 @@  require {!target_info exists gdb,cannot_call_functions}
 set flags {}
 lappend flags debug
 lappend_include_file flags $srcdir/lib/unbuffer_output.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set print sevenbit-strings"
 gdb_test_no_output "set print address off"
 gdb_test_no_output "set print symbol off"
diff --git a/gdb/testsuite/gdb.base/cast-call.exp b/gdb/testsuite/gdb.base/cast-call.exp
index de2f77da19cf..9f6d526f6a0c 100644
--- a/gdb/testsuite/gdb.base/cast-call.exp
+++ b/gdb/testsuite/gdb.base/cast-call.exp
@@ -19,15 +19,15 @@ 
 require {!target_info exists gdb,cannot_call_functions}
 
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "STOP"]
 gdb_continue_to_breakpoint "STOP"
 
diff --git a/gdb/testsuite/gdb.base/cast-indirection.exp b/gdb/testsuite/gdb.base/cast-indirection.exp
index c446a54021bc..193c02a66253 100644
--- a/gdb/testsuite/gdb.base/cast-indirection.exp
+++ b/gdb/testsuite/gdb.base/cast-indirection.exp
@@ -17,15 +17,15 @@ 
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 	  {nodebug}] == -1} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "p a_loc ()" \
     "'a_loc' has unknown return type; cast the call to its declared return type"
 
diff --git a/gdb/testsuite/gdb.base/catch-fork-static.exp b/gdb/testsuite/gdb.base/catch-fork-static.exp
index cad0cf885328..1b4a6b860080 100644
--- a/gdb/testsuite/gdb.base/catch-fork-static.exp
+++ b/gdb/testsuite/gdb.base/catch-fork-static.exp
@@ -26,11 +26,11 @@  require allow_fork_tests
 # Reusing foll-fork.c since it's a simple forking program.
 standard_testfile foll-fork.c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile \
       {additional_flags=-static}] } {
-    return -1
+    return
 }
 
 gdb_test "catch fork" "Catchpoint \[0-9\]* \\(fork\\)"
 
 gdb_run_cmd
diff --git a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp
index 1fa567ad3ca7..21f0e9bc98cc 100644
--- a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp
+++ b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp
@@ -31,15 +31,15 @@  set bp_location [gdb_get_line_number "set breakpoint here"]
 set flags {}
 lappend flags debug
 lappend_include_file flags $srcdir/lib/unbuffer_output.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "handle SIGSEGV nostop noprint" \
     "Signal\[ \t\]+Stop\[ \t\]+Print\[ \t\]+Pass to program\[ \t\]+Description\r\nSIGSEGV\[ \t\]+No\[ \t\]+No\[ \t\]+Yes\[ \t\].*"
 gdb_test "handle SIGILL nostop noprint" \
diff --git a/gdb/testsuite/gdb.base/catch-load.exp b/gdb/testsuite/gdb.base/catch-load.exp
index dbf45941f5e7..eac42ba9f0af 100644
--- a/gdb/testsuite/gdb.base/catch-load.exp
+++ b/gdb/testsuite/gdb.base/catch-load.exp
@@ -16,20 +16,20 @@ 
 require allow_shlib_tests
 
 standard_testfile .c
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug shlib_load}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set testfile2 catch-load-so
 set srcfile2 ${testfile2}.c
 set binfile2 [standard_output_file ${testfile2}.so]
 set binfile2_dlopen [shlib_target_file ${testfile2}.so]
 if { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" ${binfile2} {debug}] != "" } {
     untested "failed to compile shared library"
-    return -1
+    return
 }
 
 # Run one set of tests.
 # SCENARIO is the name of the test scenario, it is just used in test
 # names.
diff --git a/gdb/testsuite/gdb.base/catch-signal-fork.exp b/gdb/testsuite/gdb.base/catch-signal-fork.exp
index 2ed6929848d4..fd872ecb3186 100644
--- a/gdb/testsuite/gdb.base/catch-signal-fork.exp
+++ b/gdb/testsuite/gdb.base/catch-signal-fork.exp
@@ -17,15 +17,15 @@  require {!target_info exists gdb,nosignals}
 require allow_fork_tests
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Test "catch signal SIGHUP"
 gdb_test "catch signal SIGHUP" "Catchpoint .*"
 gdb_breakpoint ${srcfile}:[gdb_get_line_number "first HUP"]
diff --git a/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp b/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp
index 0cca484dd574..dc0e77076df0 100644
--- a/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp
+++ b/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp
@@ -30,15 +30,15 @@  require {!target_info exists gdb,nosignals}
 require supports_get_siginfo_type
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile {debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "set breakpoint here"]
 
 gdb_test "catch signal"
diff --git a/gdb/testsuite/gdb.base/catch-signal.exp b/gdb/testsuite/gdb.base/catch-signal.exp
index 7b46d8bbe387..6da1b6aeda79 100644
--- a/gdb/testsuite/gdb.base/catch-signal.exp
+++ b/gdb/testsuite/gdb.base/catch-signal.exp
@@ -16,11 +16,11 @@ 
 require {!target_info exists gdb,nosignals}
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 proc test_catch_signal {signame} {
     global srcfile
 
diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp
index 31a42e33b5ff..673fca4a9984 100644
--- a/gdb/testsuite/gdb.base/catch-syscall.exp
+++ b/gdb/testsuite/gdb.base/catch-syscall.exp
@@ -793,11 +793,11 @@  proc setup_all_syscalls {} {
     }
     return 1
 }
 
 if { ![setup_all_syscalls] } {
-    return -1
+    return
 }
 
 # Fill all the syscalls numbers before starting anything.
 fill_all_syscalls_numbers
 
diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
index f7ee7a76bb7b..13e874ec9553 100644
--- a/gdb/testsuite/gdb.base/charset.exp
+++ b/gdb/testsuite/gdb.base/charset.exp
@@ -22,11 +22,11 @@ 
 
 
 standard_testfile .c charset-malloc.c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} [list $srcfile $srcfile2]] } {
-    return -1
+    return
 }
 
 # Parse the output from a `show charset' command.  Return the host
 # and target charset as a two-element list.
 proc parse_show_charset_output {testname} {
@@ -156,11 +156,11 @@  gdb_expect {
 # If gdb was built with a phony iconv, it will only have two character
 # sets: "auto" and the default.  In this situation, this set of tests
 # is pointless.
 if {[llength [array names charsets]] < 3} {
     untested "fewer than 3 charsets"
-    return -1
+    return
 }
 
 send_gdb "set target-charset\n"
 gdb_expect {
     -re "Requires an argument. Valid arguments are (.*)\\.\r\n$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
index b8b44d8f874f..c64c5fa31356 100644
--- a/gdb/testsuite/gdb.base/commands.exp
+++ b/gdb/testsuite/gdb.base/commands.exp
@@ -31,11 +31,11 @@  set flags {}
 lappend flags debug
 lappend flags additional_flags=-DFAKEARGV
 lappend_include_file flags $srcdir/lib/unbuffer_output.c
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile $flags] } {
-    return -1
+    return
 }
 
 # Run to FUNCTION.  If that fails, issue a FAIL and make the caller
 # return.
 
diff --git a/gdb/testsuite/gdb.base/compare-sections.exp b/gdb/testsuite/gdb.base/compare-sections.exp
index 56f0b2a6ca80..f647cc5a8491 100644
--- a/gdb/testsuite/gdb.base/compare-sections.exp
+++ b/gdb/testsuite/gdb.base/compare-sections.exp
@@ -16,11 +16,11 @@ 
 # Test the compare-sections command.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 set is_pie [exec_is_pie $binfile]
 
 # Run the compare-sections command along with any options as specified
diff --git a/gdb/testsuite/gdb.base/complete-empty.exp b/gdb/testsuite/gdb.base/complete-empty.exp
index 7a77224857cb..295f44591ad9 100644
--- a/gdb/testsuite/gdb.base/complete-empty.exp
+++ b/gdb/testsuite/gdb.base/complete-empty.exp
@@ -23,11 +23,11 @@  gdb_start
 # Tests below are about tab-completion, which doesn't work if readline
 # library isn't used.  Check it first.
 
 if { ![readline_is_used] } {
     untested "no tab completion support without readline"
-    return -1
+    return
 }
 
 # Start of tests.
 
 # Test TAB with no input.
diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index 4469f0dbbc35..e7407e75ee09 100644
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -52,11 +52,11 @@ 
 
 standard_testfile break.c break1.c
 
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 [list $srcfile $srcfile2] {debug nowarnings}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
@@ -163,11 +163,11 @@  gdb_assert {$all_regs eq $completed_regs} "complete 'info registers '"
 
 # Tests below are about tab-completion, which doesn't work if readline
 # library isn't used.  Check it first.
 
 if { ![readline_is_used] } {
-    return -1
+    return
 }
 
 # The bulk of this test script pre-dates the completion-support
 # library, and should probably (where possible) be converted.
 # However, for now, new tests are being added using this library.
diff --git a/gdb/testsuite/gdb.base/complex-parts.exp b/gdb/testsuite/gdb.base/complex-parts.exp
index c010ffee1ca1..56260996bdb6 100644
--- a/gdb/testsuite/gdb.base/complex-parts.exp
+++ b/gdb/testsuite/gdb.base/complex-parts.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/complex.exp b/gdb/testsuite/gdb.base/complex.exp
index c4be874e3767..0d7a83fb667e 100644
--- a/gdb/testsuite/gdb.base/complex.exp
+++ b/gdb/testsuite/gdb.base/complex.exp
@@ -15,11 +15,11 @@ 
 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {[runto f2]} {
     get_debug_format
     if {[test_compiler_info gcc-2-*] && [test_debug_format "DWARF \[0-9\]"]} {
diff --git a/gdb/testsuite/gdb.base/cond-eval-mode.exp b/gdb/testsuite/gdb.base/cond-eval-mode.exp
index b963ae45a750..e2afc3a95939 100644
--- a/gdb/testsuite/gdb.base/cond-eval-mode.exp
+++ b/gdb/testsuite/gdb.base/cond-eval-mode.exp
@@ -24,11 +24,11 @@ 
 set allow_hw_watchpoint_tests_p [allow_hw_watchpoint_tests]
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/condbreak-call-false.exp b/gdb/testsuite/gdb.base/condbreak-call-false.exp
index 767d6d181e7c..32113e3b9501 100644
--- a/gdb/testsuite/gdb.base/condbreak-call-false.exp
+++ b/gdb/testsuite/gdb.base/condbreak-call-false.exp
@@ -17,11 +17,11 @@ 
 # false works as expected.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/condbreak.exp
index ed76c261dbe5..6a6c9c1d4f8d 100644
--- a/gdb/testsuite/gdb.base/condbreak.exp
+++ b/gdb/testsuite/gdb.base/condbreak.exp
@@ -23,11 +23,11 @@ 
 
 standard_testfile break.c break1.c
 
 if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile $srcfile2] \
 	 {debug nowarnings}]} {
-    return -1
+    return
 }
 
 set bp_location1  [gdb_get_line_number "set breakpoint 1 here"]
 set bp_location6  [gdb_get_line_number "set breakpoint 6 here"]
 set bp_location8  [gdb_get_line_number "set breakpoint 8 here" $srcfile2]
diff --git a/gdb/testsuite/gdb.base/consecutive-step-over.exp b/gdb/testsuite/gdb.base/consecutive-step-over.exp
index 9a10f19c0400..d7efec8f418d 100644
--- a/gdb/testsuite/gdb.base/consecutive-step-over.exp
+++ b/gdb/testsuite/gdb.base/consecutive-step-over.exp
@@ -19,11 +19,11 @@ 
 # over another breakpoint, without a user visible stop in between.
 #
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/consecutive.exp b/gdb/testsuite/gdb.base/consecutive.exp
index 71d207c95bf3..4c657a8f897c 100644
--- a/gdb/testsuite/gdb.base/consecutive.exp
+++ b/gdb/testsuite/gdb.base/consecutive.exp
@@ -21,11 +21,11 @@ 
 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
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 488677413862..1285c4f14158 100644
--- a/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp
+++ b/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp
@@ -35,11 +35,11 @@ 
 #  *GDB hangs forever*
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # DISPLACED indicates whether to use displaced-stepping.
 proc do_test {displaced breakpoint_always_inserted} {
     global gdb_prompt decimal
diff --git a/gdb/testsuite/gdb.base/coredump-filter-build-id.exp b/gdb/testsuite/gdb.base/coredump-filter-build-id.exp
index 1eba93c0f6ad..d267221e1bfe 100644
--- a/gdb/testsuite/gdb.base/coredump-filter-build-id.exp
+++ b/gdb/testsuite/gdb.base/coredump-filter-build-id.exp
@@ -24,28 +24,28 @@ 
 standard_testfile "normal.c"
 
 # This test is Linux x86_64 only.
 if { ![istarget *-*-linux*] } {
     untested "$testfile.exp"
-    return -1
+    return
 }
 require is_x86_64_m64_target gcore_cmd_available
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug build-id}] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 # First we need to generate a corefile.
 set corefilename "[standard_output_file gcore.test]"
 if { ![gdb_gcore_cmd "$corefilename" "save corefile"] } {
     verbose -log "Could not save corefile"
     untested "$testfile.exp"
-    return -1
+    return
 }
 
 # Determine if GDB dumped the mapping containing the build-id.  This
 # is done by invoking an external program (eu-unstrip).
 if { [catch {exec [gdb_find_eu-unstrip] -n --core $corefilename} output] == 0 } {
diff --git a/gdb/testsuite/gdb.base/coredump-filter.exp b/gdb/testsuite/gdb.base/coredump-filter.exp
index e2ce86d48e8a..6bf26f1643ab 100644
--- a/gdb/testsuite/gdb.base/coredump-filter.exp
+++ b/gdb/testsuite/gdb.base/coredump-filter.exp
@@ -16,19 +16,19 @@ 
 standard_testfile
 
 # This test is Linux-only.
 if {![istarget *-*-linux*]} {
     untested "coredump-filter.exp"
-    return -1
+    return
 }
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break-here"]
 gdb_continue_to_breakpoint "break-here" ".* break-here .*"
 
@@ -182,11 +182,11 @@  set all_anon_corefiles { { "non-Private-Anonymous" "0x7e" \
 # If corefile loading is not supported, we do not even try to run the
 # tests.
 set core_supported [gdb_gcore_cmd "$non_private_anon_core" "save a corefile"]
 if { !$core_supported } {
     untested "corefile generation is not supported"
-    return -1
+    return
 }
 
 gdb_test_multiple "info inferiors" "getting inferior pid" {
     -re "process $decimal.*\r\n$gdb_prompt $" {
     }
diff --git a/gdb/testsuite/gdb.base/corefile-exec-context.exp b/gdb/testsuite/gdb.base/corefile-exec-context.exp
index 17d7e23f333a..bf935a795e7d 100644
--- a/gdb/testsuite/gdb.base/corefile-exec-context.exp
+++ b/gdb/testsuite/gdb.base/corefile-exec-context.exp
@@ -22,11 +22,11 @@  require {is_any_target "*-*-linux*" "*-*-freebsd*"}
 
 standard_testfile
 
 if {[build_executable $testfile.exp $testfile $srcfile] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Linux core files can encore upto 80 characters for the command and
 # arguments in the psinfo.  If BINFILE is less than 80 characters in
 # length then lets try to make it longer.
@@ -134,11 +134,11 @@  for { set i 0 } { $i < 10 } { incr i } {
     }
 }
 
 if { $env_var_name eq "" } {
     unsupported "couldn't find suitable environment variable name"
-    return -1
+    return
 }
 
 # Generate a core file with this environment variable set.
 set env_var_value "TEST VALUE"
 save_vars { ::env($env_var_name) } {
diff --git a/gdb/testsuite/gdb.base/corefile-find-exec.exp b/gdb/testsuite/gdb.base/corefile-find-exec.exp
index d766aa69f1bc..7d79b70c41b7 100644
--- a/gdb/testsuite/gdb.base/corefile-find-exec.exp
+++ b/gdb/testsuite/gdb.base/corefile-find-exec.exp
@@ -22,11 +22,11 @@  require {is_any_target "*-*-linux*" "*-*-freebsd*"}
 
 standard_testfile
 
 if {[build_executable $testfile.exp $testfile $srcfile {debug build-id}] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Load the COREFILE and confirm that GDB auto-loads the executable.
 # The symbols should be read from SYMBOL_FILE and the core file should
 # be reported as generated by GEN_FROM_FILE.
diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp
index f6a0a7a1ecad..31249355353f 100644
--- a/gdb/testsuite/gdb.base/corefile.exp
+++ b/gdb/testsuite/gdb.base/corefile.exp
@@ -21,11 +21,11 @@  require isnative
 
 standard_testfile coremaker.c
 
 if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Do not delete coremap.data when calling core_find.  This file is
 # required for GDB to find mmap'd data in the "accessing read-only
 # mmapped data in core file" test.
diff --git a/gdb/testsuite/gdb.base/corefile2.exp b/gdb/testsuite/gdb.base/corefile2.exp
index 4ad218b34627..805e08973f6b 100644
--- a/gdb/testsuite/gdb.base/corefile2.exp
+++ b/gdb/testsuite/gdb.base/corefile2.exp
@@ -33,11 +33,11 @@  if { ![istarget *-linux*] } {
 
 standard_testfile coremaker2.c
 
 if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set corefile [core_find $binfile {}]
 if {$corefile == ""} {
     untested "unable to create or find corefile"
diff --git a/gdb/testsuite/gdb.base/ctf-ptype.exp b/gdb/testsuite/gdb.base/ctf-ptype.exp
index e6bae63562b5..d3c3b46140c5 100644
--- a/gdb/testsuite/gdb.base/ctf-ptype.exp
+++ b/gdb/testsuite/gdb.base/ctf-ptype.exp
@@ -86,20 +86,20 @@  gdb_test "ptype struct t_struct" \
 
 
 # Test the equivalence between '.' and '->' for struct member references.
 
 if {[gdb_test "ptype v_struct1.v_float_member"	"type = float"] < 0} {
-    return -1
+    return
 }
 if {[gdb_test "ptype v_struct1->v_float_member"	"type = float"] < 0} {
-    return -1
+    return
 }
 if {[gdb_test "ptype v_t_struct_p.v_float_member"	"type = float"] < 0} {
-    return -1
+    return
 }
 if {[gdb_test "ptype v_t_struct_p->v_float_member"	"type = float"] < 0} {
-    return -1
+    return
 }
 
 gdb_test "ptype struct link" \
     [multi_line \
 	"type = struct link {" \
diff --git a/gdb/testsuite/gdb.base/ctxobj.exp b/gdb/testsuite/gdb.base/ctxobj.exp
index 567c4292aafb..3b1b12a9b186 100644
--- a/gdb/testsuite/gdb.base/ctxobj.exp
+++ b/gdb/testsuite/gdb.base/ctxobj.exp
@@ -37,29 +37,29 @@  set libobj1_opts { debug
 set libobj2_opts { debug
 		   additional_flags=-DVERSION=203
 		   additional_flags=-DGET_VERSION=get_version_2 }
 
 if { [gdb_compile_shlib $libsrc $libobj1 $libobj1_opts ] != "" } {
-    return -1
+    return
 }
 if { [gdb_compile_shlib $libsrc $libobj2 $libobj2_opts ] != "" } {
-    return -1
+    return
 }
 if { [gdb_compile "${srcdir}/${subdir}/${executable}.c" \
 		  [standard_output_file ${executable}] \
 		  executable \
 		  [list debug shlib=${libobj1} shlib=${libobj2}]]
      != ""} {
-    return -1
+    return
 }
 
 clean_restart $executable
 gdb_load_shlib $libobj1
 gdb_load_shlib $libobj2
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set bp_location [gdb_get_line_number "STOP" "ctxobj-f.c"]
 gdb_test "break ctxobj-f.c:$bp_location" \
 	 "Breakpoint ${::decimal} at ${::hex}: .*" \
diff --git a/gdb/testsuite/gdb.base/cursal.exp b/gdb/testsuite/gdb.base/cursal.exp
index 1385a30632b6..a52ec3f844e7 100644
--- a/gdb/testsuite/gdb.base/cursal.exp
+++ b/gdb/testsuite/gdb.base/cursal.exp
@@ -16,11 +16,11 @@ 
 
 standard_testfile
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != ""} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
 gdb_file_cmd ${binfile}
 gdb_test_no_output "set listsize 1"
@@ -30,19 +30,19 @@  gdb_test "list" \
     "{ /\\* main prologue \\*/" \
     "list before run"
 
 gdb_load ${binfile}
 if {! [runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "list" \
     "v0 = 0;" \
     "list in main"
 
 if {! [runto "func2"]} {
-    return -1
+    return
 }
 
 gdb_test "list" \
     "v2 = 2;" \
     "list in func2"
@@ -56,10 +56,10 @@  gdb_test "list -1" \
 
 # check the window
 gdb_test_no_output "set listsize 3"
 
 if {! [runto_main]} {
-    return -1
+    return
 }
 gdb_test "list" \
     "func1 \\(\\);" \
     "list size 3"
diff --git a/gdb/testsuite/gdb.base/dcache-flush.exp b/gdb/testsuite/gdb.base/dcache-flush.exp
index 7ed60e3e913a..df05ab554b66 100644
--- a/gdb/testsuite/gdb.base/dcache-flush.exp
+++ b/gdb/testsuite/gdb.base/dcache-flush.exp
@@ -16,15 +16,15 @@ 
 # Test that the dcache can be flushed.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 if {![runto func]} {
-    return -1
+    return
 }
 
 gdb_test "up" ".* main .*"
 gdb_test "p var1" " = 4"
 gdb_test "p var2" " = 3"
diff --git a/gdb/testsuite/gdb.base/dcache-line-read-error.exp b/gdb/testsuite/gdb.base/dcache-line-read-error.exp
index 207724af756e..98095c188663 100644
--- a/gdb/testsuite/gdb.base/dcache-line-read-error.exp
+++ b/gdb/testsuite/gdb.base/dcache-line-read-error.exp
@@ -16,15 +16,15 @@ 
 # Test that dcache behaves correctly when reading a cache line fails.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 if {![runto breakpt]} {
-    return -1
+    return
 }
 
 # Issue the "delete mem" command.  This makes GDB ignore the
 # target-provided list, if any.
 
diff --git a/gdb/testsuite/gdb.base/debug-expr.exp b/gdb/testsuite/gdb.base/debug-expr.exp
index 80f6d5a968b1..b9377541847e 100644
--- a/gdb/testsuite/gdb.base/debug-expr.exp
+++ b/gdb/testsuite/gdb.base/debug-expr.exp
@@ -20,15 +20,15 @@ 
 require !gdb_debug_enabled
 
 standard_testfile .c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 for { set i 0 } { $i < 4 } { incr i } {
     gdb_test_no_output "set variable array\[$i\] = $i"
 }
diff --git a/gdb/testsuite/gdb.base/debug-frame.exp b/gdb/testsuite/gdb.base/debug-frame.exp
index 1f5f015f5ddb..2038fa992d23 100644
--- a/gdb/testsuite/gdb.base/debug-frame.exp
+++ b/gdb/testsuite/gdb.base/debug-frame.exp
@@ -18,15 +18,15 @@ 
 require !gdb_debug_enabled
 
 standard_testfile .c -2.c
 set srcfiles [list $srcfile $srcfile2]
 if {[prepare_for_testing "failed to prepare" $testfile $srcfiles]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Redirect debug output to file.
 set logfile [host_standard_output_file gdb.txt]
 gdb_test_no_output "set logging file $logfile" \
diff --git a/gdb/testsuite/gdb.base/decl-before-def.exp b/gdb/testsuite/gdb.base/decl-before-def.exp
index 2c4de8f42f9f..66083d2aa710 100644
--- a/gdb/testsuite/gdb.base/decl-before-def.exp
+++ b/gdb/testsuite/gdb.base/decl-before-def.exp
@@ -15,11 +15,11 @@ 
 
 standard_testfile decl-before-def-decl.c decl-before-def-def.c
 set sources [list $srcfile $srcfile2]
 
 if {[prepare_for_testing "failed to prepare" $testfile $sources]} {
-    return -1
+    return
 }
 
 # This is required due to PR25764.
 gdb_test "maint expand-symtabs"
 
diff --git a/gdb/testsuite/gdb.base/default-args.exp b/gdb/testsuite/gdb.base/default-args.exp
index edd3bea3c33b..3046aaf7c5f8 100644
--- a/gdb/testsuite/gdb.base/default-args.exp
+++ b/gdb/testsuite/gdb.base/default-args.exp
@@ -20,11 +20,11 @@ 
 load_lib completion-support.exp
 
 standard_testfile .c
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 # Basic/core tests using user-visible commands.
diff --git a/gdb/testsuite/gdb.base/define.exp b/gdb/testsuite/gdb.base/define.exp
index 33aee1d46cf0..e0e440e455c6 100644
--- a/gdb/testsuite/gdb.base/define.exp
+++ b/gdb/testsuite/gdb.base/define.exp
@@ -22,11 +22,11 @@ 
 
 standard_testfile break.c break1.c
 
 if {[prepare_for_testing "failed to prepare" ${testfile} \
 	 [list $srcfile $srcfile2] {debug nowarnings}]} {
-    return -1
+    return
 }
 
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 set bp_location11 [gdb_get_line_number "set breakpoint 11 here"]
 
diff --git a/gdb/testsuite/gdb.base/del.exp b/gdb/testsuite/gdb.base/del.exp
index ea3c639e0dda..a34dba5845ea 100644
--- a/gdb/testsuite/gdb.base/del.exp
+++ b/gdb/testsuite/gdb.base/del.exp
@@ -18,11 +18,11 @@ 
 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # A function to test that ALIAS is working as a shortcut of the "delete"
 # command.
 
diff --git a/gdb/testsuite/gdb.base/disabled-location.exp b/gdb/testsuite/gdb.base/disabled-location.exp
index 300f73cd0c7d..17e8987ded18 100644
--- a/gdb/testsuite/gdb.base/disabled-location.exp
+++ b/gdb/testsuite/gdb.base/disabled-location.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
    return 0
 }
diff --git a/gdb/testsuite/gdb.base/disasm-end-cu.exp b/gdb/testsuite/gdb.base/disasm-end-cu.exp
index dc0dc25882aa..66cd2f92d871 100644
--- a/gdb/testsuite/gdb.base/disasm-end-cu.exp
+++ b/gdb/testsuite/gdb.base/disasm-end-cu.exp
@@ -16,23 +16,23 @@ 
 # This test tries to disassemble over the boundary between two compilation
 # units displaying source lines.  This checks that the disassemble routine
 # can handle our use of line number 0 to mark the end of sequence.
 
 if { [prepare_for_testing "failed to prepare" "disasm-end-cu" {disasm-end-cu-1.c disasm-end-cu-2.c} {debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set main_addr [get_hexadecimal_valueof "&main" "0"]
 set dummy_3_addr [get_hexadecimal_valueof "&dummy_3" "0"]
 
 if {$main_addr == 0 || $dummy_3_addr == 0 || $dummy_3_addr <= $main_addr} {
     fail "unable to extract required addresses, or addresses out of order"
-    return -1
+    return
 }
 
 gdb_test_multiple "disassemble /m ${main_addr},${dummy_3_addr}" "disassemble address range with source" {
     -re "Dump of assembler code from ${main_addr} to ${dummy_3_addr}:\r\nEnd of assembler dump\." {
 	fail "no output from the disassemble command"
diff --git a/gdb/testsuite/gdb.base/disasm-optim.exp b/gdb/testsuite/gdb.base/disasm-optim.exp
index 70841ac2723d..c926a0200759 100644
--- a/gdb/testsuite/gdb.base/disasm-optim.exp
+++ b/gdb/testsuite/gdb.base/disasm-optim.exp
@@ -18,15 +18,15 @@ 
 require is_amd64_regs_target
 
 standard_testfile .S
 
 if { [prepare_for_testing "failed to prepare" $testfile ${testfile}.S {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_sequence "disassemble /s main" \
     "Disassemble main with source" {
 	"Dump of assembler code for function main:"
diff --git a/gdb/testsuite/gdb.base/displaced-step-closure.exp b/gdb/testsuite/gdb.base/displaced-step-closure.exp
index 358020fed85f..6d0521d3141a 100644
--- a/gdb/testsuite/gdb.base/displaced-step-closure.exp
+++ b/gdb/testsuite/gdb.base/displaced-step-closure.exp
@@ -19,15 +19,15 @@ 
 # by address returns a match even if no displaced stepping is currently
 # taking place.
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # We have a breakpoint at the current pc (from stopping at main).  Step over
 # the breakpoint.
 gdb_test "stepi" ".*" "step-over breakpoint"
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
index 1eae678111b5..3acc512de0e0 100644
--- a/gdb/testsuite/gdb.base/display.exp
+++ b/gdb/testsuite/gdb.base/display.exp
@@ -27,11 +27,11 @@  set allow_hw_watchpoint_tests_p [allow_hw_watchpoint_tests]
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {debug nowarnings}]} {
-    return -1
+    return
 }
 
 # Preserve the old timeout, and set a new one that should be
 # sufficient to avoid timing out during this test.
 set oldtimeout $timeout
diff --git a/gdb/testsuite/gdb.base/dmsym.exp b/gdb/testsuite/gdb.base/dmsym.exp
index 89e38a29d453..3820b13bfdc7 100644
--- a/gdb/testsuite/gdb.base/dmsym.exp
+++ b/gdb/testsuite/gdb.base/dmsym.exp
@@ -33,11 +33,11 @@  if {[gdb_compile "${srcdir}/${subdir}/dmsym.c" \
 if {[gdb_compile \
       [list ${srcdir}/${subdir}/dmsym_main.c $dmsym_o] \
       [standard_output_file ${testfile}] \
       executable {debug}] != ""} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart ${testfile}
 
 # Some convenient regular expressions...
diff --git a/gdb/testsuite/gdb.base/document.exp b/gdb/testsuite/gdb.base/document.exp
index a7d685e5f35f..905ce59af97b 100644
--- a/gdb/testsuite/gdb.base/document.exp
+++ b/gdb/testsuite/gdb.base/document.exp
@@ -15,11 +15,11 @@ 
 
 standard_testfile break.c break1.c
 
 if {[prepare_for_testing "failed to prepare" ${testfile} \
 	 [list $srcfile $srcfile2] {debug nowarnings}]} {
-    return -1
+    return
 }
 
 # test document command used within user command.
 gdb_test_multiple "define do-document" "" {
     -re "Type commands for definition of \"do-document\".\r\nEnd with a line saying just \"end\".\r\n>$" {
diff --git a/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp b/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp
index 6fc9ec99ebcb..b2cc3ddb144c 100644
--- a/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp
+++ b/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp
@@ -17,11 +17,11 @@ 
 
 standard_testfile
 
 if {[build_executable "failed to prepare" \
 	 ${testfile} ${srcfile} {debug}]} {
-    return -1
+    return
 }
 
 set dp_location [gdb_get_line_number "set dprintf here"]
 
 proc test { style } {
diff --git a/gdb/testsuite/gdb.base/dprintf-detach.exp b/gdb/testsuite/gdb.base/dprintf-detach.exp
index 4aad0158291b..dd9bfde8f47c 100644
--- a/gdb/testsuite/gdb.base/dprintf-detach.exp
+++ b/gdb/testsuite/gdb.base/dprintf-detach.exp
@@ -26,11 +26,11 @@  require can_spawn_for_attach
 standard_testfile
 set escapedbinfile [string_to_regexp ${binfile}]
 
 if {[build_executable "failed to prepare for dprintf-detach" \
 	 ${testfile} ${srcfile} {debug}]} {
-    return -1
+    return
 }
 
 proc dprintf_detach_test { breakpoint_always_inserted dprintf_style disconnected_dprintf } {
     set test_prefix "bai=${breakpoint_always_inserted} ds=${dprintf_style} dd=${disconnected_dprintf}"
     global decimal gdb_prompt escapedbinfile
diff --git a/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp b/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp
index 3f149381f4f5..5263d15a83de 100644
--- a/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp
+++ b/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp
@@ -23,11 +23,11 @@ 
 require target_can_use_run_cmd
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # This is the name of the GDB script to load.
 set x_file ${srcdir}/${subdir}/$testfile.gdb
 
@@ -45,11 +45,11 @@  save_vars { GDBFLAGS } {
 }
 
 set test "load and run script with -x"
 if { $res != 0} {
     fail $test
-    return -1
+    return
 }
 
 # The script loaded via -x contains a run command; while running, GDB
 # is expected to print three messages from dprintf breakpoints along
 # with three interspersed messages from an ordinary breakpoint (which
diff --git a/gdb/testsuite/gdb.base/dprintf-next.exp b/gdb/testsuite/gdb.base/dprintf-next.exp
index 6ddf949c531d..325478fb4717 100644
--- a/gdb/testsuite/gdb.base/dprintf-next.exp
+++ b/gdb/testsuite/gdb.base/dprintf-next.exp
@@ -19,15 +19,15 @@  set expfile $testfile.exp
 
 set dp_location [gdb_get_line_number "Set dprintf here"]
 
 if {[prepare_for_testing "failed to prepare for dprintf with next" \
 	 ${testfile} ${srcfile} {debug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "dprintf $dp_location, \"%d\\n\", x" \
     "Dprintf .*"
 
diff --git a/gdb/testsuite/gdb.base/dprintf-non-stop.exp b/gdb/testsuite/gdb.base/dprintf-non-stop.exp
index 3807a7b6623f..89b1c894c04b 100644
--- a/gdb/testsuite/gdb.base/dprintf-non-stop.exp
+++ b/gdb/testsuite/gdb.base/dprintf-non-stop.exp
@@ -16,20 +16,20 @@ 
 standard_testfile
 set executable ${testfile}
 
 if {[build_executable "failed to prepare for dprintf with non-stop" \
 	 ${testfile} ${srcfile} {debug}]} {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
     clean_restart ${executable}
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "dprintf foo,\"At foo entry\\n\"" "Dprintf .*"
 
 gdb_test "continue &" "Continuing\\."
diff --git a/gdb/testsuite/gdb.base/dprintf-pending.exp b/gdb/testsuite/gdb.base/dprintf-pending.exp
index ec101f2bdc77..5b13cfda595a 100644
--- a/gdb/testsuite/gdb.base/dprintf-pending.exp
+++ b/gdb/testsuite/gdb.base/dprintf-pending.exp
@@ -25,11 +25,11 @@  set lib_opts  debug
 set exec_opts [list debug shlib=$lib_sl]
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
     untested "failed to compile shared library"
-    return -1
+    return
 }
 
 with_test_prefix "without format" {
     clean_restart
 
diff --git a/gdb/testsuite/gdb.base/dprintf.exp b/gdb/testsuite/gdb.base/dprintf.exp
index ef1f09443c1e..9896f2c19246 100644
--- a/gdb/testsuite/gdb.base/dprintf.exp
+++ b/gdb/testsuite/gdb.base/dprintf.exp
@@ -18,18 +18,18 @@  standard_testfile
 set flags {}
 lappend flags debug
 lappend_include_file flags $srcdir/lib/unbuffer_output.c
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile $flags] } {
-    return -1
+    return
 }
 
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 set dp_location1 [gdb_get_line_number "set dprintf 1 here"]
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "dprintf" "Format string required"
 
 gdb_test "dprintf foo" "Format string required"
diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp
index 84be9df6d6ef..798cca9a6b0a 100644
--- a/gdb/testsuite/gdb.base/dump.exp
+++ b/gdb/testsuite/gdb.base/dump.exp
@@ -92,11 +92,11 @@  remote_exec host "rm -f $filenames"
 
 # Run target program until data structs are initialized.
 
 if {![runto checkpoint1]} {
     untested "couldn't run to checkpoint"
-    return -1
+    return
 }
 
 # Get the endianness for the later use with endianless formats.
 
 set endian [get_endianness]
diff --git a/gdb/testsuite/gdb.base/dup-sect.exp b/gdb/testsuite/gdb.base/dup-sect.exp
index a2c74f51a6cd..ef9ba340ae24 100644
--- a/gdb/testsuite/gdb.base/dup-sect.exp
+++ b/gdb/testsuite/gdb.base/dup-sect.exp
@@ -35,11 +35,11 @@  if {![istarget *-*-linux*]
 standard_testfile .S
 set srcmainfile start.c
 set executable ${testfile}
 
 if {[build_executable ${testfile}.exp $executable [list ${srcfile} ${srcmainfile}] {}] == -1} {
-    return -1
+    return
 }
 
 set test "rename section"
 set objcopy_program [gdb_find_objcopy]
 set result [catch {exec $objcopy_program --rename-section sect2=sect1 $binfile} output]
diff --git a/gdb/testsuite/gdb.base/duplicate-bp.exp b/gdb/testsuite/gdb.base/duplicate-bp.exp
index 959eb7697d93..5fd96928e2e9 100644
--- a/gdb/testsuite/gdb.base/duplicate-bp.exp
+++ b/gdb/testsuite/gdb.base/duplicate-bp.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if { [build_executable "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 # Setup for the test, create COUNT breakpoints at the function BREAKPT.
 proc test_setup { count } {
     global srcfile
diff --git a/gdb/testsuite/gdb.base/early-init-file.exp b/gdb/testsuite/gdb.base/early-init-file.exp
index b609e2c19920..cbbfefa6912f 100644
--- a/gdb/testsuite/gdb.base/early-init-file.exp
+++ b/gdb/testsuite/gdb.base/early-init-file.exp
@@ -20,11 +20,11 @@  require {!is_remote host}
 
 standard_testfile
 
 # Compile the test executable.
 if {[build_executable "failed to build" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 set custom_signal_handle_re \
     "warning: Found custom handler for signal $decimal \(\[^\r\n\]+\) preinstalled\."
 set signal_dispositions_re \
diff --git a/gdb/testsuite/gdb.base/eh_return.exp b/gdb/testsuite/gdb.base/eh_return.exp
index 55cca9362d38..c6f1d7375c58 100644
--- a/gdb/testsuite/gdb.base/eh_return.exp
+++ b/gdb/testsuite/gdb.base/eh_return.exp
@@ -52,11 +52,11 @@  if {[istarget "powerpc*"]} {
     set compile_flags {debug nopie}
 }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 $compile_flags]} {
-    return -1
+    return
 }
 
 set address -1
 
 # Get the address of the last insn in function eh2.
diff --git a/gdb/testsuite/gdb.base/ena-dis-br.exp b/gdb/testsuite/gdb.base/ena-dis-br.exp
index bdf54d083f08..5f208644a366 100644
--- a/gdb/testsuite/gdb.base/ena-dis-br.exp
+++ b/gdb/testsuite/gdb.base/ena-dis-br.exp
@@ -21,11 +21,11 @@ 
 
 standard_testfile break.c break1.c
 
 if {[prepare_for_testing "failed to prepare" ${testfile} \
 	 [list $srcfile $srcfile2] {debug nowarnings}]} {
-    return -1
+    return
 }
 
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 set bp_location7 [gdb_get_line_number "set breakpoint 7 here"]
 set bp_location8 [gdb_get_line_number "set breakpoint 8 here" $srcfile2]
diff --git a/gdb/testsuite/gdb.base/endianity.exp b/gdb/testsuite/gdb.base/endianity.exp
index 661a83d5e543..0da319a824cd 100644
--- a/gdb/testsuite/gdb.base/endianity.exp
+++ b/gdb/testsuite/gdb.base/endianity.exp
@@ -43,10 +43,10 @@  gdb_test "print o" "= {v = 4, w = 3, x = 2, f = 1.5, cplx = 1.25 \\+ 7.25i, d =
 
 if { !$test_sso } {
     # The rest of the testcase requires Scalar Storage Order support.
     # This compiler does not support it, so skip the rest.
     unsupported "No scalar storage order support"
-    return -1
+    return
 }
 
 gdb_test "x/x &o.v" "0x04000000"
 gdb_test "x/xh &o.w" "0x0300"
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index 4dac31eb0596..c8d3672cd87d 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -26,11 +26,11 @@  standard_testfile
 set flags {}
 lappend flags debug
 lappend_include_file flags $srcdir/lib/unbuffer_output.c
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile $flags] } {
-    return -1
+    return
 }
 remote_exec build "rm -f core"
 
 set break1_line [gdb_get_line_number "-break1-"]
 gdb_test "b ending-run.c:$break1_line" \
diff --git a/gdb/testsuite/gdb.base/enum_cond.exp b/gdb/testsuite/gdb.base/enum_cond.exp
index 9d660fe05576..0421ea37d8f7 100644
--- a/gdb/testsuite/gdb.base/enum_cond.exp
+++ b/gdb/testsuite/gdb.base/enum_cond.exp
@@ -33,11 +33,11 @@  lappend opts additional_flags=-fshort-enums
 lappend opts additional_flags=-nostdlib
 lappend opts additional_flags=-DHAVE_BUILTIN_TRAP=[have_builtin_trap]
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $opts] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/enumval.exp b/gdb/testsuite/gdb.base/enumval.exp
index aab68ba07304..6942d0265b5b 100644
--- a/gdb/testsuite/gdb.base/enumval.exp
+++ b/gdb/testsuite/gdb.base/enumval.exp
@@ -16,11 +16,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Check the real contents.
 
 set test "print e"
diff --git a/gdb/testsuite/gdb.base/eu-strip-infcall.exp b/gdb/testsuite/gdb.base/eu-strip-infcall.exp
index be1793305dcc..73df0e5650bb 100644
--- a/gdb/testsuite/gdb.base/eu-strip-infcall.exp
+++ b/gdb/testsuite/gdb.base/eu-strip-infcall.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if {[build_executable ${testfile}.exp $testfile] == -1} {
-    return -1
+    return
 }
 
 set test "eu-strip"
 set status [remote_exec build "eu-strip -f ${binfile}.debug $binfile"]
 if {[lindex $status 0] != 0} {
@@ -27,9 +27,9 @@  if {[lindex $status 0] != 0} {
 }
 
 clean_restart $testfile
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "p callfunc (func)" " = 2" "infcall"
diff --git a/gdb/testsuite/gdb.base/eval-avoid-side-effects.exp b/gdb/testsuite/gdb.base/eval-avoid-side-effects.exp
index ce0e1cfa8738..1a6d76cad8d2 100644
--- a/gdb/testsuite/gdb.base/eval-avoid-side-effects.exp
+++ b/gdb/testsuite/gdb.base/eval-avoid-side-effects.exp
@@ -17,15 +17,15 @@ 
 # flag set.
 
 standard_testfile int-type.c
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set sizeof_int [get_sizeof "int" 4]
 
 gdb_test_no_output "set variable x=42" "set variable x=42"
diff --git a/gdb/testsuite/gdb.base/examine-backward.exp b/gdb/testsuite/gdb.base/examine-backward.exp
index 76a904ad7a47..9f986374ebc8 100644
--- a/gdb/testsuite/gdb.base/examine-backward.exp
+++ b/gdb/testsuite/gdb.base/examine-backward.exp
@@ -17,15 +17,15 @@ 
 # number in the 'x' command.
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare for examine-backward" \
 	${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 proc get_first_mapped_address {} {
     global gdb_prompt
 
diff --git a/gdb/testsuite/gdb.base/exe-lock.exp b/gdb/testsuite/gdb.base/exe-lock.exp
index d6ad59172f3e..c4c6585cf7f8 100644
--- a/gdb/testsuite/gdb.base/exe-lock.exp
+++ b/gdb/testsuite/gdb.base/exe-lock.exp
@@ -29,11 +29,11 @@  if { [prepare_for_testing "prepare" $testfile $srcfile] != 0 } {
 # Sanity-check: Verify that the executable exists. This is just to
 # make sure that, when we verify later that the file does not exist,
 # it really has been deleted.
 if { ! [file exists $binfile] } {
     fail "executable does not exist (${binfile})"
-    return -1
+    return
     }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
index 5f96b7039978..98d38c9ccefa 100644
--- a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
+++ b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
@@ -29,25 +29,25 @@  set exec1 [standard_output_file $testfile1]
 set exec2 [standard_output_file $testfile2]
 
 if { [gdb_compile [file join $srcdir $subdir $srcfile] $objfile \
 	  object [list debug]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if { [gdb_compile $objfile $exec1 executable {debug text_segment=0x1000000}] != ""
      || [gdb_compile $objfile $exec2 executable {debug text_segment=0x2000000}] != ""} {
     untested "link failed"
-    return -1
+    return
 }
 
 # First check whether the address of "main" in exec1 is readable in
 # exec2.  If it is, then skip the test as unsupported.
 
 clean_restart $testfile1
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set addr ""
 set test "main address first"
 gdb_test_multiple "p/x &main" $test {
@@ -57,11 +57,11 @@  gdb_test_multiple "p/x &main" $test {
     }
 }
 
 clean_restart $testfile2
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set cannot_access 0
 set test "probe memory access"
 gdb_test_multiple "x $addr" $test {
diff --git a/gdb/testsuite/gdb.base/execution-termios.exp b/gdb/testsuite/gdb.base/execution-termios.exp
index f82b62afc985..c448b1e29139 100644
--- a/gdb/testsuite/gdb.base/execution-termios.exp
+++ b/gdb/testsuite/gdb.base/execution-termios.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Run to main, and execute BODY in the caller's context, with PREFIX
 # set as test message prefix.
 
diff --git a/gdb/testsuite/gdb.base/exitsignal.exp b/gdb/testsuite/gdb.base/exitsignal.exp
index 7bbf82db79c4..aa2710450b50 100644
--- a/gdb/testsuite/gdb.base/exitsignal.exp
+++ b/gdb/testsuite/gdb.base/exitsignal.exp
@@ -24,19 +24,19 @@ 
 require {!target_info exists gdb,nosignals}
 
 standard_testfile segv.c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 # Run to main.  But, before, change cwd to get the core into the
 # output directory.
 set_inferior_cwd_to_output_dir
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 # Get the inferior's PID for later.
 set pid [get_inferior_pid]
 
@@ -83,11 +83,11 @@  gdb_test "print \$_exitcode" " = void" \
 # Now we test the behavior of $_exit{code,signal} during a normal
 # inferior execution.
 standard_testfile normal.c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 # Checking $_exitsignal and $_exitcode, both should be void before the
 # inferior is executed.
 gdb_test "print \$_exitsignal" " = void" \
@@ -95,11 +95,11 @@  gdb_test "print \$_exitsignal" " = void" \
 gdb_test "print \$_exitcode" " = void" \
     "\$_exitcode is void before normal inferior is executed"
 
 # Run the inferior until the end.
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 gdb_continue_to_end
 
 # Checking $_exitcode.  It should be 0.
diff --git a/gdb/testsuite/gdb.base/expand-psymtabs.exp b/gdb/testsuite/gdb.base/expand-psymtabs.exp
index cd29d1098f4b..fb670204dcb1 100644
--- a/gdb/testsuite/gdb.base/expand-psymtabs.exp
+++ b/gdb/testsuite/gdb.base/expand-psymtabs.exp
@@ -32,10 +32,10 @@  standard_testfile
 
 # We intentionally compile the source file in twice.
 if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile debug $srcfile {debug additional_flags=-DFIRST} \
 	      $srcfile debug]]} {
-    return -1
+    return
 }
 
 set foo_bp [gdb_get_line_number "Break here"]
 gdb_test "break $foo_bp" "Breakpoint.*" "expand psymtabs"
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index d33c8224a10f..b68645e8bb64 100644
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -27,11 +27,11 @@  if {[is_remote host]} {
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	   executable \
 	   [list debug additional_flags=[quote_for_host -DOUTDIR=\"$outdir/\"]]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set dir2 [standard_output_file dir2.fileio.test]
 if {[file exists $dir2] && ![file writable $dir2]} {
     system "chmod +w $dir2"
diff --git a/gdb/testsuite/gdb.base/filesym.exp b/gdb/testsuite/gdb.base/filesym.exp
index 50018b6ae5a5..0ec92c2686d5 100644
--- a/gdb/testsuite/gdb.base/filesym.exp
+++ b/gdb/testsuite/gdb.base/filesym.exp
@@ -17,16 +17,16 @@ 
 # on a name which is potentially both a symbol name and a file name.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if { ![readline_is_used] } {
     unsupported "completion doesn't work when readline isn't used."
-    return -1
+    return
 }
 
 
 # Test completion list for "filesy".  We expect the immediate result to
 # complete to "filesym"; completing again, we expect the symbol name and the
diff --git a/gdb/testsuite/gdb.base/find-unmapped.exp b/gdb/testsuite/gdb.base/find-unmapped.exp
index 3e67b4dd83e1..5c75db1680af 100644
--- a/gdb/testsuite/gdb.base/find-unmapped.exp
+++ b/gdb/testsuite/gdb.base/find-unmapped.exp
@@ -14,15 +14,15 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 if {![runto breakpt]} {
-    return -1
+    return
 }
 
 # Basic attempt to read memory from globals.
 gdb_test "x/5w global_var_1" \
     "$hex:\[ \t\]+0\[ \t\]+0\[ \t\]+0\[ \t\]+0\r\n$hex:\[ \t\]+Cannot access memory at address $hex"
diff --git a/gdb/testsuite/gdb.base/finish-pretty.exp b/gdb/testsuite/gdb.base/finish-pretty.exp
index ee87380a6706..6b79add3a204 100644
--- a/gdb/testsuite/gdb.base/finish-pretty.exp
+++ b/gdb/testsuite/gdb.base/finish-pretty.exp
@@ -23,11 +23,11 @@  lappend opts debug
 if { [have_fvar_tracking] } {
     lappend opts "additional_flags=-fvar-tracking"
 }
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] } {
-    return -1
+    return
 }
 
 proc finish_pretty { } {
     if {![runto foo]} {
 	return
diff --git a/gdb/testsuite/gdb.base/finish.exp b/gdb/testsuite/gdb.base/finish.exp
index f15106f1fd0f..973f4cf3f742 100644
--- a/gdb/testsuite/gdb.base/finish.exp
+++ b/gdb/testsuite/gdb.base/finish.exp
@@ -17,11 +17,11 @@ 
 
 set allow_float_test [allow_float_test]
 
 # re-use the program from the "return2" test.
 if { [prepare_for_testing "failed to prepare" finish return2.c] } {
-    return -1
+    return
 }
 
 proc finish_1 { type } {
     global gdb_prompt
 
diff --git a/gdb/testsuite/gdb.base/float.exp b/gdb/testsuite/gdb.base/float.exp
index 87e522c0983a..5777cbc3a310 100644
--- a/gdb/testsuite/gdb.base/float.exp
+++ b/gdb/testsuite/gdb.base/float.exp
@@ -22,11 +22,11 @@ 
 # Test floating-point related functionality.
 #
 
 
 if { [prepare_for_testing "failed to prepare" float float.c] } {
-    return -1
+    return
 }
 
 # Set it up at a breakpoint so we have its registers.
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/float128.exp b/gdb/testsuite/gdb.base/float128.exp
index a02ae20f29c2..37aa51364161 100644
--- a/gdb/testsuite/gdb.base/float128.exp
+++ b/gdb/testsuite/gdb.base/float128.exp
@@ -25,11 +25,11 @@  proc do_compile { {opts {}} } {
     gdb_compile "${srcdir}/${subdir}/${srcfile}" "$binfile" executable $ccopts
 }
 
 if { [do_compile] != "" && [do_compile {-mfloat128}] != "" } {
     untested "compiler can't handle __float128 type?"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/floatn.exp b/gdb/testsuite/gdb.base/floatn.exp
index d086fcb9185b..8f6d4f03bafc 100644
--- a/gdb/testsuite/gdb.base/floatn.exp
+++ b/gdb/testsuite/gdb.base/floatn.exp
@@ -25,11 +25,11 @@  proc do_compile { {opts {}} } {
     gdb_compile "${srcdir}/${subdir}/${srcfile}" "$binfile" executable $ccopts
 }
 
 if { [do_compile] != "" && [do_compile {-mfloat128}] != "" } {
     untested "compiler can't handle _FloatN/_FloatNx types?"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/foll-fork-syscall.exp b/gdb/testsuite/gdb.base/foll-fork-syscall.exp
index 580a130bc520..0452d403c62a 100644
--- a/gdb/testsuite/gdb.base/foll-fork-syscall.exp
+++ b/gdb/testsuite/gdb.base/foll-fork-syscall.exp
@@ -23,11 +23,11 @@  require {is_any_target "i?86-*-*" "x86_64-*-*"}
 require allow_fork_tests
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 proc setup_gdb {} {
     global testfile
 
diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp
index 671bcf385431..0cd16001c336 100644
--- a/gdb/testsuite/gdb.base/foll-fork.exp
+++ b/gdb/testsuite/gdb.base/foll-fork.exp
@@ -20,11 +20,11 @@  require !gdb_debug_enabled
 require allow_fork_tests
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Restart GDB and run the inferior to main.  Return 1 on success, 0 on failure.
 
 proc setup {} {
diff --git a/gdb/testsuite/gdb.base/foll-vfork.exp b/gdb/testsuite/gdb.base/foll-vfork.exp
index 1a387772c4cc..d58b64095f7c 100644
--- a/gdb/testsuite/gdb.base/foll-vfork.exp
+++ b/gdb/testsuite/gdb.base/foll-vfork.exp
@@ -26,21 +26,21 @@  set binfile $testfile
 set binfile2 ${testfile}-exit
 set binfile3 vforked-prog
 
 if {[build_executable "compile $binfile" $binfile $srcfile] == -1} {
     untested "failed to compile first test binary"
-    return -1
+    return
 }
 
 if {[build_executable "compile $binfile2" $binfile2 $srcfile2] == -1} {
     untested "failed to compile second test binary"
-    return -1
+    return
 }
 
 if {[build_executable "compile $binfile3" $binfile3 $srcfile3] == -1} {
     untested "failed to compile third test binary"
-    return -1
+    return
 }
 
 # If required, download the program that we exec after vfork to the
 # remote target.
 if { [is_remote target] } {
diff --git a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp b/gdb/testsuite/gdb.base/fork-print-inferior-events.exp
index 1bb5d70d714f..27b71e7e9772 100644
--- a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp
+++ b/gdb/testsuite/gdb.base/fork-print-inferior-events.exp
@@ -29,11 +29,11 @@  require !use_gdb_stub
 require !gdb_debug_enabled
 
 standard_testfile
 
 if { [build_executable "failed to prepare" $testfile $srcfile debug] } {
-    return -1
+    return
 }
 
 # This is the expected output for each of the test combinations
 # below.  The order here is important:
 #
diff --git a/gdb/testsuite/gdb.base/fortran-sym-case.exp b/gdb/testsuite/gdb.base/fortran-sym-case.exp
index 403ea46d75e2..2ebb358c82d5 100644
--- a/gdb/testsuite/gdb.base/fortran-sym-case.exp
+++ b/gdb/testsuite/gdb.base/fortran-sym-case.exp
@@ -14,15 +14,15 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "set language fortran" {Warning: the current language does not match this frame\.}
 
 gdb_test "frame" ", aRGv=.*"
diff --git a/gdb/testsuite/gdb.base/frame-info-consistent.exp b/gdb/testsuite/gdb.base/frame-info-consistent.exp
index 5ad825c33e2b..f1ab8b0cc550 100644
--- a/gdb/testsuite/gdb.base/frame-info-consistent.exp
+++ b/gdb/testsuite/gdb.base/frame-info-consistent.exp
@@ -24,11 +24,11 @@  standard_testfile backtrace.c
 set flags {}
 lappend flags debug
 lappend_include_file flags $srcdir/lib/attributes.h
 
 if { [build_executable "failed to prepare" $testfile $srcfile $flags] } {
-    return -1
+    return
 }
 
 # Unwind to each function in FRAMES, and compare "info frame" output
 # to what was saved in the 'info_frame_before' array.
 proc compare_frames {frames} {
diff --git a/gdb/testsuite/gdb.base/frame-selection.exp b/gdb/testsuite/gdb.base/frame-selection.exp
index a7e99a4dffd8..b3fb5e13d251 100644
--- a/gdb/testsuite/gdb.base/frame-selection.exp
+++ b/gdb/testsuite/gdb.base/frame-selection.exp
@@ -17,11 +17,11 @@ 
 # 'select-frame', and 'info frame' commands.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 runto_main
 gdb_breakpoint frame_2
 gdb_continue_to_breakpoint frame_2
diff --git a/gdb/testsuite/gdb.base/frame-unwind-disable.exp b/gdb/testsuite/gdb.base/frame-unwind-disable.exp
index e483b9e9904a..3d6e098abfdd 100644
--- a/gdb/testsuite/gdb.base/frame-unwind-disable.exp
+++ b/gdb/testsuite/gdb.base/frame-unwind-disable.exp
@@ -72,11 +72,11 @@  proc check_unwinder_class { unwinder_class state {testname ""} } {
 	}
     }
 }
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     untested "couldn't run to main"
     return
diff --git a/gdb/testsuite/gdb.base/frameapply.exp b/gdb/testsuite/gdb.base/frameapply.exp
index 73650052ad9e..7525ba5085c5 100644
--- a/gdb/testsuite/gdb.base/frameapply.exp
+++ b/gdb/testsuite/gdb.base/frameapply.exp
@@ -19,11 +19,11 @@ 
 # Test 'frame apply [all | COUNT | -COUNT | level LEVEL...] [FLAG]... COMMAND'.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 if {![runto setup_done]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/freebpcmd.exp b/gdb/testsuite/gdb.base/freebpcmd.exp
index 0c545b671678..8fe8dab13e95 100644
--- a/gdb/testsuite/gdb.base/freebpcmd.exp
+++ b/gdb/testsuite/gdb.base/freebpcmd.exp
@@ -44,11 +44,11 @@ 
 # suggestions for improving this.
 
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 gdb_test "break ${srcfile}:[gdb_get_line_number "euphonium"]" ".*" \
     "set breakpoint"
 
diff --git a/gdb/testsuite/gdb.base/fullname.exp b/gdb/testsuite/gdb.base/fullname.exp
index 8572eeaf5ab1..7f46cb56d858 100644
--- a/gdb/testsuite/gdb.base/fullname.exp
+++ b/gdb/testsuite/gdb.base/fullname.exp
@@ -25,16 +25,16 @@  require {!is_remote host}
 # Create a temporary file in the build directory.  Use a different
 # filename in case ${srcdir} == ${objdir}.
 if { [catch {file copy -force ${srcdir}/${subdir}/${srcfile} \
 			      [standard_output_file tmp-${srcfile}]}] != 0 } {
     error "Could not create temporary file"
-    return -1
+    return
 }
 
 # Build the test executable using an absolute path.
 if  { [gdb_compile [standard_output_file tmp-${srcfile}] "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 # Unlike most GDB tests, we do not use gdb_reinitialize_dir in this script.
 # We're testing GDB's ability to find files in other ways.
 
@@ -65,11 +65,11 @@  if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} {no-message}]
 }
 
 # Build the test executable using a relative path.
 if  { [gdb_compile [relative_filename [pwd] [build_standard_output_file tmp-${srcfile}]] \
 	   "${binfile}" executable {debug}] != "" } {
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 set msg "set breakpoint by full path before loading symbols - built relative"
diff --git a/gdb/testsuite/gdb.base/fullpath-expand.exp b/gdb/testsuite/gdb.base/fullpath-expand.exp
index a470c1e2e978..053eb9b59f0a 100644
--- a/gdb/testsuite/gdb.base/fullpath-expand.exp
+++ b/gdb/testsuite/gdb.base/fullpath-expand.exp
@@ -19,11 +19,11 @@  standard_testfile .c fullpath-expand-func.c
 # directory.
 require {!is_remote host}
 
 if { [file pathtype $objdir] != "absolute" } {
     untested "objdir $objdir is not absolute"
-    return -1
+    return
 }
 
 with_cwd $srcdir {
     set err [gdb_compile "${subdir}/${srcfile} ${subdir}/${srcfile2}" $binfile executable {debug}]
 
@@ -34,11 +34,11 @@  with_cwd $srcdir {
 }
 
 set result [catch {exec realpath ${srcdir}/${subdir}/${srcfile2}} realsrcfile2]
 if { $result != 0 || $realsrcfile2 == "" } {
     untested "invalid realpath of ${srcfile2}: result $result output $realsrcfile2"
-    return -1
+    return
 }
 
 clean_restart ${testfile}
 
 gdb_test "rbreak $realsrcfile2:func" \
diff --git a/gdb/testsuite/gdb.base/func-ptr.exp b/gdb/testsuite/gdb.base/func-ptr.exp
index 8cc148ded9d3..0f656d127807 100644
--- a/gdb/testsuite/gdb.base/func-ptr.exp
+++ b/gdb/testsuite/gdb.base/func-ptr.exp
@@ -16,11 +16,11 @@ 
 # This testcase exercises bug 15695.
 # Trying to print foo->bar if foo is a pointer to a typedef of a pointer
 # to a function will put gdb into an infinite loop.
 
 if { [prepare_for_testing "failed to prepare" "func-ptr" {func-ptr.c} {debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/func-ptrs.exp b/gdb/testsuite/gdb.base/func-ptrs.exp
index 66c3daac7a91..a36bc2559c04 100644
--- a/gdb/testsuite/gdb.base/func-ptrs.exp
+++ b/gdb/testsuite/gdb.base/func-ptrs.exp
@@ -14,15 +14,15 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 set testname func-ptrs
 set srcfile ${testname}.c
 if { [prepare_for_testing "failed to prepare" ${testname} ${srcfile}] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 
 # First set our breakpoints.
 
diff --git a/gdb/testsuite/gdb.base/funcargs.exp b/gdb/testsuite/gdb.base/funcargs.exp
index 4a2d96e1b3e4..fdfdf07b78c6 100644
--- a/gdb/testsuite/gdb.base/funcargs.exp
+++ b/gdb/testsuite/gdb.base/funcargs.exp
@@ -26,11 +26,11 @@  if {[support_complex_tests]} {
 }
 
 set allow_float_test [allow_float_test]
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $compile_flags]} {
-    return -1
+    return
 }
 
 #
 # Locate actual args; integral types.
 #
diff --git a/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp b/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp
index 3dcc4f00d0a6..ad9bd89226df 100644
--- a/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp
+++ b/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp
@@ -30,10 +30,10 @@  if { [prepare_for_testing "prepare" $filename $srcfile] != 0 } {
 
 gdb_test_no_output "set args ${pattern}"	\
     "set buffer exceeding arguments"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_gcore_cmd [standard_output_file gcore-buffer-overflow.test] \
     "save a corefile"
diff --git a/gdb/testsuite/gdb.base/gcore-memory-usage.exp b/gdb/testsuite/gdb.base/gcore-memory-usage.exp
index fc57d1604e29..e9a0f2a69e4b 100644
--- a/gdb/testsuite/gdb.base/gcore-memory-usage.exp
+++ b/gdb/testsuite/gdb.base/gcore-memory-usage.exp
@@ -19,11 +19,11 @@  require {istarget "*-*-linux*"}
 require can_spawn_for_attach
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug}] == -1} {
-    return -1
+    return
 }
 
 # Read the proc_pid_status page, to find how much memory the given
 # PID is using.  This is meant to be used to find the
 # memory usage for the GDB in this test.
diff --git a/gdb/testsuite/gdb.base/gcore-relro-pie.exp b/gdb/testsuite/gdb.base/gcore-relro-pie.exp
index 5730f89eadf6..85abc100dff6 100644
--- a/gdb/testsuite/gdb.base/gcore-relro-pie.exp
+++ b/gdb/testsuite/gdb.base/gcore-relro-pie.exp
@@ -19,20 +19,20 @@ 
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile \
 	 {debug pie "ldflags=-Wl,-z,relro"}]} {
-    return -1
+    return
 }
 
 set stripped_binfile ${binfile}.stripped
 set gcorefile ${binfile}.gcore
 
 set strip_program [transform strip]
 remote_file host delete ${stripped_binfile}
 if {[run_on_host "strip" "$strip_program" "-g -o ${stripped_binfile} $binfile"]} {
-    return -1
+    return
 }
 
 # Workaround PR binutils/10802:
 # Preserve the 'x' bit also for PIEs (Position Independent Executables).
 set perm [file attributes ${binfile} -permissions]
@@ -41,15 +41,15 @@  file attributes ${stripped_binfile} -permissions $perm
 clean_restart
 gdb_load $stripped_binfile
 
 # The binary is stripped of debug info, but not minsyms.
 if {![runto break_here]} {
-    return -1
+    return
 }
 
 if {![gdb_gcore_cmd $gcorefile "save a corefile"]} {
-    return -1
+    return
 }
 
 # Now restart gdb with the unstripped binary and load the corefile.
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.base/gcore-tls-pie.exp b/gdb/testsuite/gdb.base/gcore-tls-pie.exp
index fa3cda88c3f4..8306142cc807 100644
--- a/gdb/testsuite/gdb.base/gcore-tls-pie.exp
+++ b/gdb/testsuite/gdb.base/gcore-tls-pie.exp
@@ -18,25 +18,25 @@ 
 # and then try to debug the core with the unstripped version.
 
 standard_testfile
 
 if { [have_fuse_ld_gold] == 0} {
-    return -1
+    return
 }
 
 if {[build_executable "failed to prepare" $testfile $srcfile \
 	 {debug pie "ldflags=-fuse-ld=gold"}]} {
-    return -1
+    return
 }
 
 set stripped_binfile ${binfile}.stripped
 set gcorefile ${binfile}.gcore
 
 set strip_program [transform strip]
 remote_file host delete ${stripped_binfile}
 if {[run_on_host "strip" "$strip_program" "-g -o ${stripped_binfile} $binfile"]} {
-    return -1
+    return
 }
 
 # Workaround PR binutils/10802:
 # Preserve the 'x' bit also for PIEs (Position Independent Executables).
 set perm [file attributes ${binfile} -permissions]
@@ -45,15 +45,15 @@  file attributes ${stripped_binfile} -permissions $perm
 clean_restart
 gdb_load $stripped_binfile
 
 # The binary is stripped of debug info, but not minsyms.
 if {![runto break_here]} {
-    return -1
+    return
 }
 
 if {![gdb_gcore_cmd $gcorefile "save a corefile"]} {
-    return -1
+    return
 }
 
 # Now restart gdb with the unstripped binary and load the corefile.
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp
index fa30f50a63c6..aa887b0da14d 100644
--- a/gdb/testsuite/gdb.base/gcore.exp
+++ b/gdb/testsuite/gdb.base/gcore.exp
@@ -19,15 +19,15 @@ 
 require gcore_cmd_available
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "break terminal_func" "Breakpoint .* at .*${srcfile}, line .*" \
 	"set breakpoint at terminal_func"
 
diff --git a/gdb/testsuite/gdb.base/gdb-index-err.exp b/gdb/testsuite/gdb.base/gdb-index-err.exp
index 6fcc8b6526de..4e6f15d5d9f1 100644
--- a/gdb/testsuite/gdb.base/gdb-index-err.exp
+++ b/gdb/testsuite/gdb.base/gdb-index-err.exp
@@ -17,20 +17,20 @@ 
 # command.
 
 standard_testfile
 
 if {[prepare_for_testing "prepare for test" $testfile $srcfile] == -1} {
-    return -1
+    return
 }
 
 # This test isn't going to work when the board file automatically adds
 # an index section, or if the debug information is split into a
 # separate objfile.
 set index_type [get_index_type $binfile "check debug style"]
 if { $index_type ne "cooked" } {
     unsupported "cannot test without a cooked index"
-    return -1
+    return
 }
 
 
 # The name of a directory that doesn't exist.
 set bad_dir [standard_output_file "non-existent"]
diff --git a/gdb/testsuite/gdb.base/gdb-sigterm.exp b/gdb/testsuite/gdb.base/gdb-sigterm.exp
index ca3622d3462b..7c5b43de0855 100644
--- a/gdb/testsuite/gdb.base/gdb-sigterm.exp
+++ b/gdb/testsuite/gdb.base/gdb-sigterm.exp
@@ -24,11 +24,11 @@  standard_testfile
 # The test program exits after a while, in case GDB crashes.  Make it
 # wait at least as long as we may wait before declaring a time out
 # failure.
 set options { "additional_flags=-DTIMEOUT=$timeout" debug }
 if { [build_executable ${testfile}.exp ${testfile} $srcfile $options] == -1 } {
-    return -1
+    return
 }
 
 # Return 0 on success, non-zero otherwise.
 
 proc do_test { pass } {
diff --git a/gdb/testsuite/gdb.base/gdb1090.exp b/gdb/testsuite/gdb.base/gdb1090.exp
index 5e0e6e1047bc..2a2ff1a5ada2 100644
--- a/gdb/testsuite/gdb.base/gdb1090.exp
+++ b/gdb/testsuite/gdb.base/gdb1090.exp
@@ -23,11 +23,11 @@ 
 #
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 1
 }
diff --git a/gdb/testsuite/gdb.base/gdb11530.exp b/gdb/testsuite/gdb.base/gdb11530.exp
index d27fde87d63e..fb293b986c7d 100644
--- a/gdb/testsuite/gdb.base/gdb11530.exp
+++ b/gdb/testsuite/gdb.base/gdb11530.exp
@@ -25,11 +25,11 @@  standard_testfile
 if { ![test_compiler_info gcc*] } {
     return 0
 }
 
 if { [prepare_for_testing "failed to prepare" $testfile $testfile.c {debug}] } {
-    return -1
+    return
 }
 
 
 if {![runto_main]} {
     return
diff --git a/gdb/testsuite/gdb.base/gdb11531.exp b/gdb/testsuite/gdb.base/gdb11531.exp
index bbff1d2cea74..6ed23921f23e 100644
--- a/gdb/testsuite/gdb.base/gdb11531.exp
+++ b/gdb/testsuite/gdb.base/gdb11531.exp
@@ -28,11 +28,11 @@ 
 set allow_hw_watchpoint_tests_p [allow_hw_watchpoint_tests]
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $testfile.c {debug}] } {
-    return -1
+    return
 }
 
 # Disable hardware watchpoints if necessary.
 if {!$allow_hw_watchpoint_tests_p} {
    gdb_test_no_output "set can-use-hw-watchpoints 0" ""
diff --git a/gdb/testsuite/gdb.base/gdb1821.exp b/gdb/testsuite/gdb.base/gdb1821.exp
index 1e79c0752dfb..a89fe9390ecb 100644
--- a/gdb/testsuite/gdb.base/gdb1821.exp
+++ b/gdb/testsuite/gdb.base/gdb1821.exp
@@ -23,11 +23,11 @@ 
 #
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.base/gdbvars.exp b/gdb/testsuite/gdb.base/gdbvars.exp
index 1768b36c8b64..9522d5f2f39b 100644
--- a/gdb/testsuite/gdb.base/gdbvars.exp
+++ b/gdb/testsuite/gdb.base/gdbvars.exp
@@ -17,11 +17,11 @@ 
 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 proc test_convenience_variables {} {
     global gdb_prompt
 
diff --git a/gdb/testsuite/gdb.base/gnu-debugdata.exp b/gdb/testsuite/gdb.base/gnu-debugdata.exp
index e2addf418c9f..9bac264fce7c 100644
--- a/gdb/testsuite/gdb.base/gnu-debugdata.exp
+++ b/gdb/testsuite/gdb.base/gnu-debugdata.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if {[build_executable ${testfile}.exp $testfile]} {
-    return -1
+    return
 }
 
 set pipeline_counter 0
 
 set objcopy_program [gdb_find_objcopy]
@@ -67,72 +67,72 @@  proc pipeline {test args} {
 remote_file host delete ${binfile}.dynsyms
 if {[pipeline "nm -D" \
 	 [list [transform nm] "-D ${binfile} --format=posix --defined-only"] \
 	 [list awk "\\{print\\ \\\$1\\}"] \
 	 [list sort "" "" "${binfile}.dynsyms"]]} {
-    return -1
+    return
 }
 
 # Extract all the text (i.e. function) symbols from the debuginfo.
 # (Note that we actually also accept "D" symbols, for the benefit
 # of platforms like PowerPC64 that use function descriptors.)
 remote_file host delete ${binfile}.funcsyms
 if {[pipeline "nm" \
 	 [list [transform nm] "${binfile} --format=posix --defined-only"] \
 	 [list awk "\\{if(\\\$2==\"T\"||\\\$2==\"t\"||\\\$2==\"D\")print\\ \\\$1\\}"] \
 	 [list sort "" "" "${binfile}.funcsyms"]]} {
-    return -1
+    return
 }
 
 # Keep all the function symbols not already in the dynamic symbol
 # table.
 remote_file host delete ${binfile}.keep_symbols
 if {[run_on_host "comm" "comm" "-13 ${binfile}.dynsyms ${binfile}.funcsyms" "" \
 	 "${binfile}.keep_symbols"]} {
-    return -1
+    return
 }
 
 # GDB specific - we do not have split executable in advance.
 remote_file host delete ${binfile}.strip
 if {[run_on_host "strip" [transform strip] \
 	 "--strip-all -R .comment -o ${binfile}.strip ${binfile}"]} {
-    return -1
+    return
 }
 
 # Separate full debug info into ${binfile}.debug.
 remote_file host delete ${binfile}.debug
 if {[run_on_host "copydebug" ${objcopy_program} \
 	 "--only-keep-debug ${binfile} ${binfile}.debug"]} {
-    return -1
+    return
 }
 
 # Copy the full debuginfo, keeping only a minimal set of symbols and
 # removing some unnecessary sections.
 remote_file host delete ${binfile}.mini_debuginfo
 if {[run_on_host "objcopy 1" ${objcopy_program} "-S --remove-section .gdb_index --remove-section .comment --keep-symbols=${binfile}.keep_symbols ${binfile}.debug ${binfile}.mini_debuginfo"]} {
-    return -1
+    return
 }
 
 # Add the .gnu_debuglink section to the .gnu_debugdata file.
 # .gnu_debuglink is normally not present in the .gnu_debugdata section but in
 # some files there may be PT_NOTE with NT_GNU_BUILD_ID and GDB could look up
 # the .debug file from it.  This is only an additional test of GDB, such link
 # is not present in usual MiniDebugInfo sections.
 if {[run_on_host "addlink" ${objcopy_program} \
 	 "--add-gnu-debuglink=${binfile}.debug ${binfile}.mini_debuginfo ${binfile}.mini_debuginfo-debuglink"]} {
-    return -1
+    return
 }
 
 # Inject the compressed data into the .gnu_debugdata section of the
 # original binary.
 remote_file host delete ${binfile}.mini_debuginfo-debuglink.xz
 if {[run_on_host "xz" "xz" "-k ${binfile}.mini_debuginfo-debuglink"]} {
-    return -1
+    return
 }
 remote_file host delete ${binfile}.test
 if {[run_on_host "objcopy 2" ${objcopy_program} "--add-section .gnu_debugdata=${binfile}.mini_debuginfo-debuglink.xz ${binfile}.strip ${binfile}.test"]} {
-    return -1
+    return
 }
 
 clean_restart "$testfile.strip"
 
 gdb_test "p debugdata_function" \
diff --git a/gdb/testsuite/gdb.base/gnu_vector.exp b/gdb/testsuite/gdb.base/gnu_vector.exp
index c1616fd32750..b92d82c3428c 100644
--- a/gdb/testsuite/gdb.base/gnu_vector.exp
+++ b/gdb/testsuite/gdb.base/gnu_vector.exp
@@ -41,11 +41,11 @@  if { [do_compile {-mcpu=native}] != ""
 }
 
 clean_restart $testfile
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 # Get endianess for the scalar->vector casts
 set endian [get_endianness]
 
diff --git a/gdb/testsuite/gdb.base/gstack.exp b/gdb/testsuite/gdb.base/gstack.exp
index 4297b5b4efac..bc524215d50b 100644
--- a/gdb/testsuite/gdb.base/gstack.exp
+++ b/gdb/testsuite/gdb.base/gstack.exp
@@ -17,11 +17,11 @@  require !gdb_protocol_is_remote
 require can_spawn_for_attach
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug}] == -1} {
-    return -1
+    return
 }
 
 set command "$binfile"
 set res [remote_spawn host $command]
 if { ![gdb_assert { ![expr {$res < 0 || $res == ""}] } "spawn inferior"] } {
diff --git a/gdb/testsuite/gdb.base/hashline1.exp b/gdb/testsuite/gdb.base/hashline1.exp
index 9e4b73654580..238f90f8c9df 100644
--- a/gdb/testsuite/gdb.base/hashline1.exp
+++ b/gdb/testsuite/gdb.base/hashline1.exp
@@ -32,11 +32,11 @@  close $fd
 # The choice of path name for the source file is important in order to trigger
 # the bug.  Using $new_srcfile here won't trigger the bug.
 set compile_name [relative_filename $objdir $new_srcfile]
 if { [gdb_compile $compile_name "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 set bp_location [gdb_get_line_number "set breakpoint here" $new_srcfile]
diff --git a/gdb/testsuite/gdb.base/hashline2.exp b/gdb/testsuite/gdb.base/hashline2.exp
index 4881f33d8373..400c0cfcf8ac 100644
--- a/gdb/testsuite/gdb.base/hashline2.exp
+++ b/gdb/testsuite/gdb.base/hashline2.exp
@@ -29,11 +29,11 @@  puts $fd "#line 2 \"///${new_srcfile}\""
 puts $fd "int main () { return 0; } /* set breakpoint here */"
 close $fd
 
 if { [gdb_compile $new_srcfile "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 set bp_location [gdb_get_line_number "set breakpoint here" ${new_srcfile}]
diff --git a/gdb/testsuite/gdb.base/hashline3.exp b/gdb/testsuite/gdb.base/hashline3.exp
index 08c9184526a6..e5c44041937f 100644
--- a/gdb/testsuite/gdb.base/hashline3.exp
+++ b/gdb/testsuite/gdb.base/hashline3.exp
@@ -30,11 +30,11 @@  puts $fd "#line 2 \"./$relative\""
 puts $fd "int main () { return 0; } /* set breakpoint here */"
 close $fd
 
 if { [gdb_compile $new_srcfile "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 set bp_location [gdb_get_line_number "set breakpoint here" $new_srcfile]
diff --git a/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp b/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp
index c4e6a9282d2c..9a0d84536982 100644
--- a/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp
+++ b/gdb/testsuite/gdb.base/hbreak-in-shr-unsupported.exp
@@ -37,11 +37,11 @@  if { [prepare_for_testing "prepare" $testfile $main_src $exec_opts] != 0 } {
 }
 
 gdb_load_shlib $lib_so
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Get main breakpoint out of the way.
 delete_breakpoints
 
diff --git a/gdb/testsuite/gdb.base/hbreak-unmapped.exp b/gdb/testsuite/gdb.base/hbreak-unmapped.exp
index 43e62f4a1f71..f8bfcdaafdf2 100644
--- a/gdb/testsuite/gdb.base/hbreak-unmapped.exp
+++ b/gdb/testsuite/gdb.base/hbreak-unmapped.exp
@@ -16,15 +16,15 @@ 
 require allow_hw_breakpoint_tests
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # If we can read the memory at address 0, skip the test.
 if { [is_address_zero_readable] } {
     untested "memory at address 0 is readable"
diff --git a/gdb/testsuite/gdb.base/hbreak.exp b/gdb/testsuite/gdb.base/hbreak.exp
index 87a4f40defe4..09947f7c7248 100644
--- a/gdb/testsuite/gdb.base/hbreak.exp
+++ b/gdb/testsuite/gdb.base/hbreak.exp
@@ -16,15 +16,15 @@ 
 require allow_hw_breakpoint_tests
 
 set test hbreak
 set srcfile ${test}.c
 if { [prepare_for_testing "failed to prepare" ${test} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set breakline [gdb_get_line_number "break-at-exit"]
 
 gdb_test "hbreak ${srcfile}:${breakline}" \
diff --git a/gdb/testsuite/gdb.base/hbreak2.exp b/gdb/testsuite/gdb.base/hbreak2.exp
index 4d18a4f0cee1..f090aeefee9c 100644
--- a/gdb/testsuite/gdb.base/hbreak2.exp
+++ b/gdb/testsuite/gdb.base/hbreak2.exp
@@ -18,11 +18,11 @@ 
 # Only one hardware breakpoint is set at a time as targets may limit
 # the number available.
 
 
 if { [prepare_for_testing "failed to prepare" "hbreak2" {break.c break1.c} {debug nowarnings}] } {
-    return -1
+    return
 }
 set srcfile break.c
 set srcfile1 break1.c
 
 if {![runto_main]} {
@@ -515,11 +515,11 @@  test_next_with_recursion
 
 # Build a new file with optimization enabled so that we can try breakpoints
 # on targets with optimized prologues.
 
 if { [prepare_for_testing "failed to prepare" "hbreak2o2" {break.c break1.c} {debug nowarnings optimize=-O2}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.base/history-duplicates.exp b/gdb/testsuite/gdb.base/history-duplicates.exp
index 58684fb5d431..ab51e0d1519b 100644
--- a/gdb/testsuite/gdb.base/history-duplicates.exp
+++ b/gdb/testsuite/gdb.base/history-duplicates.exp
@@ -55,11 +55,11 @@  gdb_exit
 gdb_start
 
 # These tests require readline support.
 if { ![readline_is_used] } {
     unsupported "readline isn't used."
-    return -1
+    return
 }
 
 # By default the option is set to 0.
 gdb_test "show history remove-duplicates" "is 0\\."
 
diff --git a/gdb/testsuite/gdb.base/hook-stop.exp b/gdb/testsuite/gdb.base/hook-stop.exp
index 70cef1be92d7..de2fd14c7035 100644
--- a/gdb/testsuite/gdb.base/hook-stop.exp
+++ b/gdb/testsuite/gdb.base/hook-stop.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if { [build_executable ${testfile}.exp "${testfile}" $srcfile {debug nowarnings}] } {
-    return -1
+    return
 }
 
 # Define the hook-stop that runs COMMANDS.
 
 proc define_hook_stop {commands} {
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 3fdb5d16fb2a..08d894e8f424 100644
--- a/gdb/testsuite/gdb.base/hw-sw-break-same-address.exp
+++ b/gdb/testsuite/gdb.base/hw-sw-break-same-address.exp
@@ -21,15 +21,15 @@ 
 require allow_hw_breakpoint_tests
 
 set test hbreak
 set srcfile ${test}.c
 if { [prepare_for_testing "failed to prepare" ${test} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 delete_breakpoints
 
 gdb_test_no_output "set breakpoint always-inserted on"
diff --git a/gdb/testsuite/gdb.base/include-main.exp b/gdb/testsuite/gdb.base/include-main.exp
index a3972675f7de..b78dd51cd62a 100644
--- a/gdb/testsuite/gdb.base/include-main.exp
+++ b/gdb/testsuite/gdb.base/include-main.exp
@@ -16,11 +16,11 @@ 
 # C test-case that mimics gdb.ada/dgopt.exp.
 
 standard_testfile .c main.c
 
 if { [build_executable "failed to prepare" $testfile $srcfile {debug}] } {
-    return -1
+    return
 }
 
 clean_restart
 
 # Set language explicitly, to avoid expanding the include-main.c CU for the
diff --git a/gdb/testsuite/gdb.base/included.exp b/gdb/testsuite/gdb.base/included.exp
index 0b5dd2a1ed23..23bfd96c8404 100644
--- a/gdb/testsuite/gdb.base/included.exp
+++ b/gdb/testsuite/gdb.base/included.exp
@@ -17,11 +17,11 @@  if { [is_remote host] } {
     gdb_remote_download host $srcdir/$subdir/included.h
 }
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set listsize 1"
 
 gdb_test "list -q main" ".*"
diff --git a/gdb/testsuite/gdb.base/infcall-exec.exp b/gdb/testsuite/gdb.base/infcall-exec.exp
index 6b8bd605c090..1b47c6f5d6f9 100644
--- a/gdb/testsuite/gdb.base/infcall-exec.exp
+++ b/gdb/testsuite/gdb.base/infcall-exec.exp
@@ -22,23 +22,23 @@  set testfile2 "infcall-exec2"
 set srcfile2 "${testfile2}.c"
 set binfile2 [standard_output_file $testfile2]
 
 # Build the two executables for the test.
 if {[build_executable "build exec'd file" $testfile2 $srcfile2] != 0} {
-    return -1
+    return
 }
 
 if {[prepare_for_testing "prepare" $testfile $srcfile] != 0} {
-    return -1
+    return
 }
 
 if { [is_remote target] } {
     set binfile2 [gdb_remote_download target $binfile2]
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set linenr [gdb_get_line_number "break here"]
 gdb_breakpoint $linenr
 gdb_continue_to_breakpoint "Ensure PATH is set" ".* break here .*"
diff --git a/gdb/testsuite/gdb.base/infcall-input.exp b/gdb/testsuite/gdb.base/infcall-input.exp
index c60e65bb4c52..a0b6ab28df3a 100644
--- a/gdb/testsuite/gdb.base/infcall-input.exp
+++ b/gdb/testsuite/gdb.base/infcall-input.exp
@@ -19,15 +19,15 @@ 
 standard_testfile
 
 require {!target_info exists gdb,cannot_call_functions}
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Run an infcall that takes a little bit to complete.
 send_gdb "print some_function()\n"
 
diff --git a/gdb/testsuite/gdb.base/inferior-died.exp b/gdb/testsuite/gdb.base/inferior-died.exp
index a5006b363f5a..34434c82c20a 100644
--- a/gdb/testsuite/gdb.base/inferior-died.exp
+++ b/gdb/testsuite/gdb.base/inferior-died.exp
@@ -18,11 +18,11 @@  require allow_fork_tests
 require support_displaced_stepping
 
 standard_testfile .c
 
 if { [build_executable "failed to build" ${testfile} ${testfile}.c] } {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " -ex \"set non-stop on\""
     clean_restart $testfile
diff --git a/gdb/testsuite/gdb.base/infnan.exp b/gdb/testsuite/gdb.base/infnan.exp
index 18a0d235525d..6d635f268779 100644
--- a/gdb/testsuite/gdb.base/infnan.exp
+++ b/gdb/testsuite/gdb.base/infnan.exp
@@ -16,11 +16,11 @@ 
 # Script to test floating point infinities and NaNs.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 runto_main
 
 gdb_test "print a" "${::valnum_re} = inf"
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 674e48e3ee92..a1fffc51ea2b 100644
--- a/gdb/testsuite/gdb.base/info-locals-unused-static-var.exp
+++ b/gdb/testsuite/gdb.base/info-locals-unused-static-var.exp
@@ -27,11 +27,11 @@ 
 # ...
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/info-macros.exp b/gdb/testsuite/gdb.base/info-macros.exp
index 0b1e4a9ffdb6..1c2fcfb26641 100644
--- a/gdb/testsuite/gdb.base/info-macros.exp
+++ b/gdb/testsuite/gdb.base/info-macros.exp
@@ -17,15 +17,15 @@  standard_testfile .c
 
 # Fission doesn't support macros yet.  Bug 15954.
 require !using_fission
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug macros}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Test various error messages.
 gdb_test "info macro -- -all" \
 	 "The symbol `-all' has no definition .*\r\nat .*$srcfile:${::decimal}"
diff --git a/gdb/testsuite/gdb.base/info-os.exp b/gdb/testsuite/gdb.base/info-os.exp
index 632fa314cde8..0f14202ca0ea 100644
--- a/gdb/testsuite/gdb.base/info-os.exp
+++ b/gdb/testsuite/gdb.base/info-os.exp
@@ -16,23 +16,23 @@ 
 standard_testfile .c
 
 # This test is Linux-only.
 if {![istarget *-*-linux*]} {
     unsupported "info-os.exp"
-    return -1
+    return
 }
 
 # Support for XML-output is needed to run this test.
 require allow_xml_test
 
 # Compile test program.
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Get PID of test program.
 set inferior_pid ""
 set test "get inferior process ID"
diff --git a/gdb/testsuite/gdb.base/info-proc.exp b/gdb/testsuite/gdb.base/info-proc.exp
index 1210bcb9af1e..f1b435e249f3 100644
--- a/gdb/testsuite/gdb.base/info-proc.exp
+++ b/gdb/testsuite/gdb.base/info-proc.exp
@@ -58,11 +58,11 @@  if { ! [use_gdb_stub] } {
 # Set another environment variable, this time using a GDB command,
 # to test "info proc environ".
 gdb_test "set environment GDB_INFO_PROC_ENVIRON_2 TWO"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "info proc" "process ${decimal}.*" "info proc with process"
 
 gdb_test "info proc mapping" \
diff --git a/gdb/testsuite/gdb.base/info-shared.exp b/gdb/testsuite/gdb.base/info-shared.exp
index e792b4f98210..41a47a30d7d6 100644
--- a/gdb/testsuite/gdb.base/info-shared.exp
+++ b/gdb/testsuite/gdb.base/info-shared.exp
@@ -25,16 +25,16 @@  set lib2name $testfile-solib2
 set srcfile_lib2 $srcdir/$subdir/$lib2name.c
 set binfile_lib2 [standard_output_file $lib2name.so]
 
 if { [gdb_compile_shlib $srcfile_lib1 $binfile_lib1 {}] != "" } {
     untested "failed to compile shared library 1"
-    return -1
+    return
 }
 
 if { [gdb_compile_shlib $srcfile_lib2 $binfile_lib2 {}] != "" } {
     untested "failed to compile shared library 2"
-    return -1
+    return
 }
 
 set binfile_lib1_target [gdb_download_shlib $binfile_lib1]
 set binfile_lib2_target [gdb_download_shlib $binfile_lib2]
 
@@ -42,11 +42,11 @@  set define2 -DSHLIB2_NAME=\"$binfile_lib2_target\"
 set define1 -DSHLIB1_NAME=\"$binfile_lib1_target\"
 
 set cflags "$define1 $define2"
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 	  [list additional_flags=$cflags shlib_load]] } {
-    return -1
+    return
 }
 
 gdb_locate_shlib $binfile_lib1
 gdb_locate_shlib $binfile_lib2
 
diff --git a/gdb/testsuite/gdb.base/info-target.exp b/gdb/testsuite/gdb.base/info-target.exp
index 3427f175dd0e..91c89cbc4f8f 100644
--- a/gdb/testsuite/gdb.base/info-target.exp
+++ b/gdb/testsuite/gdb.base/info-target.exp
@@ -15,11 +15,11 @@ 
 
 
 standard_testfile start.c
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 set eol "\r\n"
 
 # Check the output of "info target".  Note that we are not interested
diff --git a/gdb/testsuite/gdb.base/info-var.exp b/gdb/testsuite/gdb.base/info-var.exp
index 4b3abcf04fcb..a112a30092f2 100644
--- a/gdb/testsuite/gdb.base/info-var.exp
+++ b/gdb/testsuite/gdb.base/info-var.exp
@@ -17,11 +17,11 @@ 
 
 standard_testfile info-var-f1.c info-var-f2.c
 
 if {[prepare_for_testing "failed to prepare" \
 	 "${testfile}" "$srcfile $srcfile2" "debug"]} {
-    return -1
+    return
 }
 
 # Note: we do not run to main, as otherwise, the output of info variables
 # can be very long, showing thousands of glibc variables.
 # This long output then causes expect's buffer to overflow.
diff --git a/gdb/testsuite/gdb.base/info_minsym.exp b/gdb/testsuite/gdb.base/info_minsym.exp
index d99b1ada0ae9..43e3fd14eb0e 100644
--- a/gdb/testsuite/gdb.base/info_minsym.exp
+++ b/gdb/testsuite/gdb.base/info_minsym.exp
@@ -22,11 +22,11 @@  set testfile info_minsym
 
 standard_testfile info_minsym.c
 
 # Compile the program without debugging information, to have minimal symbols.
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {c}]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "info variables -q -t int minsym" \
     "minsym variables do not match type"
 gdb_test_no_output "info functions -q -t int minsym" \
diff --git a/gdb/testsuite/gdb.base/info_qt.exp b/gdb/testsuite/gdb.base/info_qt.exp
index 471f12235885..40cd9547bae8 100644
--- a/gdb/testsuite/gdb.base/info_qt.exp
+++ b/gdb/testsuite/gdb.base/info_qt.exp
@@ -22,11 +22,11 @@ 
 
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 if {![runto setup_done]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/info_sources.exp b/gdb/testsuite/gdb.base/info_sources.exp
index ddf6e254a5b9..e661b0fc49ff 100644
--- a/gdb/testsuite/gdb.base/info_sources.exp
+++ b/gdb/testsuite/gdb.base/info_sources.exp
@@ -18,11 +18,11 @@ 
 standard_testfile .c info_sources_base.c
 
 if {[prepare_for_testing $testfile.exp $testfile \
 	 [list $srcfile $srcfile2] debug]} {
     untested $testfile.exp
-    return -1
+    return
 }
 
 # Executes "info sources ARGS".
 #
 # EXPECT_SEEN_INFO_SOURCES 1 indicates that the source file info_sources.c
@@ -67,11 +67,11 @@  proc test_info_sources {args expect_seen_info_sources \
 	}
     }
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # List both files with no regexp:
 with_test_prefix "in main" {
     test_info_sources "" 1 1
diff --git a/gdb/testsuite/gdb.base/info_sources_2.exp b/gdb/testsuite/gdb.base/info_sources_2.exp
index 8af48eeb3c49..3c8df2edc9d6 100644
--- a/gdb/testsuite/gdb.base/info_sources_2.exp
+++ b/gdb/testsuite/gdb.base/info_sources_2.exp
@@ -35,11 +35,11 @@  if { [prepare_for_testing "prepare" $testfile $srcfile \
 
 set solib_name [gdb_load_shlib $solib_name]
 
 if {![runto foo]} {
     untested "failed to run to function foo"
-    return -1
+    return
 }
 
 # Invoke 'info sources EXTRA_ARGS' and extract the results.
 # The results are then compared to the list ARGS.
 #
diff --git a/gdb/testsuite/gdb.base/infoline-reloc-main-from-zero.exp b/gdb/testsuite/gdb.base/infoline-reloc-main-from-zero.exp
index 02fc1dd89b0c..85bbe06c15fb 100644
--- a/gdb/testsuite/gdb.base/infoline-reloc-main-from-zero.exp
+++ b/gdb/testsuite/gdb.base/infoline-reloc-main-from-zero.exp
@@ -36,11 +36,11 @@  if { [gdb_can_simple_compile ld-flags {int main () { return 0; }} executable \
     lappend opts $ld_flags
 }
 
 if {[build_executable $testfile.exp $testfile $srcfile $opts] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
 
 # Load symbols at an offset 0xffff0000 using add-symbol-file
diff --git a/gdb/testsuite/gdb.base/infoline.exp b/gdb/testsuite/gdb.base/infoline.exp
index 111e96e65603..3795f741cbcc 100644
--- a/gdb/testsuite/gdb.base/infoline.exp
+++ b/gdb/testsuite/gdb.base/infoline.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 # Verify that the "info line" command does not skip function prologues.
 # If it did, GDB would tell us that the line we're interested in starts
 # at <twice+N> where N is different from zero.
diff --git a/gdb/testsuite/gdb.base/inline-frame-cycle-unwind.exp b/gdb/testsuite/gdb.base/inline-frame-cycle-unwind.exp
index fd9cba78f9ab..4bda78dd27d6 100644
--- a/gdb/testsuite/gdb.base/inline-frame-cycle-unwind.exp
+++ b/gdb/testsuite/gdb.base/inline-frame-cycle-unwind.exp
@@ -52,11 +52,11 @@ 
 standard_testfile
 
 require allow_python_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/interp.exp b/gdb/testsuite/gdb.base/interp.exp
index b47e717b0f73..d19d0e3ceca6 100644
--- a/gdb/testsuite/gdb.base/interp.exp
+++ b/gdb/testsuite/gdb.base/interp.exp
@@ -16,11 +16,11 @@ 
 # interp.exp   Test interpreter-exec command
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile {debug}] } {
-    return -1
+    return
 }
 
 # Do not use gdb_test for this test, since it has two prompts.
 gdb_test_multiple "interpreter-exec mi \"-var-update *\"" "" {
     -re "\\^done,changelist=\\\[\\\]\r\n$gdb_prompt " {
diff --git a/gdb/testsuite/gdb.base/interrupt-a.exp b/gdb/testsuite/gdb.base/interrupt-a.exp
index fa5f5a281ab8..4599aa5eb5a1 100644
--- a/gdb/testsuite/gdb.base/interrupt-a.exp
+++ b/gdb/testsuite/gdb.base/interrupt-a.exp
@@ -17,15 +17,15 @@ 
 
 standard_testfile .c
 set executable ${testfile}
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_multiple "continue &" "" {
     -re "Continuing\\.\r\n$gdb_prompt " {
 	pass $gdb_test_name
diff --git a/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp b/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp
index d8411593e306..d6b241ea57a6 100644
--- a/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp
+++ b/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp
@@ -21,11 +21,11 @@  require {!target_info exists gdb,nointerrupts}
 require can_spawn_for_attach
 
 standard_testfile
 
 if { [build_executable ${testfile}.exp ${testfile} $srcfile {debug}] == -1 } {
-    return -1
+    return
 }
 
 proc do_test {} {
     global binfile
     global decimal
diff --git a/gdb/testsuite/gdb.base/interrupt-daemon.exp b/gdb/testsuite/gdb.base/interrupt-daemon.exp
index 7b6276556c2b..fd9f2f8eefb8 100644
--- a/gdb/testsuite/gdb.base/interrupt-daemon.exp
+++ b/gdb/testsuite/gdb.base/interrupt-daemon.exp
@@ -19,11 +19,11 @@ 
 require allow_fork_tests
 
 standard_testfile
 
 if {[build_executable "failed to build" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 # The test proper.
 
 proc do_test {} {
diff --git a/gdb/testsuite/gdb.base/interrupt-noterm.exp b/gdb/testsuite/gdb.base/interrupt-noterm.exp
index f4252cc90a72..afdb317964f0 100644
--- a/gdb/testsuite/gdb.base/interrupt-noterm.exp
+++ b/gdb/testsuite/gdb.base/interrupt-noterm.exp
@@ -15,18 +15,18 @@ 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare for testing" \
 	 ${testfile} ${srcfile} {debug}]} {
-    return -1
+    return
 }
 
 # Pretend there's no terminal.
 gdb_test_no_output "set interactive-mode off"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Delete breakpoints so that the next resume is a plain continue,
 # instead of a step-over-breakpoint sequence just while GDB sends the
 # interrupt request.  If that's buggy on some targets (and it was on
diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp
index 9d1264843a8f..44a27434bc2b 100644
--- a/gdb/testsuite/gdb.base/interrupt.exp
+++ b/gdb/testsuite/gdb.base/interrupt.exp
@@ -27,11 +27,11 @@  if { ! [target_info exists gdb,nosignals] } {
     lappend options "additional_flags=-DSIGNALS"
 }
 
 if {[build_executable $testfile.exp $testfile $srcfile $options] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 gdb_start
 
 
diff --git a/gdb/testsuite/gdb.base/jit-attach-pie.exp b/gdb/testsuite/gdb.base/jit-attach-pie.exp
index 4c1e854f1c34..c47535c79145 100644
--- a/gdb/testsuite/gdb.base/jit-attach-pie.exp
+++ b/gdb/testsuite/gdb.base/jit-attach-pie.exp
@@ -18,11 +18,11 @@  require can_spawn_for_attach
 standard_testfile .c
 set executable ${testfile}
 
 if { [build_executable ${testfile}.exp $executable $srcfile \
 			  [list debug pthreads pie]] } {
-    return -1
+    return
 }
 
 # Start the program running and then wait for a bit, to be sure
 # that it can be attached to.
 
diff --git a/gdb/testsuite/gdb.base/jit-reader-simple.exp b/gdb/testsuite/gdb.base/jit-reader-simple.exp
index c97009857220..445e2b053fd2 100644
--- a/gdb/testsuite/gdb.base/jit-reader-simple.exp
+++ b/gdb/testsuite/gdb.base/jit-reader-simple.exp
@@ -79,20 +79,20 @@  set srcfile_dl $testfile-dl.c
 set binfile_dl $binfile-dl
 set options [list debug shlib=${binfile_lib}]
 if {[gdb_compile ${srcdir}/${subdir}/${srcfile_dl} $binfile_dl executable \
 	 $options] == -1 } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Build the program that loads *two* JIT libraries.
 set binfile_dl2 $binfile-dl2
 set options [list debug shlib=${binfile_lib} shlib=${binfile_lib2}]
 if {[gdb_compile ${srcdir}/${subdir}/${srcfile_dl} $binfile_dl2 executable \
 	 $options] == -1 } {
     untested "failed to compile two-jitter binary"
-    return -1
+    return
 }
 
 # STANDALONE is true when the JIT reader is included directly in the
 # main program.  False when the JIT reader is in a separate shared
 # library.  If CHANGE_ADDR is true, force changing the JIT descriptor
diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp
index 26656549e31a..e9b3f2672ae9 100644
--- a/gdb/testsuite/gdb.base/jit-reader.exp
+++ b/gdb/testsuite/gdb.base/jit-reader.exp
@@ -35,21 +35,21 @@  set jit_reader_header [standard_output_file "../../../../../gdb/jit-reader.h"]
 set jit_reader_flag "-DJIT_READER_H=\"$jit_reader_header\""
 
 if  { [gdb_compile "${srcdir}/${subdir}/${jit_host_src}" "${jit_host_bin}" \
        executable  [list debug additional_flags=$jit_reader_flag]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set jit_reader jit-reader
 set jit_reader_src ${jit_reader}.c
 set jit_reader_bin [standard_output_file ${jit_reader}.so]
 
 if { [gdb_compile_shlib "${srcdir}/${subdir}/${jit_reader_src}" "${jit_reader_bin}" \
 	  [list debug additional_flags=$jit_reader_flag]] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Test "info registers" in the current frame, expecting RSP's value to
 # be SP.
 
diff --git a/gdb/testsuite/gdb.base/jump-inline.exp b/gdb/testsuite/gdb.base/jump-inline.exp
index 07853ffcb82f..15bc6fa70d7a 100644
--- a/gdb/testsuite/gdb.base/jump-inline.exp
+++ b/gdb/testsuite/gdb.base/jump-inline.exp
@@ -16,15 +16,15 @@ 
 # Test support for jump in inline functions.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "inline-funct"]
 gdb_continue_to_breakpoint "inline-funct" ".*inline-funct.*"
 
diff --git a/gdb/testsuite/gdb.base/jump.exp b/gdb/testsuite/gdb.base/jump.exp
index 15900520214c..3139b081aa25 100644
--- a/gdb/testsuite/gdb.base/jump.exp
+++ b/gdb/testsuite/gdb.base/jump.exp
@@ -17,11 +17,11 @@ 
 clear_xfail "*-*-*"
 
 standard_testfile .c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 # General testing of the 'jump' command.  GDB is already started.
 # There might be multiple inferior in the current debug session, in
 # which case, the relevant inferior is already selected.
@@ -97,11 +97,11 @@  if {![use_gdb_stub]} {
     set num_inferiors 2
 }
 
 # Run to main, add inferiors if needed.
 if {![runto_main]} {
-    return -1
+    return
 }
 for {set inf 2} {$inf <= $num_inferiors} {incr inf} {
     # Start a new inferior, and run it with the same executable.
     gdb_test "add-inferior -exec ${binfile}" \
 	"Added inferior ${inf}.*" \
diff --git a/gdb/testsuite/gdb.base/jump_multiple_objfiles.exp b/gdb/testsuite/gdb.base/jump_multiple_objfiles.exp
index 5345f256118e..ddc34b6ff3b5 100755
--- a/gdb/testsuite/gdb.base/jump_multiple_objfiles.exp
+++ b/gdb/testsuite/gdb.base/jump_multiple_objfiles.exp
@@ -20,15 +20,15 @@ 
 standard_testfile .c -foo.c .h
 
 
 if { [prepare_for_testing "failed to prepare" $testfile \
       [list ${srcfile} ${srcfile2}]] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 
 set bar_first_line [gdb_get_line_number "bar-first-line" ${srcfile3}]
 set bar_middle_line [gdb_get_line_number "bar-middle-line" ${srcfile3}]
diff --git a/gdb/testsuite/gdb.base/kill-after-signal.exp b/gdb/testsuite/gdb.base/kill-after-signal.exp
index 58f9c395bb96..f55aa8b81f3c 100644
--- a/gdb/testsuite/gdb.base/kill-after-signal.exp
+++ b/gdb/testsuite/gdb.base/kill-after-signal.exp
@@ -18,17 +18,17 @@  standard_testfile .c
 require can_single_step_to_signal_handler
 
 require {!target_info exists gdb,nosignals}
 
 if {[prepare_for_testing "failed to prepare" ${testfile}]} {
-    return -1
+    return
 }
 
 gdb_test "handle SIGUSR1 stop print pass" "SIGUSR1\[ \t\]+Yes\[ \t\]+Yes\[ \t\]+Yes\[ \t\]+.*"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "continue" "Program received signal SIGUSR1, .*"
 
 set test "handler"
diff --git a/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp b/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp
index 80fd913ddab4..ec086b785f14 100644
--- a/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp
+++ b/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp
@@ -23,11 +23,11 @@  require allow_multi_inferior_tests
 
 standard_testfile
 set executable $testfile
 
 if {[prepare_for_testing "failed to prepare" $executable]} {
-    return -1
+    return
 }
 
 runto_main
 
 # Add another forked inferior process.
diff --git a/gdb/testsuite/gdb.base/kill-during-detach.exp b/gdb/testsuite/gdb.base/kill-during-detach.exp
index 20a4f3481c42..f5e3a9022112 100644
--- a/gdb/testsuite/gdb.base/kill-during-detach.exp
+++ b/gdb/testsuite/gdb.base/kill-during-detach.exp
@@ -42,11 +42,11 @@  if { [istarget "*-*-linux*"] && [target_info gdb_protocol] == ""} {
 set flags {}
 lappend flags debug
 lappend flags additional_flags=-DBINFILE=$binfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile $flags] == -1} {
-    return -1
+    return
 }
 
 set checkpoint_line [gdb_get_line_number "Checkpoint here"]
 
 # Start an inferior, which blocks in a spin loop.  Setup a Python
diff --git a/gdb/testsuite/gdb.base/killed-outside.exp b/gdb/testsuite/gdb.base/killed-outside.exp
index e48137d4bd43..5fb818ec076b 100644
--- a/gdb/testsuite/gdb.base/killed-outside.exp
+++ b/gdb/testsuite/gdb.base/killed-outside.exp
@@ -78,11 +78,11 @@  proc test {cmds_after_kill} {
 	}
     }
 }
 
 if {[build_executable "failed to prepare" $testfile $srcfile] == -1} {
-    return -1
+    return
 }
 
 # The actual output GDB prints in response to commands after the
 # inferior is gone isn't very well defined, and will depend on target.
 # What we're trying to make sure is that GDB doesn't internal error or
diff --git a/gdb/testsuite/gdb.base/label-without-address.exp b/gdb/testsuite/gdb.base/label-without-address.exp
index dbd590362d22..7796de94c078 100644
--- a/gdb/testsuite/gdb.base/label-without-address.exp
+++ b/gdb/testsuite/gdb.base/label-without-address.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
@@ -33,9 +33,9 @@  gdb_test_multiple "l main:L1" "" {
 	set supported 1
     }
 }
 
 if { ! $supported } {
-    return -1
+    return
 }
 
 gdb_test "break main:L1" "Location main:L1 not available"
diff --git a/gdb/testsuite/gdb.base/label.exp b/gdb/testsuite/gdb.base/label.exp
index da4a369caf6a..418841961c8d 100644
--- a/gdb/testsuite/gdb.base/label.exp
+++ b/gdb/testsuite/gdb.base/label.exp
@@ -18,11 +18,11 @@ 
 #
 
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" $testfile ${srcfile} debug] } {
-    return -1
+    return
 }
 
 
 if {![runto_main]} {
   return -1
diff --git a/gdb/testsuite/gdb.base/langs.exp b/gdb/testsuite/gdb.base/langs.exp
index 8bfe377c60ce..5705446f2580 100644
--- a/gdb/testsuite/gdb.base/langs.exp
+++ b/gdb/testsuite/gdb.base/langs.exp
@@ -22,11 +22,11 @@  if {[is_remote host]} {
 }
 
 
 if {[prepare_for_testing "failed to prepare" ${testfile} \
 	 [list $srcfile $srcfile2 $srcfile3] {debug}]} {
-    return -1
+    return
 }
 
 set oldtimeout $timeout
 set timeout 10
 
diff --git a/gdb/testsuite/gdb.base/ldbl_e308.exp b/gdb/testsuite/gdb.base/ldbl_e308.exp
index 2f70dba56246..6351f5ffa7c3 100644
--- a/gdb/testsuite/gdb.base/ldbl_e308.exp
+++ b/gdb/testsuite/gdb.base/ldbl_e308.exp
@@ -14,15 +14,15 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 set testfile ldbl_e308
 set srcfile ${testfile}.c
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set variable ldbl_308 = 1.6e+308l"
 
 gdb_test "print ldbl_308" \
diff --git a/gdb/testsuite/gdb.base/limited-length.exp b/gdb/testsuite/gdb.base/limited-length.exp
index 8a55dd2540b4..e5f894cd2c57 100644
--- a/gdb/testsuite/gdb.base/limited-length.exp
+++ b/gdb/testsuite/gdb.base/limited-length.exp
@@ -16,11 +16,11 @@ 
 # Test GDB's limited array printing.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     perror "couldn't run to breakpoint"
     continue
diff --git a/gdb/testsuite/gdb.base/line-symtabs.exp b/gdb/testsuite/gdb.base/line-symtabs.exp
index 856d00de99c9..02265a5dfc89 100644
--- a/gdb/testsuite/gdb.base/line-symtabs.exp
+++ b/gdb/testsuite/gdb.base/line-symtabs.exp
@@ -19,15 +19,15 @@  standard_testfile .c line-symtabs.h
 if { [is_remote host] } {
     gdb_remote_download host $srcdir/$subdir/$srcfile2
 }
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # PR 17559: gdb_disassembly was using the wrong symtab lookup function.
 # It was expecting the symtab of the source file containing $pc,
 # instead it was getting the primary symtab of that compilation unit.
diff --git a/gdb/testsuite/gdb.base/line65535.exp b/gdb/testsuite/gdb.base/line65535.exp
index c01d9bc1526c..b62355b8a608 100644
--- a/gdb/testsuite/gdb.base/line65535.exp
+++ b/gdb/testsuite/gdb.base/line65535.exp
@@ -18,11 +18,11 @@ 
 # command succeeds, we will not try to actually run to that line.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 gdb_test "break $srcfile:65535" \
 	 ".*Breakpoint 1 at .*: file .*$srcfile, line 65535\\..*" \
 	 "break at line 65535"
diff --git a/gdb/testsuite/gdb.base/list-ambiguous.exp b/gdb/testsuite/gdb.base/list-ambiguous.exp
index 00e5e114978b..45bc479c1c4c 100644
--- a/gdb/testsuite/gdb.base/list-ambiguous.exp
+++ b/gdb/testsuite/gdb.base/list-ambiguous.exp
@@ -22,11 +22,11 @@  standard_testfile list-ambiguous0.c list-ambiguous1.c
 # editor.
 setenv EDITOR true
 
 if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile $srcfile2] \
 	 {debug}]} {
-    return -1
+    return
 }
 
 # Build source listing pattern based on an inclusive line range.
 
 proc line_range_pattern { range_start range_end } {
diff --git a/gdb/testsuite/gdb.base/list-before-start.exp b/gdb/testsuite/gdb.base/list-before-start.exp
index 4ed3856904c0..d332d41b2d73 100644
--- a/gdb/testsuite/gdb.base/list-before-start.exp
+++ b/gdb/testsuite/gdb.base/list-before-start.exp
@@ -17,11 +17,11 @@ 
 # program is started.
 
 standard_testfile list-ambiguous0.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 set fill "${decimal}\\s+\[^\n\r\]+"
 
 gdb_test_no_output "set listsize 10"
diff --git a/gdb/testsuite/gdb.base/list-missing-source.exp b/gdb/testsuite/gdb.base/list-missing-source.exp
index ac053a6b3ba8..fb78c85ffb08 100644
--- a/gdb/testsuite/gdb.base/list-missing-source.exp
+++ b/gdb/testsuite/gdb.base/list-missing-source.exp
@@ -34,11 +34,11 @@  set srcfile [remote_download host $srcfile]
 # Compile the source file.
 set options "debug"
 if  { [gdb_compile "${srcfile}" "${binfile}" \
 	   executable $options] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Now delete the source file.
 remote_file host delete $srcfile
 
diff --git a/gdb/testsuite/gdb.base/list-nodebug.exp b/gdb/testsuite/gdb.base/list-nodebug.exp
index e0ba56db4855..53c31ca08916 100644
--- a/gdb/testsuite/gdb.base/list-nodebug.exp
+++ b/gdb/testsuite/gdb.base/list-nodebug.exp
@@ -21,11 +21,11 @@  standard_testfile .c -2.c
 if { [prepare_for_testing_full "failed to prepare" \
 	  [list \
 	       $testfile {} \
 	       $srcfile {nodebug} \
 	       $srcfile2 {debug}]] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     untested "couldn't run to main"
     return
diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp
index 71419acfcf7e..77161305e04d 100644
--- a/gdb/testsuite/gdb.base/list.exp
+++ b/gdb/testsuite/gdb.base/list.exp
@@ -21,11 +21,11 @@  standard_testfile list0.c list1.c
 # Need to download the header to the host.
 gdb_remote_download host ${srcdir}/${subdir}/list0.h
 
 if {[build_executable "failed to prepare" $testfile [list $srcfile $srcfile2] \
 	 {debug}]} {
-    return -1
+    return
 }
 
 # The last line in the file.
 set last_line [gdb_get_line_number "last line" "list0.c"]
 
diff --git a/gdb/testsuite/gdb.base/load-command.exp b/gdb/testsuite/gdb.base/load-command.exp
index f20de4d07fd4..0329b33137de 100644
--- a/gdb/testsuite/gdb.base/load-command.exp
+++ b/gdb/testsuite/gdb.base/load-command.exp
@@ -26,15 +26,15 @@  if {[gdb_protocol_is_native]} {
 # would have to manually specify an offset to load.
 
 set opts {debug nopie}
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $opts]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Manually change the value of the_variable.
 gdb_test "print/x the_variable" " = 0x1234" "check initial value of the_variable"
 gdb_test_no_output "set the_variable = 0x5555" "manually change the_variable"
diff --git a/gdb/testsuite/gdb.base/long-inferior-output.exp b/gdb/testsuite/gdb.base/long-inferior-output.exp
index 70fe78486183..f2de534ec208 100644
--- a/gdb/testsuite/gdb.base/long-inferior-output.exp
+++ b/gdb/testsuite/gdb.base/long-inferior-output.exp
@@ -31,11 +31,11 @@ 
 require {!target_info exists gdb,noinferiorio}
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile {} {debug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.base/longest-types.exp b/gdb/testsuite/gdb.base/longest-types.exp
index a21c65157524..42bec222ed6e 100644
--- a/gdb/testsuite/gdb.base/longest-types.exp
+++ b/gdb/testsuite/gdb.base/longest-types.exp
@@ -16,10 +16,10 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile {debug quiet}] } {
-    return -1
+    return
 }
 
 # 64-bit array size should not overflow
 gdb_test "print &f->buf" {= \(char \(\*\)\[1099494850560\]\) 0x0}
diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index 26ca0ce578d1..44debe1e7f87 100644
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -24,11 +24,11 @@  set options {debug macros additional_flags=-DFROM_COMMANDLINE=ARG}
 # have access to the .debug_macinfo section.
 if  {[gdb_compile "${srcdir}/${subdir}/macscp1.c" "${objfile}" \
 	  object $options] != ""
      || [gdb_compile "${objfile}" "${binfile}" executable $options] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 
diff --git a/gdb/testsuite/gdb.base/main-c.exp b/gdb/testsuite/gdb.base/main-c.exp
index 1ae8a44a64e4..46e80b056796 100644
--- a/gdb/testsuite/gdb.base/main-c.exp
+++ b/gdb/testsuite/gdb.base/main-c.exp
@@ -19,11 +19,11 @@ 
 standard_testfile main.c
 
 require !readnow
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 require {string eq [have_index $binfile] ""}
 
 gdb_test_no_output "maint info symtabs"
diff --git a/gdb/testsuite/gdb.base/maint-expand-symbols-header-file.exp b/gdb/testsuite/gdb.base/maint-expand-symbols-header-file.exp
index 96c2575bd9b9..55ab4c7e1da8 100644
--- a/gdb/testsuite/gdb.base/maint-expand-symbols-header-file.exp
+++ b/gdb/testsuite/gdb.base/maint-expand-symbols-header-file.exp
@@ -18,11 +18,11 @@ 
 
 standard_testfile .c
 
 if {[build_executable "failed to prepare" $testfile \
 	 $srcfile {debug nowarnings}]} {
-    return -1
+    return
 }
 clean_restart
 
 # Make sure that no symtabs are expanded, by setting language before
 # loading exec.
@@ -30,11 +30,11 @@  gdb_test_no_output "set language c"
 gdb_load ${binfile}
 
 set test "verify no symtabs are expanded"
 if { [readnow] } {
     unsupported $test
-    return -1
+    return
 }
 gdb_test_no_output "maint info symtabs" $test
 
 # Expand the header file symtab.
 gdb_test_no_output "maint expand-symtabs maint-expand-symbols-header-file.h"
diff --git a/gdb/testsuite/gdb.base/maint-info-inline-frames-and-blocks.exp b/gdb/testsuite/gdb.base/maint-info-inline-frames-and-blocks.exp
index e672e0b67bf4..b123162d6e5b 100644
--- a/gdb/testsuite/gdb.base/maint-info-inline-frames-and-blocks.exp
+++ b/gdb/testsuite/gdb.base/maint-info-inline-frames-and-blocks.exp
@@ -18,11 +18,11 @@ 
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 	  {debug nopie}]} {
-    return -1
+    return
 }
 
 if {![runto normal_func]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/maint-info-sections.exp b/gdb/testsuite/gdb.base/maint-info-sections.exp
index 65a761c6cb98..ac712137cc63 100644
--- a/gdb/testsuite/gdb.base/maint-info-sections.exp
+++ b/gdb/testsuite/gdb.base/maint-info-sections.exp
@@ -20,15 +20,15 @@  load_lib completion-support.exp
 
 standard_testfile break.c break1.c
 
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 [list $srcfile $srcfile2] {debug nowarnings}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Check the output of 'maint info target-sections' command.
 proc check_maint_info_target_sections_output {prefix} {
     global hex gdb_prompt
diff --git a/gdb/testsuite/gdb.base/maint-print-frame-id.exp b/gdb/testsuite/gdb.base/maint-print-frame-id.exp
index 18f9a6b3a166..9d857c8b45a7 100644
--- a/gdb/testsuite/gdb.base/maint-print-frame-id.exp
+++ b/gdb/testsuite/gdb.base/maint-print-frame-id.exp
@@ -17,15 +17,15 @@ 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 $srcfile {debug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint foo
 gdb_continue_to_breakpoint "run to foo"
 
diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp
index 87216181382f..0099eb672dcb 100644
--- a/gdb/testsuite/gdb.base/maint.exp
+++ b/gdb/testsuite/gdb.base/maint.exp
@@ -45,11 +45,11 @@ 
 
 standard_testfile break.c break1.c
 
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 [list $srcfile $srcfile2] {debug nowarnings}]} {
-    return -1
+    return
 }
 
 # Check "maint set per-command" warnings.  We do this early so that
 # the following tests don't need to expect them, as GDB only warns
 # once.
diff --git a/gdb/testsuite/gdb.base/many-completions.exp b/gdb/testsuite/gdb.base/many-completions.exp
index eb2736a9564b..edb61c2d7f48 100644
--- a/gdb/testsuite/gdb.base/many-completions.exp
+++ b/gdb/testsuite/gdb.base/many-completions.exp
@@ -65,11 +65,11 @@  proc prepare_test_source_file { count } {
 # Build a source file and compile it.
 set filename [prepare_test_source_file 250]
 standard_testfile $filename
 if {[prepare_for_testing "failed to prepare" "$testfile" $srcfile \
 	 { debug }]} {
-    return -1
+    return
 }
 
 # Start the test.
 if {![runto_main]} {
     return
diff --git a/gdb/testsuite/gdb.base/many-headers.exp b/gdb/testsuite/gdb.base/many-headers.exp
index 72a9e07a3e55..6b13db61e740 100644
--- a/gdb/testsuite/gdb.base/many-headers.exp
+++ b/gdb/testsuite/gdb.base/many-headers.exp
@@ -25,11 +25,11 @@  if { [target_info gdb_protocol] != "" } {
 }
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Generate core file.
 set corefile [core_find $binfile]
 if {$corefile == ""} {
@@ -47,11 +47,11 @@  catch {
 		"ulimit -s $stack_limit;" \
 		")"]
 } msg
 if { "$msg" != "" } {
     untested "Can't set stack limit"
-    return -1
+    return
 }
 
 set cmd \
     [concat \
 	 "(" \
diff --git a/gdb/testsuite/gdb.base/max-value-size.exp b/gdb/testsuite/gdb.base/max-value-size.exp
index f10e39d51065..ba5266401ee8 100644
--- a/gdb/testsuite/gdb.base/max-value-size.exp
+++ b/gdb/testsuite/gdb.base/max-value-size.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/memattr.exp b/gdb/testsuite/gdb.base/memattr.exp
index e333f37c668b..a399111cd34f 100644
--- a/gdb/testsuite/gdb.base/memattr.exp
+++ b/gdb/testsuite/gdb.base/memattr.exp
@@ -18,11 +18,11 @@ 
 # Test the memory attribute commands.
 
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 runto_main
 
 # Delete all target-supplied memory regions.
diff --git a/gdb/testsuite/gdb.base/memops-watchpoint.exp b/gdb/testsuite/gdb.base/memops-watchpoint.exp
index faa4f6e1c4a0..17c14fdee065 100644
--- a/gdb/testsuite/gdb.base/memops-watchpoint.exp
+++ b/gdb/testsuite/gdb.base/memops-watchpoint.exp
@@ -19,16 +19,16 @@ 
 
 standard_testfile
 set options "-fno-builtin-memset -fno-builtin-memcpy -fno-builtin-memmove"
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 	  [list debug additional_flags=$options]] } {
-    return -1
+    return
 }
 
 set linespec ${srcfile}:[gdb_get_line_number "Break here"]
 if {![runto ${linespec}]} {
-    return -1
+    return
 }
 
 gdb_test "watch -location a\[28\]" \
     "(Hardware w|W)atchpoint ${decimal}: -location a\\\[28\\\]" \
     "set watch on a"
diff --git a/gdb/testsuite/gdb.base/memtag.exp b/gdb/testsuite/gdb.base/memtag.exp
index 0e032bb61fd9..f630615ebac2 100644
--- a/gdb/testsuite/gdb.base/memtag.exp
+++ b/gdb/testsuite/gdb.base/memtag.exp
@@ -17,11 +17,11 @@ 
 
 set u_msg "Memory tagging not supported or disabled by the current architecture\."
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-    return -1
+    return
 }
 
 if {[target_info gdb_protocol] == "extended-remote"} {
     # Make sure we're disconnected, in case we're testing with an
     # extended-remote board, therefore already connected.
@@ -38,18 +38,18 @@  with_test_prefix "before program execution" {
 }
 
 clean_restart $testfile
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Targets that don't support memory tagging should not execute the
 # runtime memory tagging tests.
 if {![supports_memtag]} {
     unsupported "memory tagging unsupported"
-    return -1
+    return
 }
 
 # With the program running, try to use the memory tagging commands.
 with_test_prefix "during program execution" {
     set msg "Argument required \\(address or pointer\\)\."
diff --git a/gdb/testsuite/gdb.base/mips_pro.exp b/gdb/testsuite/gdb.base/mips_pro.exp
index 411457a8f765..4000a06d51a6 100644
--- a/gdb/testsuite/gdb.base/mips_pro.exp
+++ b/gdb/testsuite/gdb.base/mips_pro.exp
@@ -22,11 +22,11 @@  set options debug
 if {[test_compiler_info gcc-*-*]} {
     lappend options additional_flags=-O2 additional_flags=-fno-inline
 }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $options]} {
-    return -1
+    return
 }
 
 if {[runto middle]} {
     # PR 3016
     #   warning: Hit heuristic-fence-post without finding
diff --git a/gdb/testsuite/gdb.base/morestack.exp b/gdb/testsuite/gdb.base/morestack.exp
index 979500a4370c..9b5ad1456598 100644
--- a/gdb/testsuite/gdb.base/morestack.exp
+++ b/gdb/testsuite/gdb.base/morestack.exp
@@ -20,15 +20,15 @@  require {have_compile_flag -fsplit-stack}
 standard_testfile
 
 set opts "additional_flags=-fsplit-stack"
 if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile \
 	  [list $opts]] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "marker_hit"
 gdb_breakpoint "marker_miss"
 
diff --git a/gdb/testsuite/gdb.base/msym-lang.exp b/gdb/testsuite/gdb.base/msym-lang.exp
index 15e40105110e..d0beddea4175 100644
--- a/gdb/testsuite/gdb.base/msym-lang.exp
+++ b/gdb/testsuite/gdb.base/msym-lang.exp
@@ -15,9 +15,9 @@ 
 
 standard_testfile msym-lang-main.c msym-lang.c
 
 if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile $srcfile2] \
 	 {c++}]} {
-    return -1
+    return
 }
 
 gdb_test "info func foo" ".* foo\\(\\).* foo\\(\\).*"
diff --git a/gdb/testsuite/gdb.base/nested-addr.exp b/gdb/testsuite/gdb.base/nested-addr.exp
index f20d7df1613a..6701aba3eacf 100644
--- a/gdb/testsuite/gdb.base/nested-addr.exp
+++ b/gdb/testsuite/gdb.base/nested-addr.exp
@@ -14,15 +14,15 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" "${testfile}" "${srcfile}"]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "BREAK"]
 gdb_continue_to_breakpoint "BREAK"
 
diff --git a/gdb/testsuite/gdb.base/nested-subp1.exp b/gdb/testsuite/gdb.base/nested-subp1.exp
index 22ecb8f1f21c..ed783aa0e7d3 100644
--- a/gdb/testsuite/gdb.base/nested-subp1.exp
+++ b/gdb/testsuite/gdb.base/nested-subp1.exp
@@ -24,18 +24,18 @@  standard_testfile
 
 set testcase "nested-subp1"
 
 if {![support_nested_function_tests]} {
     untested "compiler does not support nested functions"
-    return -1
+    return
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${testcase}.c" \
 		  [standard_output_file "${testcase}"] \
 		  executable \
 		  [list debug "additional_flags=-std=gnu99"]] != "" } {
-    return -1
+    return
 }
 
 
 # Run until the variables we are interested in are visible.
 
diff --git a/gdb/testsuite/gdb.base/nested-subp2.exp b/gdb/testsuite/gdb.base/nested-subp2.exp
index 23d36e77efc1..7a5ff89a4187 100644
--- a/gdb/testsuite/gdb.base/nested-subp2.exp
+++ b/gdb/testsuite/gdb.base/nested-subp2.exp
@@ -24,11 +24,11 @@  standard_testfile
 
 set testcase "nested-subp2"
 
 if {![support_nested_function_tests]} {
     untested "compiler does not support nested functions"
-    return -1
+    return
 }
 
 set flags {}
 lappend flags debug
 lappend flags additional_flags=-std=gnu99
@@ -40,11 +40,11 @@  if { [gdb_can_simple_compile ld-flags {int main () { return 0; }} executable \
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${testcase}.c" \
 	  [standard_output_file "${testcase}"] \
 	  executable $flags] != "" } {
-    return -1
+    return
 }
 
 
 # Run until the variables we are interested in are visible.
 
diff --git a/gdb/testsuite/gdb.base/nested-subp3.exp b/gdb/testsuite/gdb.base/nested-subp3.exp
index 8e145bee7650..5cb49b8dbce9 100644
--- a/gdb/testsuite/gdb.base/nested-subp3.exp
+++ b/gdb/testsuite/gdb.base/nested-subp3.exp
@@ -24,11 +24,11 @@  standard_testfile
 
 set testcase "nested-subp3"
 
 if {![support_nested_function_tests]} {
     untested "compiler does not support nested functions"
-    return -1
+    return
 }
 
 set flags {}
 lappend flags debug
 lappend flags additional_flags=-std=gnu99
@@ -40,11 +40,11 @@  if { [gdb_can_simple_compile ld-flags {int main () { return 0; }} executable \
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${testcase}.c" \
 	  [standard_output_file "${testcase}"] \
 	  executable $flags] != "" } {
-    return -1
+    return
 }
 
 
 # Run until the variables we are interested in are visible.
 
diff --git a/gdb/testsuite/gdb.base/new-ui-echo.exp b/gdb/testsuite/gdb.base/new-ui-echo.exp
index a57225add133..2dfbf66c81a4 100644
--- a/gdb/testsuite/gdb.base/new-ui-echo.exp
+++ b/gdb/testsuite/gdb.base/new-ui-echo.exp
@@ -23,11 +23,11 @@ 
 standard_testfile
 
 set compile_options "debug"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Start gdb and create an extra console UI.  Start the inferior in the
 # DRIVER console (either "main" or "extra"), and then enter a
 # synchronous execution command in the extra console.  Before PR 20494
diff --git a/gdb/testsuite/gdb.base/new-ui-pending-input.exp b/gdb/testsuite/gdb.base/new-ui-pending-input.exp
index 5d147bcfe1c7..cbc2c6d3b706 100644
--- a/gdb/testsuite/gdb.base/new-ui-pending-input.exp
+++ b/gdb/testsuite/gdb.base/new-ui-pending-input.exp
@@ -20,11 +20,11 @@ 
 standard_testfile
 
 set compile_options "debug"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # See intro.
 
 proc test_command_line_new_ui_pending_input {} {
diff --git a/gdb/testsuite/gdb.base/new-ui.exp b/gdb/testsuite/gdb.base/new-ui.exp
index 6bc45392733c..b5ee322dc04f 100644
--- a/gdb/testsuite/gdb.base/new-ui.exp
+++ b/gdb/testsuite/gdb.base/new-ui.exp
@@ -16,11 +16,11 @@ 
 standard_testfile
 
 set compile_options "debug"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Ensure no output has been sent.  Use MESSAGE as test message.
 
 proc ensure_no_output {message} {
diff --git a/gdb/testsuite/gdb.base/nextoverexit.exp b/gdb/testsuite/gdb.base/nextoverexit.exp
index 5fbb4efa51b5..91c78ba60e37 100644
--- a/gdb/testsuite/gdb.base/nextoverexit.exp
+++ b/gdb/testsuite/gdb.base/nextoverexit.exp
@@ -13,15 +13,15 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $testfile.c]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Make sure we do not see any warnings.
 gdb_test_multiple "next" "next over exit" {
     -re "$inferior_exited_re normally.\[\r\n\]+$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.base/non-lazy-array-index.exp b/gdb/testsuite/gdb.base/non-lazy-array-index.exp
index 48eb7db77c11..0de2e59a9b92 100644
--- a/gdb/testsuite/gdb.base/non-lazy-array-index.exp
+++ b/gdb/testsuite/gdb.base/non-lazy-array-index.exp
@@ -17,15 +17,15 @@ 
 # when fetching elements from an array in the C language.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Load 'global_foo' into a history variable.
 gdb_test "p global_foo" "\\{f = 1, array = \\{1, 2, 3, 4, 5\\}\\}"
 
diff --git a/gdb/testsuite/gdb.base/noreturn-finish.exp b/gdb/testsuite/gdb.base/noreturn-finish.exp
index 3894b3e770ef..0574733cde74 100644
--- a/gdb/testsuite/gdb.base/noreturn-finish.exp
+++ b/gdb/testsuite/gdb.base/noreturn-finish.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug}]} {
-    return -1
+    return
 }
 
 proc noreturn_finish_test { } {
     global gdb_prompt
 
diff --git a/gdb/testsuite/gdb.base/noreturn-return.exp b/gdb/testsuite/gdb.base/noreturn-return.exp
index e2ea8690771d..c761f141cddb 100644
--- a/gdb/testsuite/gdb.base/noreturn-return.exp
+++ b/gdb/testsuite/gdb.base/noreturn-return.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug}]} {
-    return -1
+    return
 }
 
 proc noreturn_test { } {
     global gdb_prompt
 
diff --git a/gdb/testsuite/gdb.base/offsets.exp b/gdb/testsuite/gdb.base/offsets.exp
index 2286f0c2276a..a7480f692d5f 100644
--- a/gdb/testsuite/gdb.base/offsets.exp
+++ b/gdb/testsuite/gdb.base/offsets.exp
@@ -17,11 +17,11 @@ 
 
 standard_testfile offsets.c
 
 if { [prepare_for_testing "failed to prepare for testing large offsets" \
 	  ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 set test "print &big_struct test"
 gdb_test_multiple "print &big_struct" "$test" {
     -re "${::valnum_re} = .* (0x\[0-9a-fA-F\]*) .*\[\r\n\]*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.base/opaque.exp b/gdb/testsuite/gdb.base/opaque.exp
index 489b0e451ee6..ded6f8c88e30 100644
--- a/gdb/testsuite/gdb.base/opaque.exp
+++ b/gdb/testsuite/gdb.base/opaque.exp
@@ -20,11 +20,11 @@  standard_testfile opaque0.c opaque1.c
 # Some tests require GCC.
 set gcc_compiled [is_c_compiler_gcc]
 
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 [list $srcfile $srcfile2] debug]} {
-    return -1
+    return
 }
 
 #
 # Test basic opaque structure handling (statically).
 # The ordering of the tests is significant.  We first try the things that
diff --git a/gdb/testsuite/gdb.base/options.exp b/gdb/testsuite/gdb.base/options.exp
index 0b8dda51d4d0..35487ead6a77 100644
--- a/gdb/testsuite/gdb.base/options.exp
+++ b/gdb/testsuite/gdb.base/options.exp
@@ -35,18 +35,18 @@  load_lib compile-support.exp
 load_lib completion-support.exp
 
 standard_testfile .c
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 clean_restart
 
 if { ![readline_is_used] } {
     untested "no tab completion support without readline"
-    return -1
+    return
 }
 
 set tui_supported_p [allow_tui_tests]
 
 # Check the completion result, as returned by the "maintenance show
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 3ab1e06c6e31..54a922187b84 100644
--- a/gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp
+++ b/gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp
@@ -16,11 +16,11 @@ 
 require {!target_info exists gdb,nointerrupts}
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 # Send a ctrl-c while the target is running and check that the output
 # does not cause a pagination prompt.
 
diff --git a/gdb/testsuite/gdb.base/paginate-bg-execution.exp b/gdb/testsuite/gdb.base/paginate-bg-execution.exp
index e369fa7ad046..9f9e44fb4dc7 100644
--- a/gdb/testsuite/gdb.base/paginate-bg-execution.exp
+++ b/gdb/testsuite/gdb.base/paginate-bg-execution.exp
@@ -17,11 +17,11 @@ 
 # does not trigger pagination.
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 # Check that we handle a stop event coming from a background execution
 # command without getting caught in pagination.
 
diff --git a/gdb/testsuite/gdb.base/paginate-execution-startup.exp b/gdb/testsuite/gdb.base/paginate-execution-startup.exp
index e1de36ca022f..03647520c157 100644
--- a/gdb/testsuite/gdb.base/paginate-execution-startup.exp
+++ b/gdb/testsuite/gdb.base/paginate-execution-startup.exp
@@ -17,11 +17,11 @@ 
 # execution commands directly from the command line, with "-ex".
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 set file_arg $binfile
 if {[is_remote host]} {
   set file_arg [remote_download host $file_arg]
diff --git a/gdb/testsuite/gdb.base/paginate-inferior-exit.exp b/gdb/testsuite/gdb.base/paginate-inferior-exit.exp
index e6557f947a76..eb274b091f99 100644
--- a/gdb/testsuite/gdb.base/paginate-inferior-exit.exp
+++ b/gdb/testsuite/gdb.base/paginate-inferior-exit.exp
@@ -16,11 +16,11 @@ 
 # Test that an inferior exit event does not trigger pagination.
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 # Test paginating while printing about the inferior having exited.
 #
 proc test_paginate_inferior_exited {} {
diff --git a/gdb/testsuite/gdb.base/patch.exp b/gdb/testsuite/gdb.base/patch.exp
index ed6d268f6bd0..e998ef4334c0 100644
--- a/gdb/testsuite/gdb.base/patch.exp
+++ b/gdb/testsuite/gdb.base/patch.exp
@@ -16,11 +16,11 @@ 
 # Test patching executables and core files, with "set write on".
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Check that we can patch an executable.
 
 with_test_prefix "exec" {
diff --git a/gdb/testsuite/gdb.base/pc-fp.exp b/gdb/testsuite/gdb.base/pc-fp.exp
index 3f4fafee237f..fd44942bfe87 100644
--- a/gdb/testsuite/gdb.base/pc-fp.exp
+++ b/gdb/testsuite/gdb.base/pc-fp.exp
@@ -25,11 +25,11 @@ 
 #
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.base/pending.exp b/gdb/testsuite/gdb.base/pending.exp
index 62894063ee6b..161287226f86 100644
--- a/gdb/testsuite/gdb.base/pending.exp
+++ b/gdb/testsuite/gdb.base/pending.exp
@@ -30,11 +30,11 @@  set lib_opts  debug
 set exec_opts [list debug shlib=$lib_sl]
 
 if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
 
 gdb_test_multiple "break pendfunc1" "set pending breakpoint" {
diff --git a/gdb/testsuite/gdb.base/permissions.exp b/gdb/testsuite/gdb.base/permissions.exp
index 6835ed5a4c68..4db6521bea1a 100644
--- a/gdb/testsuite/gdb.base/permissions.exp
+++ b/gdb/testsuite/gdb.base/permissions.exp
@@ -21,11 +21,11 @@ 
 standard_testfile start.c
 
 if {[build_executable $testfile.exp $testfile \
 	 $srcfile {debug nowarnings}] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
 
 with_test_prefix "observer mode off" {
diff --git a/gdb/testsuite/gdb.base/persistent-lang.exp b/gdb/testsuite/gdb.base/persistent-lang.exp
index 880dbb2d9eea..4099459ca383 100644
--- a/gdb/testsuite/gdb.base/persistent-lang.exp
+++ b/gdb/testsuite/gdb.base/persistent-lang.exp
@@ -18,11 +18,11 @@  standard_testfile .cc
 set flags {}
 lappend flags debug
 lappend flags c++
 
 if {[build_executable "failed to prepare" $testfile $srcfile $flags]} {
-    return -1
+    return
 }
 
 clean_restart
 
 set auto_c \
diff --git a/gdb/testsuite/gdb.base/pie-execl.exp b/gdb/testsuite/gdb.base/pie-execl.exp
index 60d2270f8873..62f3bc100921 100644
--- a/gdb/testsuite/gdb.base/pie-execl.exp
+++ b/gdb/testsuite/gdb.base/pie-execl.exp
@@ -40,19 +40,19 @@  set binfile2_test_msg OBJDIR/${subdir}/${executable2}
 # file name of the breakpoint.
 
 set opts [list debug pie]
 if {[build_executable ${testfile}.exp $executable1 $srcfile [concat $opts {additional_flags=-DBIN=1}]] == -1
     || [build_executable ${testfile}.exp $executable2 $srcfile [concat $opts {additional_flags=-DBIN=2}]] == -1} {
-    return -1
+    return
 }
 
 clean_restart ${executable1}
 
 gdb_test_no_output "set args ${binfile2}" "set args ${binfile2_test_msg}"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Do not stop on `main' after re-exec.
 delete_breakpoints
 
diff --git a/gdb/testsuite/gdb.base/pr10179.exp b/gdb/testsuite/gdb.base/pr10179.exp
index 55808e42285f..b3129d43ef91 100644
--- a/gdb/testsuite/gdb.base/pr10179.exp
+++ b/gdb/testsuite/gdb.base/pr10179.exp
@@ -15,17 +15,17 @@ 
 
 set testname pr10179
 set sources "pr10179-a.c pr10179-b.c"
 
 if {[build_executable ${testname}.exp $testname $sources {debug}] == -1} {
-    return -1
+    return
 }
 
 clean_restart ${testname}
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "rbreak foo.*" "Breakpoint ${::decimal}\[^\\n\]*\\nint foo\[12\]\[^\\n\]*\\nBreakpoint ${::decimal}\[^\\n\]*\\nint foo\[12\].*"
 
 delete_breakpoints
diff --git a/gdb/testsuite/gdb.base/prelink.exp b/gdb/testsuite/gdb.base/prelink.exp
index cfbb511c7d97..4f18af4739c2 100644
--- a/gdb/testsuite/gdb.base/prelink.exp
+++ b/gdb/testsuite/gdb.base/prelink.exp
@@ -29,19 +29,19 @@  set testfile "prelink"
 set libsrcfile ${testfile}-lib.c
 set libfile [standard_output_file ${testfile}.so]
 
 if {[build_executable "build library" ${libfile} ${libsrcfile} \
 	 {debug shlib}] == -1} {
-    return -1
+    return
 }
 
 set srcfile ${testfile}.c
 set executable ${testfile}t
 set binfile [standard_output_file ${executable}]
 set prelink_args [build_executable_own_libs ${testfile}.exp $executable $srcfile [list debug "ldflags=-Wl,${libfile},-rpath,[file dirname ${libfile}]"]]
 if {$prelink_args == ""} {
-    return -1
+    return
 }
 
 set test "split debug of executable"
 if {[gdb_gnu_strip_debug $binfile]} {
     fail $test
@@ -49,11 +49,11 @@  if {[gdb_gnu_strip_debug $binfile]} {
     pass $test
 }
 
 if {![prelink_yes $prelink_args]} {
     # Maybe we don't have prelink.
-    return -1
+    return
 }
 
 set found 0
 set coredir "[standard_output_file coredir.[getpid]]"
 file mkdir $coredir
@@ -84,11 +84,11 @@  if { $found == 0  } {
     return 0
 }
 
 # Relink $libfile to a different address.
 if {![prelink_yes $prelink_args]} {
-    return -1
+    return
 }
 
 # Start with a fresh gdb
 
 clean_restart $executable
diff --git a/gdb/testsuite/gdb.base/premature-dummy-frame-removal.exp b/gdb/testsuite/gdb.base/premature-dummy-frame-removal.exp
index 079f5c83e3a5..c3e9fdbc6b9e 100644
--- a/gdb/testsuite/gdb.base/premature-dummy-frame-removal.exp
+++ b/gdb/testsuite/gdb.base/premature-dummy-frame-removal.exp
@@ -37,11 +37,11 @@ 
 standard_testfile .c
 
 require allow_python_tests
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/pretty-array.exp b/gdb/testsuite/gdb.base/pretty-array.exp
index f484286f931e..e1a8428d842a 100644
--- a/gdb/testsuite/gdb.base/pretty-array.exp
+++ b/gdb/testsuite/gdb.base/pretty-array.exp
@@ -17,15 +17,15 @@ 
 
 standard_testfile
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
     untested $testfile.exp
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "print nums" \
     "= \\{\\{11, 12, 13\\}, \\{21, 22, 23\\}\\}"
 
diff --git a/gdb/testsuite/gdb.base/pretty-print.exp b/gdb/testsuite/gdb.base/pretty-print.exp
index 5aaa4cafaff7..efe9cbae11d6 100644
--- a/gdb/testsuite/gdb.base/pretty-print.exp
+++ b/gdb/testsuite/gdb.base/pretty-print.exp
@@ -17,15 +17,15 @@ 
 
 standard_testfile
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
     untested $testfile.exp
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set print pretty on"
 
 gdb_test "print s1" \
diff --git a/gdb/testsuite/gdb.base/print-internal-string.exp b/gdb/testsuite/gdb.base/print-internal-string.exp
index 3ff2a6708fa5..7ebf8ed9b4d4 100644
--- a/gdb/testsuite/gdb.base/print-internal-string.exp
+++ b/gdb/testsuite/gdb.base/print-internal-string.exp
@@ -18,11 +18,11 @@ 
 # the thing that is read back is correctly interpreted as a string.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/print-symbol-loading.exp b/gdb/testsuite/gdb.base/print-symbol-loading.exp
index c4cb501932d2..77c6145201e9 100644
--- a/gdb/testsuite/gdb.base/print-symbol-loading.exp
+++ b/gdb/testsuite/gdb.base/print-symbol-loading.exp
@@ -25,27 +25,27 @@  set gcorefile ${binfile}.gcore
 set objfile [standard_output_file ${testfile}.o]
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} {debug}] != ""
      || [gdb_compile ${srcdir}/${subdir}/${srcfile} ${objfile} object {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 set opts [list debug shlib=${binfile_lib}]
 if { [gdb_compile ${objfile} ${binfile} executable $opts] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
 gdb_load_shlib ${binfile_lib}
 
 if {![runto lib]} {
-    return -1
+    return
 }
 
 if {![gdb_gcore_cmd $gcorefile "save a corefile"]} {
-    return -1
+    return
 }
 
 proc test_load_core { print_symbol_loading } {
     global binfile binfile_lib gcorefile srcdir subdir
     with_test_prefix "core ${print_symbol_loading}" {
diff --git a/gdb/testsuite/gdb.base/printf-wchar_t.exp b/gdb/testsuite/gdb.base/printf-wchar_t.exp
index db331a3e3280..37fee25996a6 100644
--- a/gdb/testsuite/gdb.base/printf-wchar_t.exp
+++ b/gdb/testsuite/gdb.base/printf-wchar_t.exp
@@ -14,15 +14,15 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test {printf "%ls\n", wide_str} "^wide string"
 
 # Check that if the max-value-size will kick in when using printf on strings.
diff --git a/gdb/testsuite/gdb.base/prologue-include.exp b/gdb/testsuite/gdb.base/prologue-include.exp
index 9e92221b3a7a..d25df5953cc1 100644
--- a/gdb/testsuite/gdb.base/prologue-include.exp
+++ b/gdb/testsuite/gdb.base/prologue-include.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 set bp_main [gdb_get_line_number "break main" ${testfile}.h]
 
 gdb_test "break -q main" \
diff --git a/gdb/testsuite/gdb.base/psym-external-decl.exp b/gdb/testsuite/gdb.base/psym-external-decl.exp
index b4b62f21b13e..bbe8a043fabf 100644
--- a/gdb/testsuite/gdb.base/psym-external-decl.exp
+++ b/gdb/testsuite/gdb.base/psym-external-decl.exp
@@ -14,21 +14,21 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 standard_testfile .c psym-external-decl-2.c
 
 if { [test_compiler_info "clang-*"] } {
-    return -1
+    return
 }
 
 set srcfiles [list $srcfile $srcfile2]
 
 if { [build_executable_from_specs \
 	  "failed to prepare" \
 	  $testfile [list] \
 	  $srcfile [list debug] \
 	  $srcfile2 [list]] == -1 } {
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 gdb_test "print aaa" " = 33"
diff --git a/gdb/testsuite/gdb.base/psymtab.exp b/gdb/testsuite/gdb.base/psymtab.exp
index 9a979cdce971..2103ace870e6 100644
--- a/gdb/testsuite/gdb.base/psymtab.exp
+++ b/gdb/testsuite/gdb.base/psymtab.exp
@@ -28,11 +28,11 @@  require allow_cplus_tests
 
 standard_testfile psymtab1.c psymtab2.c
 
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 [list $srcfile $srcfile2] debug]} {
-    return -1
+    return
 }
 
 # Disable the prompt for whether to set pending breakpoints.
 # We don't want a breakpoint, we just want to verify the symbol
 # isn't found.
diff --git a/gdb/testsuite/gdb.base/ptype-offsets-c.exp b/gdb/testsuite/gdb.base/ptype-offsets-c.exp
index cffcbbeb2f7a..fd88514f5f6b 100644
--- a/gdb/testsuite/gdb.base/ptype-offsets-c.exp
+++ b/gdb/testsuite/gdb.base/ptype-offsets-c.exp
@@ -28,11 +28,11 @@  if { ![is_lp64_target] } {
     untested "test work only on lp64 targets"
     return 0
 }
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 # Tests handling flexible array member.  Regression tests for PR gdb/33966.
 set l {
     "ptype /o struct flexible_array_member"
diff --git a/gdb/testsuite/gdb.base/ptype-offsets.exp b/gdb/testsuite/gdb.base/ptype-offsets.exp
index 2ee3470ba10f..56dca939fb33 100644
--- a/gdb/testsuite/gdb.base/ptype-offsets.exp
+++ b/gdb/testsuite/gdb.base/ptype-offsets.exp
@@ -27,11 +27,11 @@  if { ![is_lp64_target] } {
     return 0
 }
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 	  { debug c++ }] } {
-    return -1
+    return
 }
 
 # Test general offset printing, ctor/dtor printing, union, formatting.
 gdb_test "ptype /o struct abc" \
     [string_to_regexp [multi_line \
diff --git a/gdb/testsuite/gdb.base/ptype.exp b/gdb/testsuite/gdb.base/ptype.exp
index 5602defba64e..0539b87ddfea 100644
--- a/gdb/testsuite/gdb.base/ptype.exp
+++ b/gdb/testsuite/gdb.base/ptype.exp
@@ -21,11 +21,11 @@ 
 
 standard_testfile .c ptype1.c
 
 if {[prepare_for_testing "failed to prepare" ${testfile} \
 	 [list $srcfile $srcfile2] {debug nowarnings}]} {
-    return -1
+    return
 }
 
 # Some tests require GCC.
 set gcc_compiled [is_c_compiler_gcc]
 
@@ -78,20 +78,20 @@  gdb_test "ptype struct t_struct" \
 
 
 # Test the equivalence between '.' and '->' for struct member references.
 
 if {[gdb_test "ptype v_struct1.v_float_member" "type = float"] < 0} {
-    return -1
+    return
 }
 if {[gdb_test "ptype v_struct1->v_float_member" "type = float"] < 0} {
-    return -1
+    return
 }
 if {[gdb_test "ptype v_t_struct_p.v_float_member" "type = float"] < 0} {
-    return -1
+    return
 }
 if {[gdb_test "ptype v_t_struct_p->v_float_member" "type = float"] < 0} {
-    return -1
+    return
 }
 
 
 # IBM's xlc puts out bogus stabs--the stuff field is type 42,
 # which isn't defined.
diff --git a/gdb/testsuite/gdb.base/random-signal.exp b/gdb/testsuite/gdb.base/random-signal.exp
index 77d106477209..e0c5e669c2f2 100644
--- a/gdb/testsuite/gdb.base/random-signal.exp
+++ b/gdb/testsuite/gdb.base/random-signal.exp
@@ -19,11 +19,11 @@  require {!target_info exists gdb,nosignals}
 require {!target_info exists gdb,nointerrupts}
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Set a software watchpoint, continue, wait a bit and stop the target
 # with ctrl-c.  A software watchpoint forces the target to
 # single-step.
diff --git a/gdb/testsuite/gdb.base/randomize.exp b/gdb/testsuite/gdb.base/randomize.exp
index 52c2ff71ab12..58c2c78ee26a 100644
--- a/gdb/testsuite/gdb.base/randomize.exp
+++ b/gdb/testsuite/gdb.base/randomize.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 proc address_get { testname } {
     global gdb_prompt
 
@@ -60,11 +60,11 @@  gdb_test "show disable-randomization"	      \
 set addr1 [address_get "randomized first address"]
 set addr2 [address_get "randomized second address"]
 set test "randomized addresses should not match"
 if {[string equal $addr1 $addr2]} {
     untested "no randomization detected on this system"
-    return -1
+    return
 } else {
     pass $test
 }
 
 gdb_test_no_output "set disable-randomization on"
diff --git a/gdb/testsuite/gdb.base/range-stepping.exp b/gdb/testsuite/gdb.base/range-stepping.exp
index 53083f066c35..06d976bdf255 100644
--- a/gdb/testsuite/gdb.base/range-stepping.exp
+++ b/gdb/testsuite/gdb.base/range-stepping.exp
@@ -17,20 +17,20 @@  load_lib "range-stepping-support.exp"
 
 standard_testfile
 set executable $testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {![gdb_range_stepping_enabled]} {
     unsupported "range stepping not supported by the target"
-    return -1
+    return
 }
 
 # Check that range stepping can step a range of multiple instructions.
 
 with_test_prefix "multi insns" {
diff --git a/gdb/testsuite/gdb.base/readline-ask.exp b/gdb/testsuite/gdb.base/readline-ask.exp
index 0981860eacff..bee3fbba4e78 100644
--- a/gdb/testsuite/gdb.base/readline-ask.exp
+++ b/gdb/testsuite/gdb.base/readline-ask.exp
@@ -18,22 +18,22 @@  require {!is_remote host}
 standard_testfile .c
 set inputrc ${srcdir}/${subdir}/${testfile}.inputrc
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 setenv TERM dumb
 
 # INPUTRC gets reset for the next testfile.
 setenv INPUTRC $inputrc
 clean_restart $testfile
 
 if { ![readline_is_used] } {
     unsupported "completion doesn't work when readline isn't used."
-    return -1
+    return
 }
 
 gdb_test_no_output "set width 50"
 gdb_test_no_output "set height 3"
 
diff --git a/gdb/testsuite/gdb.base/readline-commands-eof.exp b/gdb/testsuite/gdb.base/readline-commands-eof.exp
index 6fa6cf96e656..7da5f08fc7b5 100644
--- a/gdb/testsuite/gdb.base/readline-commands-eof.exp
+++ b/gdb/testsuite/gdb.base/readline-commands-eof.exp
@@ -21,20 +21,20 @@ 
 # lines in the output.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 # The fix for this issue relies on GDB being able to adjust the EOF
 # flag state within readline.  Access to this state was added for
 # readline 8.2, but was also backported to out internal readline.  If
 # this feature is not available then this test might not pass.
 if { ![readline_supports_eof_flag] } {
     unsupported "readline is not eof flag aware"
-    return -1
+    return
 }
 
 # Create a breakpoint then issue the 'commands' commands.  When the
 # secondary prompt is displayed, use Ctrl+d to send EOF to readline
 # and cancel the input.
diff --git a/gdb/testsuite/gdb.base/readnever.exp b/gdb/testsuite/gdb.base/readnever.exp
index 427b9a82c85d..9f74b8b005d5 100644
--- a/gdb/testsuite/gdb.base/readnever.exp
+++ b/gdb/testsuite/gdb.base/readnever.exp
@@ -19,11 +19,11 @@  require !readnow
 
 standard_testfile .c
 
 if { [build_executable "failed to build" $testfile $srcfile { debug }] == -1 } {
     untested "couldn't compile ${srcfile}"
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
     append GDBFLAGS " --readnever"
     if { [clean_restart $testfile] == -1 } {
diff --git a/gdb/testsuite/gdb.base/realname-expand.exp b/gdb/testsuite/gdb.base/realname-expand.exp
index 5c8e8acb1298..5817cd57d9db 100644
--- a/gdb/testsuite/gdb.base/realname-expand.exp
+++ b/gdb/testsuite/gdb.base/realname-expand.exp
@@ -24,17 +24,17 @@  set srcfilelink [standard_output_file realname-expand-link.c]
 
 remote_exec build "ln -sf ${srcdirabs}/${subdir}/${srcfile2} $srcfilelink"
 
 if { [file type $srcfilelink] != "link" } {
     unsupported "target directory cannot have symbolic links"
-    return -1
+    return
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcfilelink}" "${binfile}" \
 		  executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart ${testfile}
 
 gdb_test_no_output "set basenames-may-differ on"
diff --git a/gdb/testsuite/gdb.base/recpar.exp b/gdb/testsuite/gdb.base/recpar.exp
index b325002b2d38..3812884dc468 100644
--- a/gdb/testsuite/gdb.base/recpar.exp
+++ b/gdb/testsuite/gdb.base/recpar.exp
@@ -14,15 +14,15 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "break $srcfile:[gdb_get_line_number BREAK $srcfile] if n == 3" \
 	 "Breakpoint $decimal at $hex: file .*recpar\\.c, line $decimal\\."
 
diff --git a/gdb/testsuite/gdb.base/recurse.exp b/gdb/testsuite/gdb.base/recurse.exp
index f96e1e3072a3..4a59cecf8fba 100644
--- a/gdb/testsuite/gdb.base/recurse.exp
+++ b/gdb/testsuite/gdb.base/recurse.exp
@@ -24,11 +24,11 @@ 
 set allow_hw_watchpoint_tests_p [allow_hw_watchpoint_tests]
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 proc recurse_tests {} {
 
     # Disable hardware watchpoints if necessary.
diff --git a/gdb/testsuite/gdb.base/reggroups.exp b/gdb/testsuite/gdb.base/reggroups.exp
index ce5cb50d85c7..f3866ec51cf4 100644
--- a/gdb/testsuite/gdb.base/reggroups.exp
+++ b/gdb/testsuite/gdb.base/reggroups.exp
@@ -18,11 +18,11 @@ 
 # Test listing reggroups and the registers in each group.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/relational.exp b/gdb/testsuite/gdb.base/relational.exp
index 01b635f9694a..f75043643ec2 100644
--- a/gdb/testsuite/gdb.base/relational.exp
+++ b/gdb/testsuite/gdb.base/relational.exp
@@ -24,11 +24,11 @@ 
 #
 # test running programs
 #
 
 if { [prepare_for_testing "failed to prepare" relational int-type.c {debug nowarnings}] } {
-    return -1
+    return
 }
 
 #
 # set it up at a breakpoint so we can play with the variable values
 #
diff --git a/gdb/testsuite/gdb.base/remote.exp b/gdb/testsuite/gdb.base/remote.exp
index 9fa50611ed5b..da13e9f13fe7 100644
--- a/gdb/testsuite/gdb.base/remote.exp
+++ b/gdb/testsuite/gdb.base/remote.exp
@@ -23,11 +23,11 @@  if {[target_info gdb_protocol] != "remote"
 standard_testfile .c
 
 set result [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}]
 if {$result != ""} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 gdb_start
 
 # Make sure we're disconnected, in case we're testing with an
diff --git a/gdb/testsuite/gdb.base/reread-readsym.exp b/gdb/testsuite/gdb.base/reread-readsym.exp
index 6db4eacc1b92..8457d2e4fbba 100644
--- a/gdb/testsuite/gdb.base/reread-readsym.exp
+++ b/gdb/testsuite/gdb.base/reread-readsym.exp
@@ -39,11 +39,11 @@  proc generate_cmd_file {gdbfile binfile} {
 }
 
 require !use_gdb_stub
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Using the source command to read commands from a file is important,
 # otherwise section data is freed and reallocated using the same
 # memory locations and the bug is not exposed.
diff --git a/gdb/testsuite/gdb.base/restore.exp b/gdb/testsuite/gdb.base/restore.exp
index d5e78238575c..ce7fe5b3ca11 100644
--- a/gdb/testsuite/gdb.base/restore.exp
+++ b/gdb/testsuite/gdb.base/restore.exp
@@ -23,11 +23,11 @@ 
 
 standard_testfile
 set executable $testfile
 
 if { [prepare_for_testing "failed to prepare" $executable $srcfile] } {
-    return -1
+    return
 }
 
 proc restore_tests { } {
     global gdb_prompt
 
@@ -96,9 +96,9 @@  restore_tests
 set timeout $prev_timeout
 
 # Test PR cli/23785
 clean_restart $testfile
 if { ![runto_main] } {
-    return -1
+    return
 }
 gdb_test "restore non-existent-file binary" \
     "Failed to open non-existent-file: .*"
diff --git a/gdb/testsuite/gdb.base/return-3.exp b/gdb/testsuite/gdb.base/return-3.exp
index d2f7739b1e3c..8c958a2245ac 100644
--- a/gdb/testsuite/gdb.base/return-3.exp
+++ b/gdb/testsuite/gdb.base/return-3.exp
@@ -14,15 +14,15 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 if { ![runto bar] } {
-    return -1
+    return
 }
 
 with_test_prefix "in bar" {
     gdb_test "return" \
 	[string_to_regexp "Can not force return from an inlined function."]
diff --git a/gdb/testsuite/gdb.base/return.exp b/gdb/testsuite/gdb.base/return.exp
index 2899ce9dbbbb..7b4f6fea320d 100644
--- a/gdb/testsuite/gdb.base/return.exp
+++ b/gdb/testsuite/gdb.base/return.exp
@@ -16,11 +16,11 @@ 
 # This file was written by Jeff Law. (law@cs.utah.edu)
 
 set allow_float_test [allow_float_test]
 
 if { [prepare_for_testing "failed to prepare" "return"] } {
-    return -1
+    return
 }
 
 proc return_tests { } {
     global gdb_prompt allow_float_test
 
diff --git a/gdb/testsuite/gdb.base/retval-large-struct.exp b/gdb/testsuite/gdb.base/retval-large-struct.exp
index 0ba13810cd6e..7bdc8af2a0f4 100644
--- a/gdb/testsuite/gdb.base/retval-large-struct.exp
+++ b/gdb/testsuite/gdb.base/retval-large-struct.exp
@@ -25,15 +25,15 @@  set additional_flags ""
 if {[have_fvar_tracking]} {
     set additional_flags "additional_flags= -fvar-tracking"
 }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile [list debug $additional_flags]]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set pattern ".* = \\{int_array = \\{1, 2, 3, 4, 5\\}, double_array = \\{3.25, 5, 6.25, 1.325, -1.95\\}, char_array = \"abcde\"\\}"
 
 gdb_test "p return_large_struct ()" $pattern
diff --git a/gdb/testsuite/gdb.base/rtld-step.exp b/gdb/testsuite/gdb.base/rtld-step.exp
index 3beab5ee334e..57f878dfb395 100644
--- a/gdb/testsuite/gdb.base/rtld-step.exp
+++ b/gdb/testsuite/gdb.base/rtld-step.exp
@@ -91,11 +91,11 @@  if { ![gdb_can_simple_compile static-pie-static-libc \
 	       void _start (void) { _exit (0); }
 	   } \
 	   executable $rtld_flags] } {
     set reason "-static-pie not supported or static libc missing"
     untested "failed to compile ($reason)"
-    return -1
+    return
 }
 
 # Main program file names and flags:
 set main_basename ${::gdb_test_file_name}-main
 set srcfile_main ${srcdir}/${subdir}/${main_basename}.c
@@ -106,17 +106,17 @@  lappend main_flags \
     additional_flags=[quote_for_host -Wl,--dynamic-linker=$binfile_rtld]
 
 # Compile pretend RTLD:
 if { [gdb_compile ${srcfile_rtld} ${binfile_rtld} executable $rtld_flags] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Compile main program:
 if { [gdb_compile ${srcfile_main} ${binfile_main} executable $main_flags] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
 gdb_load $binfile_main
 
diff --git a/gdb/testsuite/gdb.base/run-after-attach.exp b/gdb/testsuite/gdb.base/run-after-attach.exp
index 4a170b88c71d..256f2fbcdd1a 100644
--- a/gdb/testsuite/gdb.base/run-after-attach.exp
+++ b/gdb/testsuite/gdb.base/run-after-attach.exp
@@ -20,11 +20,11 @@  require can_spawn_for_attach
 
 standard_testfile
 set executable $testfile
 
 if {[prepare_for_testing "failed to prepare" $executable]} {
-    return -1
+    return
 }
 
 set test_spawn_id [spawn_wait_for_attach $binfile]
 set test_pid [spawn_id_get_pid $test_spawn_id]
 
diff --git a/gdb/testsuite/gdb.base/run-fail-twice.exp b/gdb/testsuite/gdb.base/run-fail-twice.exp
index 57a7c437e40b..8fcfee9eee00 100644
--- a/gdb/testsuite/gdb.base/run-fail-twice.exp
+++ b/gdb/testsuite/gdb.base/run-fail-twice.exp
@@ -18,11 +18,11 @@ 
 require target_can_use_run_cmd
 
 standard_testfile
 
 if {[build_executable "failed to build" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 proc test_run {testname} {
     gdb_test_multiple "run" $testname {
 	-re -wrap "During startup program exited with code 126\\." {
diff --git a/gdb/testsuite/gdb.base/save-bp.exp b/gdb/testsuite/gdb.base/save-bp.exp
index 2e27f9ebbf8a..0c0eb860d286 100644
--- a/gdb/testsuite/gdb.base/save-bp.exp
+++ b/gdb/testsuite/gdb.base/save-bp.exp
@@ -14,15 +14,15 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 # Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
 # the "runto_main" breakpoint above does not interfere with our testing.
 delete_breakpoints
 
@@ -60,11 +60,11 @@  remote_file host delete "$bps"
 gdb_test "save breakpoint $bps" "" "save breakpoint bps"
 
 # Now start a new debugger session...
 clean_restart $testfile
 if {![runto_main]} {
-    return -1
+    return
 }
 # Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
 # the "runto_main" breakpoint above does not interfere with our testing.
 delete_breakpoints
 
diff --git a/gdb/testsuite/gdb.base/scope-hw-watch-disable.exp b/gdb/testsuite/gdb.base/scope-hw-watch-disable.exp
index 67305ebb87b7..e45d10dc7b00 100644
--- a/gdb/testsuite/gdb.base/scope-hw-watch-disable.exp
+++ b/gdb/testsuite/gdb.base/scope-hw-watch-disable.exp
@@ -18,17 +18,17 @@ 
 # successfully after several attempts to insert a hardware watchpoint.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set can-use-hw-watchpoints 0"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_multiple "maint info break" "maint info break before" {
     -re -wrap "watchpoint.*" {
 	fail $gdb_test_name
diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp
index b82465a1184d..338e4a4b4467 100644
--- a/gdb/testsuite/gdb.base/scope.exp
+++ b/gdb/testsuite/gdb.base/scope.exp
@@ -18,11 +18,11 @@ 
 
 standard_testfile scope0.c scope1.c
 
 if {[build_executable "failed to build" ${testfile} \
 	 [list $srcfile $srcfile2] {debug}]} {
-    return -1
+    return
 }
 
 # Test locating various things when stopped just inside main, after
 # running init0().  To prevent cascading of errors, we report the
 # first one and quit.  If all pass, then we print the pass results.
diff --git a/gdb/testsuite/gdb.base/sect-cmd.exp b/gdb/testsuite/gdb.base/sect-cmd.exp
index 0c2a413b6943..c6300aa52992 100644
--- a/gdb/testsuite/gdb.base/sect-cmd.exp
+++ b/gdb/testsuite/gdb.base/sect-cmd.exp
@@ -15,11 +15,11 @@ 
 
 # Test the 'section NAME ADDRESS' command.
 
 if { [prepare_for_testing "failed to prepare" "sect-cmd" \
 	  {break.c break1.c} {debug nowarnings}] } {
-    return -1
+    return
 }
 set srcfile break.c
 set srcfile1 break1.c
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp
index bbb9eb7cd16b..1ada019ea434 100644
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ b/gdb/testsuite/gdb.base/sepdebug.exp
@@ -31,11 +31,11 @@ 
 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Note: the procedure gdb_gnu_strip_debug will produce an executable called
 # ${binfile}, which is just like the executable ($binfile) but without
 # the debuginfo. Instead $binfile has a .gnu_debuglink section which contains
@@ -43,11 +43,11 @@  if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # gdb.base/ subdirectory.
 
 if {[gdb_gnu_strip_debug $binfile$EXEEXT]} {
     # check that you have a recent version of strip and objcopy installed
     unsupported "cannot produce separate debug info files"
-    return -1
+    return
 }
 
 #
 # PR gdb/9538.  Verify that symlinked executable still finds the separate
 # debuginfo.
diff --git a/gdb/testsuite/gdb.base/sepsymtab.exp b/gdb/testsuite/gdb.base/sepsymtab.exp
index 0677ef57b4fb..aecb1b93f32f 100644
--- a/gdb/testsuite/gdb.base/sepsymtab.exp
+++ b/gdb/testsuite/gdb.base/sepsymtab.exp
@@ -20,17 +20,17 @@ 
 standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	  executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 if {[gdb_gnu_strip_debug $binfile no-main]} {
     # check that you have a recent version of strip and objcopy installed
     unsupported "cannot produce separate debug info files"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 set command "info sym main"
diff --git a/gdb/testsuite/gdb.base/server-del-break.exp b/gdb/testsuite/gdb.base/server-del-break.exp
index 6bc95d5bd7f0..4401a848589f 100644
--- a/gdb/testsuite/gdb.base/server-del-break.exp
+++ b/gdb/testsuite/gdb.base/server-del-break.exp
@@ -19,11 +19,11 @@ 
 # command to demonstrate the behavior.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 gdb_test "break -q main" \
 	 "Breakpoint.*at.* file .*$srcfile, line .*"
 
diff --git a/gdb/testsuite/gdb.base/set-cwd.exp b/gdb/testsuite/gdb.base/set-cwd.exp
index 3fbffdc6136f..279004596a1e 100644
--- a/gdb/testsuite/gdb.base/set-cwd.exp
+++ b/gdb/testsuite/gdb.base/set-cwd.exp
@@ -18,11 +18,11 @@ 
 require !use_gdb_stub
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
-    return -1
+    return
 }
 
 # Test that tilde expansion works fine.
 
 proc_with_prefix test_tilde_expansion { } {
diff --git a/gdb/testsuite/gdb.base/set-inferior-tty.exp b/gdb/testsuite/gdb.base/set-inferior-tty.exp
index 1d0ee21b4cba..be82eeed6b18 100644
--- a/gdb/testsuite/gdb.base/set-inferior-tty.exp
+++ b/gdb/testsuite/gdb.base/set-inferior-tty.exp
@@ -16,11 +16,11 @@ 
 standard_testfile
 
 set compile_options "debug"
 if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 proc test_set_inferior_tty { command } {
     clean_restart $::testfile
 
diff --git a/gdb/testsuite/gdb.base/set-lang-auto.exp b/gdb/testsuite/gdb.base/set-lang-auto.exp
index 2cbc5930f6de..f003c2307e9b 100644
--- a/gdb/testsuite/gdb.base/set-lang-auto.exp
+++ b/gdb/testsuite/gdb.base/set-lang-auto.exp
@@ -15,11 +15,11 @@ 
 
 
 standard_testfile start.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Do not run the inferior as the purpose of this testcase is to test
 # the behavior of the "set language" command when there is no inferior.
 
diff --git a/gdb/testsuite/gdb.base/set-noassign.exp b/gdb/testsuite/gdb.base/set-noassign.exp
index 41a3f096cafa..0f3b843cd1fe 100644
--- a/gdb/testsuite/gdb.base/set-noassign.exp
+++ b/gdb/testsuite/gdb.base/set-noassign.exp
@@ -13,11 +13,11 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 if { [prepare_for_testing "failed to prepare" "set-noassign" start.c {debug nowarnings}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/settings.exp b/gdb/testsuite/gdb.base/settings.exp
index 48c015a3552a..2da8d47405bb 100644
--- a/gdb/testsuite/gdb.base/settings.exp
+++ b/gdb/testsuite/gdb.base/settings.exp
@@ -22,18 +22,18 @@ 
 load_lib completion-support.exp
 
 standard_testfile .c
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 clean_restart
 
 if { ![readline_is_used] } {
     untested "no tab completion support without readline"
-    return -1
+    return
 }
 
 # Test the show command SHOW_CMD.  EXPECTED_RE is the expected output.
 # Also verifies that $_gdb_maint_setting_str produces an equivalent output,
 # matching it with EXPECTED_RE.  EXPECTED_RE double quotes are escaped
diff --git a/gdb/testsuite/gdb.base/setvar.exp b/gdb/testsuite/gdb.base/setvar.exp
index 8a3b88631d01..14fba5497a87 100644
--- a/gdb/testsuite/gdb.base/setvar.exp
+++ b/gdb/testsuite/gdb.base/setvar.exp
@@ -25,11 +25,11 @@ 
 #
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 #
 # set it up at a breakpoint so we canplay with the variable values
 #
diff --git a/gdb/testsuite/gdb.base/share-env-with-gdbserver.exp b/gdb/testsuite/gdb.base/share-env-with-gdbserver.exp
index e1b3540d5d7e..60875224de2f 100644
--- a/gdb/testsuite/gdb.base/share-env-with-gdbserver.exp
+++ b/gdb/testsuite/gdb.base/share-env-with-gdbserver.exp
@@ -19,11 +19,11 @@ 
 require !use_gdb_stub
 
 standard_testfile
 
 if { [build_executable "failed to prepare" $testfile $srcfile debug] } {
-    return -1
+    return
 }
 
 set test_var_name "GDB_TEST_VAR"
 
 # Helper function that performs a check on the output of "getenv".
diff --git a/gdb/testsuite/gdb.base/share-psymtabs-bt.exp b/gdb/testsuite/gdb.base/share-psymtabs-bt.exp
index 8fd40cdaecd7..6984e70354e4 100644
--- a/gdb/testsuite/gdb.base/share-psymtabs-bt.exp
+++ b/gdb/testsuite/gdb.base/share-psymtabs-bt.exp
@@ -28,23 +28,23 @@ 
 standard_testfile .c share-psymtabs-bt-2.c
 
 if { [prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" \
 	 {debug}] } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Load $binfile a second time.  The second created objfile will re-use the
 # partial symtabs created by the first one.
 if { [gdb_file_cmd $binfile] != 0 } {
     fail "file command failed"
-    return -1
+    return
 }
 
 gdb_breakpoint "bar"
 if { ![runto "bar"] } {
-    return -1
+    return
 }
 
 # A buggy GDB would fail to find the full symbol associated to this frame's
 # address, so would just show "foo ()" (from the minimal symbol).
 gdb_test "bt" "foo \\(x=12345\\).*"
diff --git a/gdb/testsuite/gdb.base/sigall.exp b/gdb/testsuite/gdb.base/sigall.exp
index 51cd91ed41ef..a550d1f71dda 100644
--- a/gdb/testsuite/gdb.base/sigall.exp
+++ b/gdb/testsuite/gdb.base/sigall.exp
@@ -16,11 +16,11 @@ 
 require {!target_info exists gdb,nosignals}
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 proc test_one_sig {nextsig} {
     global sig_supported
     global gdb_prompt
diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp
index 02f907bdea6d..c3f17e0e9707 100644
--- a/gdb/testsuite/gdb.base/sigbpt.exp
+++ b/gdb/testsuite/gdb.base/sigbpt.exp
@@ -32,11 +32,11 @@  require {!target_info exists gdb,nosignals}
 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 #
 # Run to `main' where we begin our tests.
 #
diff --git a/gdb/testsuite/gdb.base/siginfo-addr.exp b/gdb/testsuite/gdb.base/siginfo-addr.exp
index 0f7026d4a93c..93ce7a227909 100644
--- a/gdb/testsuite/gdb.base/siginfo-addr.exp
+++ b/gdb/testsuite/gdb.base/siginfo-addr.exp
@@ -23,11 +23,11 @@ 
 
 require {!target_info exists gdb,nosignals}
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 gdb_test "display/i \$pc"
 
 # Advance to main
diff --git a/gdb/testsuite/gdb.base/siginfo-infcall.exp b/gdb/testsuite/gdb.base/siginfo-infcall.exp
index f581989caaff..caf43d1ac4c3 100644
--- a/gdb/testsuite/gdb.base/siginfo-infcall.exp
+++ b/gdb/testsuite/gdb.base/siginfo-infcall.exp
@@ -16,15 +16,15 @@ 
 require {!target_info exists gdb,nosignals}
 
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "pass"
 gdb_breakpoint "fail"
 
diff --git a/gdb/testsuite/gdb.base/siginfo-obj.exp b/gdb/testsuite/gdb.base/siginfo-obj.exp
index bf59dd937946..daf160bc162b 100644
--- a/gdb/testsuite/gdb.base/siginfo-obj.exp
+++ b/gdb/testsuite/gdb.base/siginfo-obj.exp
@@ -27,11 +27,11 @@  require supports_get_siginfo_type
 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Advance to main
 if {![runto_main]} {
     return 0
diff --git a/gdb/testsuite/gdb.base/siginfo.exp b/gdb/testsuite/gdb.base/siginfo.exp
index 92d712053f05..f5a00220f12a 100644
--- a/gdb/testsuite/gdb.base/siginfo.exp
+++ b/gdb/testsuite/gdb.base/siginfo.exp
@@ -27,11 +27,11 @@  require {!target_info exists gdb,nosignals}
 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 gdb_test "display/i \$pc"
 
 # Advance to main
diff --git a/gdb/testsuite/gdb.base/signals-state-child.exp b/gdb/testsuite/gdb.base/signals-state-child.exp
index 0c3da466af45..5c0be259c00a 100644
--- a/gdb/testsuite/gdb.base/signals-state-child.exp
+++ b/gdb/testsuite/gdb.base/signals-state-child.exp
@@ -45,17 +45,17 @@  remote_file target delete $gdb_txt
 remote_file target delete $standalone_txt
 
 set options [list debug "additional_flags=-DOUTPUT_TXT=\"$gdb_txt\""]
 if {[build_executable $testfile.exp $testfile $srcfile $options]} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set options [list debug "additional_flags=-DOUTPUT_TXT=\"$standalone_txt\""]
 if {[build_executable $testfile.exp $testfile-standalone $srcfile $options]} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Run the program directly, and dump its initial signal actions and
 # mask in "standalone.txt".
 
@@ -98,19 +98,19 @@  remote_close target
 # and mask in "gdb.txt".
 
 clean_restart $testfile
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_continue_to_end "collect signals state under gdb"
 
 set test "signals states are identical"
 if { ! $have_standalone } {
     untested $test
-    return -1
+    return
 }
 
 if {!$purely_local} {
     # Copy file from target to host through build.
     remote_download host [remote_upload target gdb.txt] gdb.txt
diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/signals.exp
index 56aa73aa5500..da3eb6dae5ba 100644
--- a/gdb/testsuite/gdb.base/signals.exp
+++ b/gdb/testsuite/gdb.base/signals.exp
@@ -18,11 +18,11 @@  require {!target_info exists gdb,nosignals}
 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 gdb_exit
 gdb_start
 
diff --git a/gdb/testsuite/gdb.base/signed-builtin-types.exp b/gdb/testsuite/gdb.base/signed-builtin-types.exp
index 29e2f9853532..abe4a9c4cbad 100644
--- a/gdb/testsuite/gdb.base/signed-builtin-types.exp
+++ b/gdb/testsuite/gdb.base/signed-builtin-types.exp
@@ -21,26 +21,26 @@  standard_testfile .c -lib.c
 set srcdso [file join $srcdir $subdir $srcfile2]
 set libname "lib${gdb_test_file_name}.so"
 set objdso [standard_output_file $libname]
 if {[gdb_compile_shlib $srcdso $objdso {debug}] != ""} {
     untested "failed to compile dso"
-    return -1
+    return
 }
 
 # Build the test executable and runto main.
 set opts [list debug shlib=$objdso]
 if { [prepare_for_testing "failed to " $testfile $srcfile $opts] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 if {[readnow]} {
     untested "this test checks for delayed symtab expansion"
-    return -1
+    return
 }
 
 # Use 'info sources' to check if the debug information for the shared
 # library has been fully expanded or not.  Return true if the debug
 # information has NOT been fully expanded (which is what we want for this
diff --git a/gdb/testsuite/gdb.base/signest.exp b/gdb/testsuite/gdb.base/signest.exp
index 920cdb907e74..465c8452d62d 100644
--- a/gdb/testsuite/gdb.base/signest.exp
+++ b/gdb/testsuite/gdb.base/signest.exp
@@ -18,26 +18,26 @@ 
 standard_testfile
 
 require {!target_info exists gdb,nosignals}
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # If we can examine what's at memory address 0, it is possible that we
 # could also execute it.  This could probably make us run away,
 # executing random code, which could have all sorts of ill effects,
 # especially on targets without an MMU.  Don't run the tests in that
 # case.
 
 if { [is_address_zero_readable] } {
     untested "memory at address 0 is possibly executable"
-    return -1
+    return
 }
 
 # Run until we hit the SIGSEGV (or SIGBUS on some platforms).
 gdb_test "continue" \
 	 ".*Program received signal (SIGBUS|SIGSEGV).*bowler.*" \
diff --git a/gdb/testsuite/gdb.base/sigstep.exp b/gdb/testsuite/gdb.base/sigstep.exp
index 2507504c5ccb..9199216b051b 100644
--- a/gdb/testsuite/gdb.base/sigstep.exp
+++ b/gdb/testsuite/gdb.base/sigstep.exp
@@ -26,11 +26,11 @@  require {!target_info exists gdb,nosignals}
 
 standard_testfile
 
 if {[build_executable $testfile.exp $testfile $srcfile debug]} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set clear_done [gdb_get_line_number {done = 0}]
 set infinite_loop [gdb_get_line_number {while (!done)}]
 set other_handler_location [gdb_get_line_number "other handler location"]
diff --git a/gdb/testsuite/gdb.base/sizeof.exp b/gdb/testsuite/gdb.base/sizeof.exp
index 50930c82c6a4..48caebe2f16d 100644
--- a/gdb/testsuite/gdb.base/sizeof.exp
+++ b/gdb/testsuite/gdb.base/sizeof.exp
@@ -20,11 +20,11 @@ 
 #
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 #
 # set it up at a breakpoint so we can play with the variable values
 #
diff --git a/gdb/testsuite/gdb.base/skip-inline.exp b/gdb/testsuite/gdb.base/skip-inline.exp
index c2fd05808bd6..a0223efa2eb5 100644
--- a/gdb/testsuite/gdb.base/skip-inline.exp
+++ b/gdb/testsuite/gdb.base/skip-inline.exp
@@ -18,11 +18,11 @@  standard_testfile
 set epilogue [have_epilogue_line_info]
 
 if { [prepare_for_testing "failed to prepare" "skip-inline" \
 			  {skip-inline.c skip1.c } \
 			  {debug nowarnings}] } {
-    return -1
+    return
 }
 
 set srcfile skip-inline.c
 set srcfile1 skip1.c
 
diff --git a/gdb/testsuite/gdb.base/skip-solib.exp b/gdb/testsuite/gdb.base/skip-solib.exp
index e8890288fa3c..1382c7ce831c 100644
--- a/gdb/testsuite/gdb.base/skip-solib.exp
+++ b/gdb/testsuite/gdb.base/skip-solib.exp
@@ -39,22 +39,22 @@  set binfile_lib [standard_output_file ${libname}.so]
 # the main program.
 #
 
 if {[gdb_compile_shlib ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} \
 	 [list debug]] != ""} {
-    return -1
+    return
 }
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile_main}" "${binfile_main}.o" \
 	 object debug] != ""} {
-    return -1
+    return
 }
 
 set testobjdir [standard_output_file {}]
 if {[gdb_compile "${binfile_main}.o" "${binfile_main}" executable \
 	 [list debug shlib=$binfile_lib]] != ""} {
-    return -1
+    return
 }
 
 #
 # Test ignoring of a file inside a solib.
 #
diff --git a/gdb/testsuite/gdb.base/skip.exp b/gdb/testsuite/gdb.base/skip.exp
index 3807fb333255..8ba6e8cda569 100644
--- a/gdb/testsuite/gdb.base/skip.exp
+++ b/gdb/testsuite/gdb.base/skip.exp
@@ -21,11 +21,11 @@  load_lib completion-support.exp
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" "skip" \
 			  {skip.c skip1.c } \
 			  {debug nowarnings}] } {
-    return -1
+    return
 }
 
 set srcfile skip.c
 set srcfile1 skip1.c
 
diff --git a/gdb/testsuite/gdb.base/skipcxx.exp b/gdb/testsuite/gdb.base/skipcxx.exp
index 06f9912d763e..9e1c0f293c8d 100644
--- a/gdb/testsuite/gdb.base/skipcxx.exp
+++ b/gdb/testsuite/gdb.base/skipcxx.exp
@@ -18,11 +18,11 @@  standard_testfile .cc
 set flags {}
 lappend flags debug
 lappend flags c++
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.base/solib-corrupted.exp b/gdb/testsuite/gdb.base/solib-corrupted.exp
index 19be38f77388..f733579809f6 100644
--- a/gdb/testsuite/gdb.base/solib-corrupted.exp
+++ b/gdb/testsuite/gdb.base/solib-corrupted.exp
@@ -21,11 +21,11 @@  require {!is_remote target}
 
 set testfile "solib-corrupted"
 set srcfile start.c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 # With probes interface GDB no longer scans the inferior library list so its
 # corruption cannot be tested.  Disable the probes interface.
 gdb_test "maint ignore-probes rtld"
diff --git a/gdb/testsuite/gdb.base/solib-nodir.exp b/gdb/testsuite/gdb.base/solib-nodir.exp
index 29b641b43e2b..4189e1abd5b3 100644
--- a/gdb/testsuite/gdb.base/solib-nodir.exp
+++ b/gdb/testsuite/gdb.base/solib-nodir.exp
@@ -40,11 +40,11 @@  if { [build_executable "build library" ${binlibfile} ${srclibfile} \
 	  {debug shlib}] == -1
      || [gdb_gnu_strip_debug $binlibfile]
      || [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug}] != ""
      || [gdb_compile "${objfile} ${binlibfile}" "${binfile}" executable {}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $executable
 gdb_load_shlib ${binlibfile}
 
diff --git a/gdb/testsuite/gdb.base/solib-probes-nosharedlibrary.exp b/gdb/testsuite/gdb.base/solib-probes-nosharedlibrary.exp
index 44617f42a8b1..9b4c339cb92d 100644
--- a/gdb/testsuite/gdb.base/solib-probes-nosharedlibrary.exp
+++ b/gdb/testsuite/gdb.base/solib-probes-nosharedlibrary.exp
@@ -19,11 +19,11 @@ 
 # would deference a dangling solib event probe pointer.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {$use_gdb_stub && [target_info exists gdb,do_reload_on_run]} {
     # This is the path taken by gdbserver "target remote" boards.
     if { [gdb_reload] != 0 } {
diff --git a/gdb/testsuite/gdb.base/solib-search.exp b/gdb/testsuite/gdb.base/solib-search.exp
index c4b2730e8f2d..43f54b41df0e 100644
--- a/gdb/testsuite/gdb.base/solib-search.exp
+++ b/gdb/testsuite/gdb.base/solib-search.exp
@@ -63,20 +63,20 @@  remote_exec build "mkdir [standard_output_file ${right_lib_subdir}]"
 if { [gdb_compile_shlib ${srcfile1_lib} ${wrong_binfile1_lib} $wrong_lib_flags] != ""
      || [gdb_compile_shlib ${srcfile2_lib} ${wrong_binfile2_lib} $wrong_lib_flags] != ""
      || [gdb_compile_shlib ${srcfile1_lib} ${right_binfile1_lib} $right_lib_flags] != ""
      || [gdb_compile_shlib ${srcfile2_lib} ${right_binfile2_lib} $right_lib_flags] != "" } {
     untested "failed to compile shared library"
-    return -1
+    return
 }
 
 # Build the test binary using the right copies of the libraries.
 remote_exec build "ln -sf ${right_lib_subdir}/${libname1}.so ${binfile1_lib}"
 remote_exec build "ln -sf ${right_lib_subdir}/${libname2}.so ${binfile2_lib}"
 if { [gdb_compile $srcdir/$subdir/${srcfile} ${binfile} \
 	  executable $bin_flags] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 if { ![runto_main] } {
diff --git a/gdb/testsuite/gdb.base/solib-vanish.exp b/gdb/testsuite/gdb.base/solib-vanish.exp
index 152e41760a02..80e28638b2d2 100644
--- a/gdb/testsuite/gdb.base/solib-vanish.exp
+++ b/gdb/testsuite/gdb.base/solib-vanish.exp
@@ -68,11 +68,11 @@  set binfile_lib1 [standard_output_file ${lib1name}.so]
 set lib1_flags [list debug shlib=${binfile_lib2}]
 
 if { [gdb_compile_shlib ${srcfile_lib2} ${binfile_lib2} $lib2_flags] != ""
      || [gdb_compile_shlib ${srcfile_lib1} ${binfile_lib1} $lib1_flags] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Main program
 set testfile "solib-vanish-main"
 set srcfile ${srcdir}/${subdir}/${testfile}.c
@@ -86,11 +86,11 @@  if {[is_remote target]} {
     lappend cleanfiles_target $binfile_lib1_target.renamed
 }
 
 if { [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 gdb_locate_shlib $binfile_lib1
diff --git a/gdb/testsuite/gdb.base/source-execution.exp b/gdb/testsuite/gdb.base/source-execution.exp
index 8f5e88540d93..a16535e97e4c 100644
--- a/gdb/testsuite/gdb.base/source-execution.exp
+++ b/gdb/testsuite/gdb.base/source-execution.exp
@@ -18,11 +18,11 @@ 
 # Test sourcing a script that runs execution commands.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/source-open.exp b/gdb/testsuite/gdb.base/source-open.exp
index e222c6420638..38802489247c 100644
--- a/gdb/testsuite/gdb.base/source-open.exp
+++ b/gdb/testsuite/gdb.base/source-open.exp
@@ -16,11 +16,11 @@ 
 # Test the 'set source open on|off' command.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 gdb_test "show source open" "Source opening is \"on\"\\." \
     "source opening is initially on"
 gdb_test_no_output "set listsize 1"
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 691946d35f5f..6b299b3bc05a 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
@@ -36,11 +36,11 @@ 
 require !gdb_debug_enabled
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_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 89fdb486a9c0..042caf6c27bb 100644
--- a/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp
+++ b/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp
@@ -19,11 +19,11 @@ 
 
 standard_testfile
 set executable ${testfile}
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
@@ -40,11 +40,11 @@  gdb_test_multiple $test $test {
 	pass $test
     }
 }
 
 if { $next_insn_addr == "" } {
-    return -1
+    return
 }
 
 gdb_test "b *$next_insn_addr" "Breakpoint .*" "set breakpoint on address"
 
 # So that GDB doesn't try to remove the regular breakpoint when the
diff --git a/gdb/testsuite/gdb.base/stale-infcall.exp b/gdb/testsuite/gdb.base/stale-infcall.exp
index b602bea56cfc..cb7c09972032 100644
--- a/gdb/testsuite/gdb.base/stale-infcall.exp
+++ b/gdb/testsuite/gdb.base/stale-infcall.exp
@@ -14,15 +14,15 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "test-next"] temporary
 gdb_continue_to_breakpoint "test-next" ".* test-next .*"
 gdb_breakpoint [gdb_get_line_number "test-fail"]
diff --git a/gdb/testsuite/gdb.base/start-cpp.exp b/gdb/testsuite/gdb.base/start-cpp.exp
index 58269005e517..3dbd860a0b9d 100644
--- a/gdb/testsuite/gdb.base/start-cpp.exp
+++ b/gdb/testsuite/gdb.base/start-cpp.exp
@@ -20,11 +20,11 @@  standard_testfile .cc
 set flags {}
 lappend flags debug
 lappend flags c++
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
-    return -1
+    return
 }
 
 # This is a testcase specifically for the `start' GDB command.  For regular
 # stop-in-main goal in the testcases consider using `runto_main' instead.
 
@@ -33,11 +33,11 @@  if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
 # location, even if we have a function named "main" in a non-root namespace.
 
 # For C++ programs, "start" should stop in main().
 if { [gdb_start_cmd] < 0 } {
     fail start
-    return -1
+    return
 }
 
 gdb_test "" \
 	 "Temporary breakpoint $decimal at $hex: file.*main \\(\\) at .*start-cpp.cc:.*" \
 	 "start"
diff --git a/gdb/testsuite/gdb.base/start.exp b/gdb/testsuite/gdb.base/start.exp
index b747e42efc6a..546926d32262 100644
--- a/gdb/testsuite/gdb.base/start.exp
+++ b/gdb/testsuite/gdb.base/start.exp
@@ -16,20 +16,20 @@ 
 require !use_gdb_stub
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # This is a testcase specifically for the `start' GDB command.  For regular
 # stop-in-main goal in the testcases consider using `runto_main' instead.
 
 # For C programs, "start" should stop in main().
 if { [gdb_start_cmd] < 0 } {
     fail start
-    return -1
+    return
 }
 
 gdb_test "" \
 	 "main \\(\\) at .*start.c.*" \
 	 "start"
diff --git a/gdb/testsuite/gdb.base/starti.exp b/gdb/testsuite/gdb.base/starti.exp
index 302be7aea6ee..ab0cfc2e9378 100644
--- a/gdb/testsuite/gdb.base/starti.exp
+++ b/gdb/testsuite/gdb.base/starti.exp
@@ -15,11 +15,11 @@ 
 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Define a stop hook that outputs the value of 'x'
 
 gdb_test_multiple "define hook-stop" "hook-stop" {
@@ -28,11 +28,11 @@  gdb_test_multiple "define hook-stop" "hook-stop" {
     }
 }
 
 if { [gdb_starti_cmd] < 0 } {
     untested starti
-    return -1
+    return
 }
 
 # The program should stop at the first instruction, so the constructor
 # should not have run yet and 'x' should be 0.
 
diff --git a/gdb/testsuite/gdb.base/startup-with-shell.exp b/gdb/testsuite/gdb.base/startup-with-shell.exp
index b27cdce63d73..6f30841bdb8d 100644
--- a/gdb/testsuite/gdb.base/startup-with-shell.exp
+++ b/gdb/testsuite/gdb.base/startup-with-shell.exp
@@ -25,11 +25,11 @@  require {!is_remote target}
 require {expr {[have_startup_shell] != -1}}
 
 standard_testfile
 
 if { [build_executable "failed to prepare" $testfile $srcfile debug] } {
-    return -1
+    return
 }
 
 set unique_file [standard_output_file "unique-file.unique-extension"]
 set unique_file_dir [standard_output_file ""]
 
diff --git a/gdb/testsuite/gdb.base/step-bt.exp b/gdb/testsuite/gdb.base/step-bt.exp
index 5273234a7515..f7be4c2bec91 100644
--- a/gdb/testsuite/gdb.base/step-bt.exp
+++ b/gdb/testsuite/gdb.base/step-bt.exp
@@ -18,11 +18,11 @@ 
 
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 gdb_test "break *hello" \
 	 "Breakpoint.*at.* file .*$srcfile, line .*" \
 	 "breakpoint at first instruction of hello()"
diff --git a/gdb/testsuite/gdb.base/step-indirect-call-thunk.exp b/gdb/testsuite/gdb.base/step-indirect-call-thunk.exp
index 877a0a61dbb2..30d0e6932a5d 100644
--- a/gdb/testsuite/gdb.base/step-indirect-call-thunk.exp
+++ b/gdb/testsuite/gdb.base/step-indirect-call-thunk.exp
@@ -22,15 +22,15 @@  set cflags "-mindirect-branch=thunk -mfunction-return=thunk"
 if { [gcc_major_version] >= 8 } {
     append cflags " -fcf-protection=none"
 }
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 	[list debug "additional_flags=$cflags"]] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 # Do repeated instruction steps in order to reach TARGET from CURRENT
 #
 #  CURRENT is a string matching the current location
diff --git a/gdb/testsuite/gdb.base/step-into-other-file.exp b/gdb/testsuite/gdb.base/step-into-other-file.exp
index 775ab991d6ef..178224a1bed3 100644
--- a/gdb/testsuite/gdb.base/step-into-other-file.exp
+++ b/gdb/testsuite/gdb.base/step-into-other-file.exp
@@ -21,15 +21,15 @@  set flags {}
 lappend flags debug
 lappend_include_file flags $srcdir/$subdir/$srcfile2
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 	  $flags] == -1 } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test step $srcfile:$decimal\r\n.*
 
 # Regression test for PR32011.
diff --git a/gdb/testsuite/gdb.base/step-line.exp b/gdb/testsuite/gdb.base/step-line.exp
index a1bcc7522e6a..e0a758357384 100644
--- a/gdb/testsuite/gdb.base/step-line.exp
+++ b/gdb/testsuite/gdb.base/step-line.exp
@@ -22,11 +22,11 @@ 
 
 standard_testfile
 set linefile ${testfile}.inp
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
    return 0
 }
diff --git a/gdb/testsuite/gdb.base/step-over-exit.exp b/gdb/testsuite/gdb.base/step-over-exit.exp
index 263c640e876f..427ada57c90d 100644
--- a/gdb/testsuite/gdb.base/step-over-exit.exp
+++ b/gdb/testsuite/gdb.base/step-over-exit.exp
@@ -29,19 +29,19 @@  if { [istarget "i\[34567\]86-*-linux*"] || [istarget "x86_64-*-linux*"] } {
     set syscall_insn "\[ \t\](int|syscall|sysenter)\[ \t\]*"
 } elseif { [istarget "aarch64*-*-linux*"] || [istarget "arm*-*-linux*"] } {
     set syscall_insn "\[ \t\](swi|svc)\[ \t\]"
 } else {
     unsupported "unknown syscall instruction"
-    return -1
+    return
 }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "set follow-fork-mode child"
 gdb_test "set detach-on-fork off"
 
diff --git a/gdb/testsuite/gdb.base/step-over-no-symbols.exp b/gdb/testsuite/gdb.base/step-over-no-symbols.exp
index 18df1786039f..655b7a062d81 100644
--- a/gdb/testsuite/gdb.base/step-over-no-symbols.exp
+++ b/gdb/testsuite/gdb.base/step-over-no-symbols.exp
@@ -17,11 +17,11 @@ 
 # symbols for the main binary.  PR gdb/13858.
 
 standard_testfile start.c
 
 if { [build_executable "failed to build" ${testfile} $srcfile] } {
-    return -1
+    return
 }
 
 # Get the current PC.  MSG is used as test message.
 
 proc get_pc { msg } {
diff --git a/gdb/testsuite/gdb.base/step-over-syscall.exp b/gdb/testsuite/gdb.base/step-over-syscall.exp
index 335736f56850..12eff194efc4 100644
--- a/gdb/testsuite/gdb.base/step-over-syscall.exp
+++ b/gdb/testsuite/gdb.base/step-over-syscall.exp
@@ -36,11 +36,11 @@  if { [istarget "i\[34567\]86-*-linux*"] || [istarget "x86_64-*-linux*"] } {
     }
 
     array set syscall_number {fork "(120|220)" vfork "(190|220)" \
       clone "(120|220)"}
 } else {
-    return -1
+    return
 }
 
 proc_with_prefix check_pc_after_cross_syscall { displaced syscall syscall_insn_next_addr } {
     set syscall_insn_next_addr_found [get_hexadecimal_valueof "\$pc" "0"]
 
@@ -357,11 +357,11 @@  step_over_syscall "vfork"
 step_over_syscall "clone"
 
 set testfile "step-over-fork"
 clean_restart $testfile
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set cond_bp_target 1
 
 set test "set breakpoint condition-evaluation target"
diff --git a/gdb/testsuite/gdb.base/step-resume-infcall.exp b/gdb/testsuite/gdb.base/step-resume-infcall.exp
index 9c7c9fbde65a..90ff43539f3f 100644
--- a/gdb/testsuite/gdb.base/step-resume-infcall.exp
+++ b/gdb/testsuite/gdb.base/step-resume-infcall.exp
@@ -14,23 +14,23 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "step" " in-func .*"
 gdb_test "up" " call-func .*"
 gdb_test_no_output {set $b=$pc}
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint {*$b if cond ()}
 
 set test {print $bpnum}
diff --git a/gdb/testsuite/gdb.base/step-sw-breakpoint-adjust-pc.exp b/gdb/testsuite/gdb.base/step-sw-breakpoint-adjust-pc.exp
index af825c1ffe83..d8cf9da97f71 100644
--- a/gdb/testsuite/gdb.base/step-sw-breakpoint-adjust-pc.exp
+++ b/gdb/testsuite/gdb.base/step-sw-breakpoint-adjust-pc.exp
@@ -20,11 +20,11 @@ 
 # this in non-stop mode, and adjust the PC incorrectly.  PR gdb/12623.
 
 standard_testfile
 
 if {[build_executable "failed to build" ${testfile} ${srcfile} {debug}]} {
-    return -1
+    return
 }
 
 set linenum_for_user_bp [gdb_get_line_number "break for user-bp test here"]
 set linenum_for_step_resume [gdb_get_line_number "break for step-resume test here"]
 
diff --git a/gdb/testsuite/gdb.base/step-symless.exp b/gdb/testsuite/gdb.base/step-symless.exp
index 0dcfec7da5ca..1f4dd88a103e 100644
--- a/gdb/testsuite/gdb.base/step-symless.exp
+++ b/gdb/testsuite/gdb.base/step-symless.exp
@@ -13,11 +13,11 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 if {[build_executable ${testfile}.exp ${testfile} ${srcfile} {nodebug}] == -1} {
-    return -1
+    return
 }
 
 # We need those symbols global to access them from the .S file.
 set test "strip stub symbols"
 set objcopy_program [gdb_find_objcopy]
@@ -31,11 +31,11 @@  if {$result != 0} {
 pass $test
 
 clean_restart $testfile
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint symful
 
 gdb_test "step" "Single stepping until exit.*no line number information.*\r\nBreakpoint \[^\r\n\]* in \\.?symful \\(\\)"
diff --git a/gdb/testsuite/gdb.base/store.exp b/gdb/testsuite/gdb.base/store.exp
index bc8b11760020..d4165baed384 100644
--- a/gdb/testsuite/gdb.base/store.exp
+++ b/gdb/testsuite/gdb.base/store.exp
@@ -17,11 +17,11 @@ 
 
 standard_testfile
 set executable $testfile
 
 if { [prepare_for_testing "failed to prepare" $executable $srcfile] } {
-    return -1
+    return
 }
 
 #
 # set it up at a breakpoint so we can play with the variable values
 #
diff --git a/gdb/testsuite/gdb.base/structs2.exp b/gdb/testsuite/gdb.base/structs2.exp
index 65655c70fb4a..76deeae53839 100644
--- a/gdb/testsuite/gdb.base/structs2.exp
+++ b/gdb/testsuite/gdb.base/structs2.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/structs3.exp b/gdb/testsuite/gdb.base/structs3.exp
index bdcf19a9932b..a7e0ede2e2a0 100644
--- a/gdb/testsuite/gdb.base/structs3.exp
+++ b/gdb/testsuite/gdb.base/structs3.exp
@@ -16,15 +16,15 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" "structs3" "" {debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set vhn "${::valnum_re}"
 
 # Check the real contents.
diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp
index a12f61884798..8b9512e1e4f7 100644
--- a/gdb/testsuite/gdb.base/style.exp
+++ b/gdb/testsuite/gdb.base/style.exp
@@ -21,11 +21,11 @@  load_lib gdb-python.exp
 
 standard_testfile
 
 # Compile the test executable.
 if {[build_executable "failed to build" $testfile $srcfile {debug macros}]} {
-    return -1
+    return
 }
 
 # The tests in this file are run multiple times with GDB's styles
 # disabled one at a time.  This variable is the style that is
 # currently disabled.
diff --git a/gdb/testsuite/gdb.base/symbol-alias.exp b/gdb/testsuite/gdb.base/symbol-alias.exp
index 624422bb2f35..0d9192730f0f 100644
--- a/gdb/testsuite/gdb.base/symbol-alias.exp
+++ b/gdb/testsuite/gdb.base/symbol-alias.exp
@@ -18,11 +18,11 @@  standard_testfile symbol-alias.c symbol-alias2.c
 # Clang versions prior to v15 do not emit debug info for aliases.
 set old_clang [expr {[test_compiler_info {clang-1[0-4]-*-*}] \
 			 || [test_compiler_info {clang-[1-9]-*}]}]
 
 if { [prepare_for_testing "failed to prepare" ${testfile} [list $srcfile $srcfile2]] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.base/symbol-without-target_section.exp b/gdb/testsuite/gdb.base/symbol-without-target_section.exp
index 420f5eeabf04..c61ccebc3162 100644
--- a/gdb/testsuite/gdb.base/symbol-without-target_section.exp
+++ b/gdb/testsuite/gdb.base/symbol-without-target_section.exp
@@ -22,14 +22,14 @@  standard_testfile start.c .c
 set binlibfile ${testfile}.x
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" \
 		  [standard_output_file ${binlibfile}] object {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 if {[build_executable ${testfile}.exp ${testfile} ${srcfile} {debug}] == -1} {
-    return -1
+    return
 }
 clean_restart ${binlibfile}
 
 gdb_test "add-symbol-file [standard_output_file ${testfile}] 0" \
     "Reading symbols from .*" \
diff --git a/gdb/testsuite/gdb.base/symfile-warn.exp b/gdb/testsuite/gdb.base/symfile-warn.exp
index 17f51071cb6d..1dc5e6aee4ad 100644
--- a/gdb/testsuite/gdb.base/symfile-warn.exp
+++ b/gdb/testsuite/gdb.base/symfile-warn.exp
@@ -17,11 +17,11 @@  standard_testfile .c
 set ofile [standard_output_file ${testfile}.o]
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" \
 	 $ofile object {debug}] != ""} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
 
 gdb_test "add-symbol-file $ofile 0" \
diff --git a/gdb/testsuite/gdb.base/symlink-sourcefile.exp b/gdb/testsuite/gdb.base/symlink-sourcefile.exp
index 7870e16acc91..bc2249071eb5 100644
--- a/gdb/testsuite/gdb.base/symlink-sourcefile.exp
+++ b/gdb/testsuite/gdb.base/symlink-sourcefile.exp
@@ -30,15 +30,15 @@  if {[lindex $status 0] != 0} {
     unsupported "$test (host does not support symbolic links)"
     return 0
 }
 
 if {[prepare_for_testing $testfile $testfile $srcfilelink]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Using a line number ensures that the default symtab is used.
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile] message
 gdb_continue_to_breakpoint "run to breakpoint marker"
diff --git a/gdb/testsuite/gdb.base/symtab-search-order.exp b/gdb/testsuite/gdb.base/symtab-search-order.exp
index 5ea8c18e3f3a..9709548b1297 100644
--- a/gdb/testsuite/gdb.base/symtab-search-order.exp
+++ b/gdb/testsuite/gdb.base/symtab-search-order.exp
@@ -34,11 +34,11 @@  if { [prepare_for_testing "prepare" $testfile [list $srcfile $srcfile2] \
 }
 
 gdb_load_shlib $lib1
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # PR 17564
 # Expand something in the shared library,
 # and then try to print static_global in the binary.
diff --git a/gdb/testsuite/gdb.base/term.exp b/gdb/testsuite/gdb.base/term.exp
index 320bf6f496a8..b615d9a410e9 100644
--- a/gdb/testsuite/gdb.base/term.exp
+++ b/gdb/testsuite/gdb.base/term.exp
@@ -15,11 +15,11 @@ 
 
 # Test that GDB saves and restores terminal settings correctly.  Also check
 # the output of the "info terminal" command.
 
 if { [prepare_for_testing "failed to prepare" term term.c] } {
-    return -1
+    return
 }
 
 # Once before running the program.
 gdb_test "info terminal" \
     "No saved terminal information.*" \
diff --git a/gdb/testsuite/gdb.base/thread-bp-multi-loc.exp b/gdb/testsuite/gdb.base/thread-bp-multi-loc.exp
index ce8d6737b92b..91c0f320935b 100644
--- a/gdb/testsuite/gdb.base/thread-bp-multi-loc.exp
+++ b/gdb/testsuite/gdb.base/thread-bp-multi-loc.exp
@@ -18,24 +18,24 @@ 
 # displayed correctly.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 delete_breakpoints
 
 gdb_breakpoint "foo thread 1"
 set bp_number [get_integer_valueof "\$bpnum" 0]
 if { $bp_number == 0 } {
     unresolved "breakpoint not placed correctly"
-    return -1
+    return
 }
 
 set saw_header false
 set saw_cond false
 set loc_count 0
diff --git a/gdb/testsuite/gdb.base/tls-dlobj.exp b/gdb/testsuite/gdb.base/tls-dlobj.exp
index 2e1b50145413..2136af0fe7bc 100644
--- a/gdb/testsuite/gdb.base/tls-dlobj.exp
+++ b/gdb/testsuite/gdb.base/tls-dlobj.exp
@@ -316,33 +316,33 @@  proc do_tests {force_internal_tls} {
 }
 
 # Build shared objects for dlopen:
 if { [gdb_compile_shlib $libsrc $lib1obj [list debug additional_flags=-DN=1]] != "" } {
     untested "failed to compile shared object"
-    return -1
+    return
 }
 if { [gdb_compile_shlib $libsrc $lib2obj [list debug additional_flags=-DN=2]] != "" } {
     untested "failed to compile shared object"
-    return -1
+    return
 }
 if { [gdb_compile_shlib $libsrc $lib3obj [list debug additional_flags=-DN=3]] != "" } {
     untested "failed to compile shared object"
-    return -1
+    return
 }
 if { [gdb_compile_shlib $libsrc $lib4obj [list debug additional_flags=-DN=4]] != "" } {
     untested "failed to compile shared object"
-    return -1
+    return
 }
 
 # Build shared objects to link against main program:
 if { [gdb_compile_shlib $libsrc $lib10obj [list debug additional_flags=-DN=10]] != "" } {
     untested "failed to compile shared object"
-    return -1
+    return
 }
 if { [gdb_compile_shlib $libsrc $lib11obj [list debug additional_flags=-DN=11]] != "" } {
     untested "failed to compile shared object"
-    return -1
+    return
 }
 
 # Use gdb_compile_pthreads to build and link the main program for
 # testing.  It's also possible to run the tests using plain old
 # gdb_compile, but this adds complexity with setting up additional
diff --git a/gdb/testsuite/gdb.base/tls-multiobj.exp b/gdb/testsuite/gdb.base/tls-multiobj.exp
index 56318b934382..c0ad83c1db90 100644
--- a/gdb/testsuite/gdb.base/tls-multiobj.exp
+++ b/gdb/testsuite/gdb.base/tls-multiobj.exp
@@ -165,19 +165,19 @@  proc do_tests {force_internal_tls {do_kfail_tls_access 0}} {
     }
 }
 
 if { [gdb_compile_shlib $lib1src $lib1obj {debug}] != "" } {
     untested "failed to compile shared object"
-    return -1
+    return
 }
 if { [gdb_compile_shlib $lib2src $lib2obj {debug}] != "" } {
     untested "failed to compile shared object"
-    return -1
+    return
 }
 if { [gdb_compile_shlib $lib3src $lib3obj {debug}] != "" } {
     untested "failed to compile shared object"
-    return -1
+    return
 }
 
 # Certain linux target architectures implement support for internal
 # TLS lookup which is used when thread stratum support (via
 # libthread_db) is missing or when the linux-only GDB maintenance
diff --git a/gdb/testsuite/gdb.base/traced-thread.exp b/gdb/testsuite/gdb.base/traced-thread.exp
index 9bf4ea131d1d..b6d354907225 100644
--- a/gdb/testsuite/gdb.base/traced-thread.exp
+++ b/gdb/testsuite/gdb.base/traced-thread.exp
@@ -20,11 +20,11 @@  require {istarget *-linux*}
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {debug pthreads}]} {
-    return -1
+    return
 }
 
 if {![runto "parent_stop"]} {
   return -1
 }
diff --git a/gdb/testsuite/gdb.base/ui-redirect.exp b/gdb/testsuite/gdb.base/ui-redirect.exp
index 5a37f485e74c..c1cb461496b8 100644
--- a/gdb/testsuite/gdb.base/ui-redirect.exp
+++ b/gdb/testsuite/gdb.base/ui-redirect.exp
@@ -15,15 +15,15 @@ 
 
 # Do not run if gdb debug is enabled as it will interfere with log redirect.
 require !gdb_debug_enabled
 
 if { [prepare_for_testing "failed to prepare" ui-redirect start.c] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set test "commands"
 gdb_test_multiple $test $test {
     -re "End with a line saying just \"end\"\\.\r\n>$" {
diff --git a/gdb/testsuite/gdb.base/until-nodebug.exp b/gdb/testsuite/gdb.base/until-nodebug.exp
index e23a0c915da6..5980bc435ced 100644
--- a/gdb/testsuite/gdb.base/until-nodebug.exp
+++ b/gdb/testsuite/gdb.base/until-nodebug.exp
@@ -17,11 +17,11 @@ 
 # until when there is no debug information.
 
 standard_testfile advance.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile nodebug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/until-trailing-insns.exp b/gdb/testsuite/gdb.base/until-trailing-insns.exp
index 531bc46aefa2..86909aa6dc41 100644
--- a/gdb/testsuite/gdb.base/until-trailing-insns.exp
+++ b/gdb/testsuite/gdb.base/until-trailing-insns.exp
@@ -82,11 +82,11 @@  load_lib dwarf.exp
 require dwarf2_support
 
 standard_testfile .c .S
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 set asm_file [standard_output_file $srcfile2]
 Dwarf::assemble $asm_file {
     global srcdir subdir srcfile
@@ -155,15 +155,15 @@  Dwarf::assemble $asm_file {
 
 }
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	[list $srcfile $asm_file] {nodebug} ] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "next" ".* TAG: loop code .*" "inside the loop"
 gdb_test "next" ".* TAG: loop line .*" "ending of loop"
 gdb_test "until" ".* TAG: main return .*" "left loop"
diff --git a/gdb/testsuite/gdb.base/until.exp b/gdb/testsuite/gdb.base/until.exp
index 7c16592fe6ae..58f9174af988 100644
--- a/gdb/testsuite/gdb.base/until.exp
+++ b/gdb/testsuite/gdb.base/until.exp
@@ -15,11 +15,11 @@ 
 
 # until.exp -- Expect script to test 'until' in gdb
 
 set srcfile break.c
 if { [prepare_for_testing "failed to prepare" "until" {break.c break1.c} {debug nowarnings}] } {
-    return -1
+    return
 }
 
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 set bp_location19 [gdb_get_line_number "set breakpoint 19 here"]
 set bp_location20 [gdb_get_line_number "set breakpoint 20 here"]
diff --git a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp.tcl b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp.tcl
index c037ff2071af..471342684aec 100644
--- a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp.tcl
+++ b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp.tcl
@@ -24,11 +24,11 @@ 
 # value, can be calculated correctly.
 
 if {[prepare_for_testing_full "failed to prepare" \
 	 [list ${testfile} $ldflags \
 	      $srcfile $srcfile_flags $srcfile2 $srcfile2_flags]]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/unwindonsignal.exp b/gdb/testsuite/gdb.base/unwindonsignal.exp
index 64f86bfd2820..cd98b9fdd02f 100644
--- a/gdb/testsuite/gdb.base/unwindonsignal.exp
+++ b/gdb/testsuite/gdb.base/unwindonsignal.exp
@@ -21,11 +21,11 @@  require {!target_info exists gdb,nosignals}
 require {!target_info exists gdb,cannot_call_functions}
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/utf8-identifiers.exp b/gdb/testsuite/gdb.base/utf8-identifiers.exp
index 95311b5494af..676cb2904c9e 100644
--- a/gdb/testsuite/gdb.base/utf8-identifiers.exp
+++ b/gdb/testsuite/gdb.base/utf8-identifiers.exp
@@ -31,11 +31,11 @@  standard_testfile
 
 # Enable basic use of UTF-8.  LC_ALL gets reset for each testfile.
 setenv LC_ALL C.UTF-8
 
 if { [prepare_for_testing "failed to prepare" ${testfile} [list $srcfile]] } {
-    return -1
+    return
 }
 
 if {![runto done]} {
     return
 }
@@ -64,11 +64,11 @@  gdb_test_no_output "nosharedlibrary"
 # Tests below are about tab-completion, which doesn't work if readline
 # library isn't used.  Check it first.
 
 if { ![readline_is_used] } {
     untested "no tab completion support without readline"
-    return -1
+    return
 }
 
 # Test linespec completion.
 
 # A unique completion.
diff --git a/gdb/testsuite/gdb.base/valgrind-bt.exp b/gdb/testsuite/gdb.base/valgrind-bt.exp
index dd2b1ed83940..36614427cf9b 100644
--- a/gdb/testsuite/gdb.base/valgrind-bt.exp
+++ b/gdb/testsuite/gdb.base/valgrind-bt.exp
@@ -20,15 +20,15 @@  load_lib valgrind.exp
 
 require {!is_remote target}
 
 standard_testfile .c
 if {[build_executable $testfile.exp $testfile $srcfile {debug}] == -1} {
-    return -1
+    return
 }
 
 if { [vgdb_start] == -1 } {
-    return -1
+    return
 }
 
 set double_free [gdb_get_line_number "double-free"]
 
 gdb_breakpoint "main"
diff --git a/gdb/testsuite/gdb.base/valgrind-disp-step.exp b/gdb/testsuite/gdb.base/valgrind-disp-step.exp
index 13f36837d5e2..2b2d5b5b8e6e 100644
--- a/gdb/testsuite/gdb.base/valgrind-disp-step.exp
+++ b/gdb/testsuite/gdb.base/valgrind-disp-step.exp
@@ -25,15 +25,15 @@  load_lib valgrind.exp
 
 require {!is_remote target}
 
 standard_testfile .c
 if {[build_executable "failed to build" $testfile $srcfile {debug}] == -1} {
-    return -1
+    return
 }
 
 if { [vgdb_start] == -1 } {
-    return -1
+    return
 }
 
 gdb_test_no_output "set displaced-stepping off"
 gdb_breakpoint "main" "breakpoint at main"
 gdb_test "continue" " stop 0 .*" "continue to main"
diff --git a/gdb/testsuite/gdb.base/valgrind-infcall-2.exp b/gdb/testsuite/gdb.base/valgrind-infcall-2.exp
index 28fa2b78022f..77e92ce81f9d 100644
--- a/gdb/testsuite/gdb.base/valgrind-infcall-2.exp
+++ b/gdb/testsuite/gdb.base/valgrind-infcall-2.exp
@@ -36,16 +36,16 @@  load_lib valgrind.exp
 
 require {!is_remote target}
 
 standard_testfile .c
 if {[build_executable $testfile.exp $testfile $srcfile {debug}] == -1} {
-    return -1
+    return
 }
 
 set active_at_startup 0
 if { [vgdb_start $active_at_startup] == -1 } {
-    return -1
+    return
 }
 
 # Determine whether we're at nanosleep.
 gdb_test_multiple "bt 1" "do printf" {
     -re -wrap "nanosleep.*" {
diff --git a/gdb/testsuite/gdb.base/valgrind-infcall.exp b/gdb/testsuite/gdb.base/valgrind-infcall.exp
index 0bd6c837a28c..c39d31819837 100644
--- a/gdb/testsuite/gdb.base/valgrind-infcall.exp
+++ b/gdb/testsuite/gdb.base/valgrind-infcall.exp
@@ -20,15 +20,15 @@  load_lib valgrind.exp
 
 require {!is_remote target}
 
 standard_testfile .c
 if {[build_executable $testfile.exp $testfile $srcfile {debug}] == -1} {
-    return -1
+    return
 }
 
 if { [vgdb_start] == -1 } {
-    return -1
+    return
 }
 
 set continue_count 1
 set loop 1
 while {$loop && $continue_count < 100} {
diff --git a/gdb/testsuite/gdb.base/value-double-free.exp b/gdb/testsuite/gdb.base/value-double-free.exp
index 1b566b5fdd51..277d9bfd096e 100644
--- a/gdb/testsuite/gdb.base/value-double-free.exp
+++ b/gdb/testsuite/gdb.base/value-double-free.exp
@@ -22,15 +22,15 @@ 
 set allow_hw_watchpoint_tests_p [allow_hw_watchpoint_tests]
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Disable hardware watchpoints if necessary.
 if {!$allow_hw_watchpoint_tests_p} {
     gdb_test_no_output "set can-use-hw-watchpoints 0" ""
diff --git a/gdb/testsuite/gdb.base/value-history-unavailable.exp b/gdb/testsuite/gdb.base/value-history-unavailable.exp
index 347271c22118..6e87bee29952 100644
--- a/gdb/testsuite/gdb.base/value-history-unavailable.exp
+++ b/gdb/testsuite/gdb.base/value-history-unavailable.exp
@@ -16,11 +16,11 @@ 
 # Test GDB's value availability ranges.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.base/vdso-warning.exp b/gdb/testsuite/gdb.base/vdso-warning.exp
index 37c481054e9d..4f61554dc68a 100644
--- a/gdb/testsuite/gdb.base/vdso-warning.exp
+++ b/gdb/testsuite/gdb.base/vdso-warning.exp
@@ -18,11 +18,11 @@ 
 #   warning: Could not load shared library symbols for linux-vdso.so.1.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } {
-    return -1
+    return
 }
 
 with_test_prefix "setup" {
     gdb_breakpoint "main"
 
diff --git a/gdb/testsuite/gdb.base/vfork-follow-parent.exp b/gdb/testsuite/gdb.base/vfork-follow-parent.exp
index 9e082ac91e49..40fd11ca8921 100644
--- a/gdb/testsuite/gdb.base/vfork-follow-parent.exp
+++ b/gdb/testsuite/gdb.base/vfork-follow-parent.exp
@@ -27,11 +27,11 @@  set binfile ${testfile}-exit
 set binfile2 ${testfile}-exec
 set binfile3 vforked-prog
 
 if { [build_executable "compile $binfile3" $binfile3 $srcfile2] } {
     untested "failed to compile third test binary"
-    return -1
+    return
 }
 
 if { [is_remote target] } {
     gdb_remote_download target [standard_output_file $binfile3]
 }
diff --git a/gdb/testsuite/gdb.base/vla-datatypes.exp b/gdb/testsuite/gdb.base/vla-datatypes.exp
index ffc25bfa36b5..7453132bc6af 100644
--- a/gdb/testsuite/gdb.base/vla-datatypes.exp
+++ b/gdb/testsuite/gdb.base/vla-datatypes.exp
@@ -14,15 +14,15 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "vlas_filled"]
 gdb_continue_to_breakpoint "vlas_filled"
 
diff --git a/gdb/testsuite/gdb.base/vla-ptr.exp b/gdb/testsuite/gdb.base/vla-ptr.exp
index 74a1dc098163..33e29d5c2d9a 100644
--- a/gdb/testsuite/gdb.base/vla-ptr.exp
+++ b/gdb/testsuite/gdb.base/vla-ptr.exp
@@ -15,15 +15,15 @@ 
 
 standard_testfile
 set using_clang [test_compiler_info clang*]
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set sizeof_int [get_sizeof "int" 4]
 
 # Check that VLA passed to function (pointer) points to the first element.
diff --git a/gdb/testsuite/gdb.base/vla-sideeffect.exp b/gdb/testsuite/gdb.base/vla-sideeffect.exp
index 02a8db210927..34756b36feb9 100644
--- a/gdb/testsuite/gdb.base/vla-sideeffect.exp
+++ b/gdb/testsuite/gdb.base/vla-sideeffect.exp
@@ -17,15 +17,15 @@ 
 # Based on gcc/testsuite/gcc.dg/vla-4.c; vla-15.c
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "vla-filled"]
 gdb_continue_to_breakpoint "vla-filled"
 
diff --git a/gdb/testsuite/gdb.base/vla-struct-fields.exp b/gdb/testsuite/gdb.base/vla-struct-fields.exp
index 9ed7762b8dc1..514ec9edff53 100644
--- a/gdb/testsuite/gdb.base/vla-struct-fields.exp
+++ b/gdb/testsuite/gdb.base/vla-struct-fields.exp
@@ -17,15 +17,15 @@  standard_testfile
 
 # Clang says it will never support variable length arrays in structures.
 require {!test_compiler_info clang*}
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "vlas_filled"]
 gdb_continue_to_breakpoint "vlas_filled"
 
diff --git a/gdb/testsuite/gdb.base/vla-stub.exp b/gdb/testsuite/gdb.base/vla-stub.exp
index 0258a629c9ed..6759a2655bce 100644
--- a/gdb/testsuite/gdb.base/vla-stub.exp
+++ b/gdb/testsuite/gdb.base/vla-stub.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile .c vla-stub-define.c
 if { [prepare_for_testing "failed to prepare for vla-stub.exp" \
       ${testfile} [list ${srcfile} ${srcfile2}]] } {
-    return -1
+    return
 }
 
 gdb_test "p *local_struct.ptr" { = {dynamic_field = 0x0}}
 
 gdb_test "whatis local_struct.here" "type = static_struct_t"
diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp
index f244303a3de1..38b4588d568d 100644
--- a/gdb/testsuite/gdb.base/volatile.exp
+++ b/gdb/testsuite/gdb.base/volatile.exp
@@ -34,11 +34,11 @@ 
 #
 
 # Use the same test program constvars.c.
 
 if { [prepare_for_testing "failed to prepare" volatile constvars.c] } {
-    return -1
+    return
 }
 
 #
 # set it up at a breakpoint so we can play with the variable values
 #
diff --git a/gdb/testsuite/gdb.base/watch-bitfields.exp b/gdb/testsuite/gdb.base/watch-bitfields.exp
index 83f33de12e4a..30e90fecf6b8 100644
--- a/gdb/testsuite/gdb.base/watch-bitfields.exp
+++ b/gdb/testsuite/gdb.base/watch-bitfields.exp
@@ -25,11 +25,11 @@ 
 set allow_hw_watchpoint_tests_p [allow_hw_watchpoint_tests]
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Set a watchpoint watching EXPR.
 proc watch { expr } {
     global decimal
diff --git a/gdb/testsuite/gdb.base/watch-cond-infcall.exp b/gdb/testsuite/gdb.base/watch-cond-infcall.exp
index 32a0632eae14..ed62a39926d3 100644
--- a/gdb/testsuite/gdb.base/watch-cond-infcall.exp
+++ b/gdb/testsuite/gdb.base/watch-cond-infcall.exp
@@ -28,11 +28,11 @@  standard_testfile
 
 require {!target_info exists gdb,cannot_call_functions}
 
 if { [build_executable ${testfile}.exp ${testfile} ${testfile}.c {debug}] } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 proc test_watchpoint { hw } {
     global testfile
 
diff --git a/gdb/testsuite/gdb.base/watch-cond.exp b/gdb/testsuite/gdb.base/watch-cond.exp
index 4b0a93be2075..0d283ad90582 100644
--- a/gdb/testsuite/gdb.base/watch-cond.exp
+++ b/gdb/testsuite/gdb.base/watch-cond.exp
@@ -26,11 +26,11 @@ 
 set allow_hw_watchpoint_tests_p [allow_hw_watchpoint_tests]
 
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 # Disable hardware watchpoints if necessary.
 if {!$allow_hw_watchpoint_tests_p} {
     gdb_test_no_output "set can-use-hw-watchpoints 0" ""
diff --git a/gdb/testsuite/gdb.base/watch-non-mem.exp b/gdb/testsuite/gdb.base/watch-non-mem.exp
index 95591301287b..42dc3c8a80ff 100644
--- a/gdb/testsuite/gdb.base/watch-non-mem.exp
+++ b/gdb/testsuite/gdb.base/watch-non-mem.exp
@@ -18,11 +18,11 @@ 
 #
 
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.base/watch-read.exp b/gdb/testsuite/gdb.base/watch-read.exp
index 49eb787347ec..378bae067752 100644
--- a/gdb/testsuite/gdb.base/watch-read.exp
+++ b/gdb/testsuite/gdb.base/watch-read.exp
@@ -25,11 +25,11 @@ 
 standard_testfile .c
 
 require allow_hw_watchpoint_access_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.base/watch-vfork.exp b/gdb/testsuite/gdb.base/watch-vfork.exp
index 588a94c8218a..6df3a7ddbacc 100644
--- a/gdb/testsuite/gdb.base/watch-vfork.exp
+++ b/gdb/testsuite/gdb.base/watch-vfork.exp
@@ -19,11 +19,11 @@  standard_testfile .c
 
 require allow_fork_tests
 
 if { [build_executable ${testfile}.exp ${testfile} $srcfile {debug}] } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 proc test_watchpoint_across_vfork { hw teststr } {
     global testfile
 
diff --git a/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp b/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
index 546c2b4349f7..823334ec5034 100644
--- a/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp
@@ -19,18 +19,18 @@  standard_testfile .c watchpoint-cond-gone-stripped.c
 # Stepping into a dynamic function trampoline or stepping out of MAIN may work
 # but it is not a reliable FAIL case.
 
 if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile debug $srcfile debug $srcfile2 {}]]} {
-    return -1
+    return
 }
 
 # Problem does not occur otherwise.
 gdb_test_no_output "set can-use-hw-watchpoints 0"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "watchpoint-here"]
 gdb_continue_to_breakpoint "Place to set the watchpoint"
 
diff --git a/gdb/testsuite/gdb.base/watchpoint-delete.exp b/gdb/testsuite/gdb.base/watchpoint-delete.exp
index 91d28d705389..f410298a5ece 100644
--- a/gdb/testsuite/gdb.base/watchpoint-delete.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-delete.exp
@@ -14,18 +14,18 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 # It is more compatible this way.
 gdb_test_no_output "set can-use-hw-watchpoints 0"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Ensure there is a parent frame to create related bp_watchpoint_scope.
 gdb_breakpoint [gdb_get_line_number "break-here"]
 gdb_continue_to_breakpoint "break-here" ".* break-here .*"
diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp b/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp
index e87cc72dfc0e..2962f6964bf1 100644
--- a/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp
@@ -21,11 +21,11 @@  require allow_hw_watchpoint_tests
 require can_spawn_for_attach
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 set test_spawn_id [spawn_wait_for_attach $binfile]
 set testpid [spawn_id_get_pid $test_spawn_id]
 
diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp b/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp
index 60b8ed826404..c8723e9dafe0 100644
--- a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp
@@ -16,15 +16,15 @@ 
 require allow_hw_watchpoint_access_tests
 
 set test watchpoint-hw-hit-once
 set srcfile ${test}.c
 if { [prepare_for_testing "failed to prepare" ${test} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "rwatch watchee"
 
 gdb_breakpoint [gdb_get_line_number "dummy = 2"]
diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.exp b/gdb/testsuite/gdb.base/watchpoint-hw.exp
index af5c6712b93b..537fceec9142 100644
--- a/gdb/testsuite/gdb.base/watchpoint-hw.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-hw.exp
@@ -18,11 +18,11 @@  require !use_gdb_stub
 require allow_hw_watchpoint_tests
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Create the watchpoint before the inferior gets started.  Now the native CPU
 # target is still not active and its `to_can_use_hw_breakpoint' is not
 # installed, therefore only a software watchpoint gets created.
@@ -31,11 +31,11 @@  gdb_test "watch watchee" "atchpoint 1: watchee"
 
 # `runto_main' or `runto main' would delete the watchpoint created above.
 
 if { [gdb_start_cmd] < 0 } {
     fail start
-    return -1
+    return
 }
 gdb_test "" "main .* at .*" "start"
 
 # Check it is really a `hw'-watchpoint.
 gdb_test "info watchpoints" "1 *hw watchpoint .* watchee"
diff --git a/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp b/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp
index 44ede1e46546..85494e5463ed 100644
--- a/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp
@@ -33,11 +33,11 @@  set allow_hw_watchpoint_tests_p [allow_hw_watchpoint_tests]
 # starting the test.
 
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return 0
 }
diff --git a/gdb/testsuite/gdb.base/watchpoint-running.exp b/gdb/testsuite/gdb.base/watchpoint-running.exp
index 95b506a80b61..232ecf5721c2 100644
--- a/gdb/testsuite/gdb.base/watchpoint-running.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-running.exp
@@ -21,11 +21,11 @@ 
 set allow_hw_watchpoint_tests_p [allow_hw_watchpoint_tests]
 
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 # STOP_MODE is either "all-stop" or "non-stop".  HW is true if we are
 # testing hardware watchpoints, and false if we're testing software
 # watchpoints.
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 bf4851ca6c82..53d1064c76de 100644
--- a/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp
@@ -72,11 +72,11 @@  standard_testfile
 
 # No use testing this if we can't use hardware watchpoints.
 require allow_hw_watchpoint_tests
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
     return
 }
diff --git a/gdb/testsuite/gdb.base/watchpoint-unaligned.exp b/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
index 8b929e5de4e6..e19a5c189c50 100644
--- a/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
@@ -19,15 +19,15 @@ 
 
 require allow_hw_watchpoint_tests
 
 standard_testfile
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "start_again"] "Breakpoint $decimal at $hex" "start_again"
 
 set sizes {1 2 4 8}
diff --git a/gdb/testsuite/gdb.base/watchpoints.exp b/gdb/testsuite/gdb.base/watchpoints.exp
index 89a7075f5f5e..969210ad625b 100644
--- a/gdb/testsuite/gdb.base/watchpoints.exp
+++ b/gdb/testsuite/gdb.base/watchpoints.exp
@@ -27,11 +27,11 @@  set allow_hw_watchpoint_tests_p [allow_hw_watchpoint_tests]
 standard_testfile
 
 set wp_set 1
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 with_test_prefix "before inferior start" {
     # Ensure that if we turn off hardware watchpoints and set a watch point
     # before starting the inferior the watchpoint created will not be a
diff --git a/gdb/testsuite/gdb.base/wchar.exp b/gdb/testsuite/gdb.base/wchar.exp
index e05cb4b0b03a..d3cfd09d5de4 100644
--- a/gdb/testsuite/gdb.base/wchar.exp
+++ b/gdb/testsuite/gdb.base/wchar.exp
@@ -14,11 +14,11 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 set bp_location [gdb_get_line_number "START"]
 if {![runto "wchar.c:$bp_location"]} {
   return -1
diff --git a/gdb/testsuite/gdb.base/whatis-exp.exp b/gdb/testsuite/gdb.base/whatis-exp.exp
index 7ee69c3b2463..34652005a4f6 100644
--- a/gdb/testsuite/gdb.base/whatis-exp.exp
+++ b/gdb/testsuite/gdb.base/whatis-exp.exp
@@ -28,11 +28,11 @@ 
 #
 # test running programs
 #
 
 if { [prepare_for_testing "failed to prepare" whatis-exp int-type.c {debug nowarnings}] } {
-    return -1
+    return
 }
 
 #
 # set it up at a breakpoint so we can play with the variable values
 #
diff --git a/gdb/testsuite/gdb.base/with-mf.exp b/gdb/testsuite/gdb.base/with-mf.exp
index 44c331102e6a..5a6e43e85d11 100644
--- a/gdb/testsuite/gdb.base/with-mf.exp
+++ b/gdb/testsuite/gdb.base/with-mf.exp
@@ -19,16 +19,16 @@ 
 
 standard_testfile with-mf-main.c with-mf-inc.c
 
 if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" \
 	 debug]} {
-    return -1
+    return
 }
 
 if { [ensure_gdb_index $binfile] == -1 } {
     untested "error adding gdb index"
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 gdb_test "with language ada -- print g_s" \
diff --git a/gdb/testsuite/gdb.base/with.exp b/gdb/testsuite/gdb.base/with.exp
index c01804d5ea65..101c6dcccf93 100644
--- a/gdb/testsuite/gdb.base/with.exp
+++ b/gdb/testsuite/gdb.base/with.exp
@@ -20,11 +20,11 @@ 
 load_lib completion-support.exp
 
 standard_testfile .c
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 clean_restart $testfile
 
 # Test "maint with".  VALUES is a list of values.  A nested "with" is
diff --git a/gdb/testsuite/gdb.base/write_mem.exp b/gdb/testsuite/gdb.base/write_mem.exp
index 6881211692a3..2c9509dd6583 100644
--- a/gdb/testsuite/gdb.base/write_mem.exp
+++ b/gdb/testsuite/gdb.base/write_mem.exp
@@ -22,11 +22,11 @@  global GDBFLAGS
 standard_testfile
 
 if {[build_executable $testfile.exp $testfile \
 	$srcfile [list debug nowarnings] ] == -1} {
     untested $testfile.exp
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
     set GDBFLAGS "$GDBFLAGS $binfile"
     clean_restart
diff --git a/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp b/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp
index 3087466c82aa..98680e5c5a32 100644
--- a/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp
+++ b/gdb/testsuite/gdb.base/wrong_frame_bt_full.exp
@@ -35,18 +35,18 @@  if {[gdb_compile "${srcdir}/${subdir}/$opaque_testfile.c" \
 if {[gdb_compile \
       [list ${srcdir}/${subdir}/$main_testfile.c $opaque_objfile] \
       [standard_output_file ${main_testfile}] \
       executable {debug}] != ""} {
     untested "failed to build $main_testfile"
-    return -1
+    return
 }
 
 clean_restart ${main_testfile}
 
 if {![runto opaque_routine]} {
     untested "could not run to opaque_routine"
-    return -1
+    return
 }
 
 # Make sure that "bt full" command is capable of displaying MY_TABLE
 # correctly when frame #0 (the frame which does not have any debugging
 # info) is the selected frame.