[binutils-gdb] GDB: testsuite: base: Don't return -1 from top-level (sed)

Thiago Bauermann via Gdb-cvs <[email protected]>
Newsgroups gmane.comp.gdb.cvs
Message-ID <[email protected]>
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=eb92e77cac8507a6a45694b0f782ba848924eee5

commit eb92e77cac8507a6a45694b0f782ba848924eee5
Author: Thiago Jung Bauermann <[email protected]>
Date:   Wed Apr 29 20:04:04 2026 -0300

    GDB: testsuite: base: Don't return -1 from top-level (sed)
    
    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.
    
    Approved-By: Tom Tromey <[email protected]>

Diff:
---
 gdb/testsuite/gdb.base/a2-run.exp                    |  2 +-
 gdb/testsuite/gdb.base/access-mem-running.exp        |  2 +-
 gdb/testsuite/gdb.base/add-symbol-file-attach.exp    |  2 +-
 .../gdb.base/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/testsuite/gdb.base/attach-deleted-exec.exp       |  2 +-
 gdb/testsuite/gdb.base/attach-fail-twice.exp         |  2 +-
 gdb/testsuite/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/testsuite/gdb.base/bg-exec-sigint-bp-cond.exp    |  2 +-
 gdb/testsuite/gdb.base/bg-execution-repeat.exp       |  2 +-
 gdb/testsuite/gdb.base/bitfields.exp                 |  2 +-
 gdb/testsuite/gdb.base/bitfields2.exp                |  2 +-
 gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp   |  2 +-
 .../gdb.base/bp-cmds-execution-x-script.exp          |  2 +-
 gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp       |  2 +-
 gdb/testsuite/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/testsuite/gdb.base/breakpoint-in-ro-region.exp   |  6 +++---
 gdb/testsuite/gdb.base/breakpoint-shadow.exp         |  4 ++--
 gdb/testsuite/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/testsuite/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/testsuite/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/testsuite/gdb.base/condbreak-call-false.exp      |  2 +-
 gdb/testsuite/gdb.base/condbreak.exp                 |  2 +-
 gdb/testsuite/gdb.base/consecutive-step-over.exp     |  2 +-
 gdb/testsuite/gdb.base/consecutive.exp               |  2 +-
 .../gdb.base/continue-after-aborted-step-over.exp    |  2 +-
 gdb/testsuite/gdb.base/coredump-filter-build-id.exp  |  8 ++++----
 gdb/testsuite/gdb.base/coredump-filter.exp           |  8 ++++----
 gdb/testsuite/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/testsuite/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/testsuite/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/testsuite/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/testsuite/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/testsuite/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/testsuite/gdb.base/frame-info-consistent.exp     |  2 +-
 gdb/testsuite/gdb.base/frame-selection.exp           |  2 +-
 gdb/testsuite/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/testsuite/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/testsuite/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/testsuite/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 +-
 .../gdb.base/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 +-
 .../gdb.base/infoline-reloc-main-from-zero.exp       |  2 +-
 gdb/testsuite/gdb.base/infoline.exp                  |  2 +-
 gdb/testsuite/gdb.base/inline-frame-cycle-unwind.exp |  2 +-
 gdb/testsuite/gdb.base/interp.exp                    |  2 +-
 gdb/testsuite/gdb.base/interrupt-a.exp               |  4 ++--
 gdb/testsuite/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/testsuite/gdb.base/jump_multiple_objfiles.exp    |  4 ++--
 gdb/testsuite/gdb.base/kill-after-signal.exp         |  4 ++--
 gdb/testsuite/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/testsuite/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/testsuite/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/testsuite/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 +-
 .../gdb.base/maint-expand-symbols-header-file.exp    |  4 ++--
 .../gdb.base/maint-info-inline-frames-and-blocks.exp |  2 +-
 gdb/testsuite/gdb.base/maint-info-sections.exp       |  4 ++--
 gdb/testsuite/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/testsuite/gdb.base/new-ui-pending-input.exp      |  2 +-
 gdb/testsuite/gdb.base/new-ui.exp                    |  2 +-
 gdb/testsuite/gdb.base/nextoverexit.exp              |  4 ++--
 gdb/testsuite/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 ++--
 .../gdb.base/paginate-after-ctrl-c-running.exp       |  2 +-
 gdb/testsuite/gdb.base/paginate-bg-execution.exp     |  2 +-
 .../gdb.base/paginate-execution-startup.exp          |  2 +-
 gdb/testsuite/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 ++++----
 .../gdb.base/premature-dummy-frame-removal.exp       |  2 +-
 gdb/testsuite/gdb.base/pretty-array.exp              |  4 ++--
 gdb/testsuite/gdb.base/pretty-print.exp              |  4 ++--
 gdb/testsuite/gdb.base/print-internal-string.exp     |  2 +-
 gdb/testsuite/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/testsuite/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/testsuite/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/testsuite/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/testsuite/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/testsuite/gdb.base/signals-state-child.exp       |  8 ++++----
 gdb/testsuite/gdb.base/signals.exp                   |  2 +-
 gdb/testsuite/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/testsuite/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/testsuite/gdb.base/step-indirect-call-thunk.exp  |  4 ++--
 gdb/testsuite/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/testsuite/gdb.base/step-over-no-symbols.exp      |  2 +-
 gdb/testsuite/gdb.base/step-over-syscall.exp         |  4 ++--
 gdb/testsuite/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 +-
 .../gdb.base/symbol-without-target_section.exp       |  4 ++--
 gdb/testsuite/gdb.base/symfile-warn.exp              |  2 +-
 gdb/testsuite/gdb.base/symlink-sourcefile.exp        |  4 ++--
 gdb/testsuite/gdb.base/symtab-search-order.exp       |  2 +-
 gdb/testsuite/gdb.base/term.exp                      |  2 +-
 gdb/testsuite/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/testsuite/gdb.base/until-trailing-insns.exp      |  6 +++---
 gdb/testsuite/gdb.base/until.exp                     |  2 +-
 gdb/testsuite/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/testsuite/gdb.base/value-history-unavailable.exp |  2 +-
 gdb/testsuite/gdb.base/vdso-warning.exp              |  2 +-
 gdb/testsuite/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/testsuite/gdb.base/watchpoint-cond-gone.exp      |  4 ++--
 gdb/testsuite/gdb.base/watchpoint-delete.exp         |  4 ++--
 gdb/testsuite/gdb.base/watchpoint-hw-attach.exp      |  2 +-
 gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp    |  4 ++--
 gdb/testsuite/gdb.base/watchpoint-hw.exp             |  4 ++--
 gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp     |  2 +-
 gdb/testsuite/gdb.base/watchpoint-running.exp        |  2 +-
 .../gdb.base/watchpoint-stops-at-right-insn.exp      |  2 +-
 gdb/testsuite/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/testsuite/gdb.base/wrong_frame_bt_full.exp       |  4 ++--
 421 files changed, 648 insertions(+), 648 deletions(-)

diff --git a/gdb/testsuite/gdb.base/a2-run.exp b/gdb/testsuite/gdb.base/a2-run.exp
index c5df2cce469..725f8fac534 100644
--- a/gdb/testsuite/gdb.base/a2-run.exp
+++ b/gdb/testsuite/gdb.base/a2-run.exp
@@ -31,7 +31,7 @@ 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.
diff --git a/gdb/testsuite/gdb.base/access-mem-running.exp b/gdb/testsuite/gdb.base/access-mem-running.exp
index 7a5468d5307..11dea64a633 100644
--- a/gdb/testsuite/gdb.base/access-mem-running.exp
+++ b/gdb/testsuite/gdb.base/access-mem-running.exp
@@ -18,7 +18,7 @@
 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
diff --git a/gdb/testsuite/gdb.base/add-symbol-file-attach.exp b/gdb/testsuite/gdb.base/add-symbol-file-attach.exp
index 44faa8dbd3c..b76c4d588d9 100644
--- a/gdb/testsuite/gdb.base/add-symbol-file-attach.exp
+++ b/gdb/testsuite/gdb.base/add-symbol-file-attach.exp
@@ -36,7 +36,7 @@ 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
diff --git a/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp b/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp
index 85fd20ae698..102c68bf9f5 100644
--- a/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp
+++ b/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp
@@ -22,7 +22,7 @@ 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"]
diff --git a/gdb/testsuite/gdb.base/advance.exp b/gdb/testsuite/gdb.base/advance.exp
index dda32c05c83..fe05dd3a3c3 100644
--- a/gdb/testsuite/gdb.base/advance.exp
+++ b/gdb/testsuite/gdb.base/advance.exp
@@ -18,7 +18,7 @@
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/all-bin.exp b/gdb/testsuite/gdb.base/all-bin.exp
index 9c8345218d1..12b530be77d 100644
--- a/gdb/testsuite/gdb.base/all-bin.exp
+++ b/gdb/testsuite/gdb.base/all-bin.exp
@@ -30,7 +30,7 @@
 standard_testfile all-types.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/annota-input-while-running.exp b/gdb/testsuite/gdb.base/annota-input-while-running.exp
index a1908d44960..747175f0ab5 100644
--- a/gdb/testsuite/gdb.base/annota-input-while-running.exp
+++ b/gdb/testsuite/gdb.base/annota-input-while-running.exp
@@ -19,7 +19,7 @@
 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,
diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
index d8c8abcbf56..35eaf26103e 100644
--- a/gdb/testsuite/gdb.base/annota1.exp
+++ b/gdb/testsuite/gdb.base/annota1.exp
@@ -35,7 +35,7 @@ set breakpoints_invalid "\r\n\032\032breakpoints-invalid\r\n"
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
index 6824e4d7098..8a69350f1d5 100644
--- a/gdb/testsuite/gdb.base/annota3.exp
+++ b/gdb/testsuite/gdb.base/annota3.exp
@@ -29,7 +29,7 @@ require target_can_use_run_cmd
 standard_testfile
 
 if  { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.base/annotate-symlink.exp b/gdb/testsuite/gdb.base/annotate-symlink.exp
index acf4b540e80..9d6f8fe3a68 100644
--- a/gdb/testsuite/gdb.base/annotate-symlink.exp
+++ b/gdb/testsuite/gdb.base/annotate-symlink.exp
@@ -26,19 +26,19 @@ 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
diff --git a/gdb/testsuite/gdb.base/anon.exp b/gdb/testsuite/gdb.base/anon.exp
index 700744e6631..6a077aa267c 100644
--- a/gdb/testsuite/gdb.base/anon.exp
+++ b/gdb/testsuite/gdb.base/anon.exp
@@ -17,7 +17,7 @@
 standard_testfile .c
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/args.exp b/gdb/testsuite/gdb.base/args.exp
index bd10c90b6cd..d2d5a601b1e 100644
--- a/gdb/testsuite/gdb.base/args.exp
+++ b/gdb/testsuite/gdb.base/args.exp
@@ -27,7 +27,7 @@ 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
diff --git a/gdb/testsuite/gdb.base/argv0-symlink.exp b/gdb/testsuite/gdb.base/argv0-symlink.exp
index 3ddc1f7356d..6b05bba205d 100644
--- a/gdb/testsuite/gdb.base/argv0-symlink.exp
+++ b/gdb/testsuite/gdb.base/argv0-symlink.exp
@@ -29,7 +29,7 @@ standard_testfile
 set has_argv0 [gdb_has_argv0]
 
 if { [build_executable ${testfile}.exp ${testfile} ${srcfile}] == -1 } {
-    return -1
+    return
 }
 
 with_test_prefix "file symlink" {
diff --git a/gdb/testsuite/gdb.base/arithmet.exp b/gdb/testsuite/gdb.base/arithmet.exp
index 2d03a62c530..2911d70afdb 100644
--- a/gdb/testsuite/gdb.base/arithmet.exp
+++ b/gdb/testsuite/gdb.base/arithmet.exp
@@ -29,7 +29,7 @@
 standard_testfile int-type.c
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings}]} {
-    return -1
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.base/array-indices.exp.tcl b/gdb/testsuite/gdb.base/array-indices.exp.tcl
index 8f3c0ad03d4..82f1d291899 100644
--- a/gdb/testsuite/gdb.base/array-indices.exp.tcl
+++ b/gdb/testsuite/gdb.base/array-indices.exp.tcl
@@ -19,7 +19,7 @@ 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"
diff --git a/gdb/testsuite/gdb.base/array-repeat.exp.tcl b/gdb/testsuite/gdb.base/array-repeat.exp.tcl
index d10d441325b..e4c19ac205c 100644
--- a/gdb/testsuite/gdb.base/array-repeat.exp.tcl
+++ b/gdb/testsuite/gdb.base/array-repeat.exp.tcl
@@ -19,7 +19,7 @@ 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]} {
diff --git a/gdb/testsuite/gdb.base/asmlabel.exp b/gdb/testsuite/gdb.base/asmlabel.exp
index 163ef2dc5c8..15f3695d796 100644
--- a/gdb/testsuite/gdb.base/asmlabel.exp
+++ b/gdb/testsuite/gdb.base/asmlabel.exp
@@ -34,7 +34,7 @@
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/async.exp b/gdb/testsuite/gdb.base/async.exp
index c9318b9b248..a3b40882f9b 100644
--- a/gdb/testsuite/gdb.base/async.exp
+++ b/gdb/testsuite/gdb.base/async.exp
@@ -21,7 +21,7 @@
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/attach-deleted-exec.exp b/gdb/testsuite/gdb.base/attach-deleted-exec.exp
index 7bd8db07ca4..61ee8647c9c 100644
--- a/gdb/testsuite/gdb.base/attach-deleted-exec.exp
+++ b/gdb/testsuite/gdb.base/attach-deleted-exec.exp
@@ -23,7 +23,7 @@ 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]
diff --git a/gdb/testsuite/gdb.base/attach-fail-twice.exp b/gdb/testsuite/gdb.base/attach-fail-twice.exp
index 226ade56f7d..b3a40ca9a7d 100644
--- a/gdb/testsuite/gdb.base/attach-fail-twice.exp
+++ b/gdb/testsuite/gdb.base/attach-fail-twice.exp
@@ -20,7 +20,7 @@ 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]
diff --git a/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp b/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp
index 3a9730d99c7..ded09db5d13 100644
--- a/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp
+++ b/gdb/testsuite/gdb.base/attach-non-pgrp-leader.exp
@@ -23,7 +23,7 @@ require can_spawn_for_attach
 standard_testfile
 
 if { [build_executable ${testfile}.exp ${testfile} $srcfile {debug}] == -1 } {
-    return -1
+    return
 }
 
 proc do_test {} {
diff --git a/gdb/testsuite/gdb.base/attach-pie-misread.exp b/gdb/testsuite/gdb.base/attach-pie-misread.exp
index be10db7e3a1..a8002119d96 100644
--- a/gdb/testsuite/gdb.base/attach-pie-misread.exp
+++ b/gdb/testsuite/gdb.base/attach-pie-misread.exp
@@ -26,7 +26,7 @@ set executable $testfile
 
 if {[build_executable_own_libs ${testfile}.exp $executable $srcfile \
 	 {pie}] == ""} {
-    return -1
+    return
 }
 
 # Program Headers:
@@ -110,7 +110,7 @@ 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"]
diff --git a/gdb/testsuite/gdb.base/attach-pie-noexec.exp b/gdb/testsuite/gdb.base/attach-pie-noexec.exp
index ab613d2543a..54a4b0bffae 100644
--- a/gdb/testsuite/gdb.base/attach-pie-noexec.exp
+++ b/gdb/testsuite/gdb.base/attach-pie-noexec.exp
@@ -19,7 +19,7 @@ standard_testfile .c
 set executable ${testfile}
 
 if { [prepare_for_testing "failed to prepare" $executable "" [list debug pie]] } {
-    return -1
+    return
 }
 
 set arch ""
diff --git a/gdb/testsuite/gdb.base/attach-twice.exp b/gdb/testsuite/gdb.base/attach-twice.exp
index 96292d12818..a3677f2fad9 100644
--- a/gdb/testsuite/gdb.base/attach-twice.exp
+++ b/gdb/testsuite/gdb.base/attach-twice.exp
@@ -19,7 +19,7 @@ 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
diff --git a/gdb/testsuite/gdb.base/attach-wait-input.exp b/gdb/testsuite/gdb.base/attach-wait-input.exp
index f7651abdcfd..68979b3c9f9 100644
--- a/gdb/testsuite/gdb.base/attach-wait-input.exp
+++ b/gdb/testsuite/gdb.base/attach-wait-input.exp
@@ -34,7 +34,7 @@ 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.
diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp
index a4e7d72ef94..1cb716d7130 100644
--- a/gdb/testsuite/gdb.base/attach.exp
+++ b/gdb/testsuite/gdb.base/attach.exp
@@ -30,21 +30,21 @@ remote_exec build "rm -f ${binfile} ${binfile2} ${binfile3}"
 #
 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
diff --git a/gdb/testsuite/gdb.base/auto-connect-native-target.exp b/gdb/testsuite/gdb.base/auto-connect-native-target.exp
index 26434396cc6..4529d68e16c 100644
--- a/gdb/testsuite/gdb.base/auto-connect-native-target.exp
+++ b/gdb/testsuite/gdb.base/auto-connect-native-target.exp
@@ -19,7 +19,7 @@
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 require have_native_target
diff --git a/gdb/testsuite/gdb.base/auto-load.exp b/gdb/testsuite/gdb.base/auto-load.exp
index c890117bd95..0b974d43d6d 100644
--- a/gdb/testsuite/gdb.base/auto-load.exp
+++ b/gdb/testsuite/gdb.base/auto-load.exp
@@ -25,7 +25,7 @@ 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}"
diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
index ec0172c88bb..79e897078e5 100644
--- a/gdb/testsuite/gdb.base/auxv.exp
+++ b/gdb/testsuite/gdb.base/auxv.exp
@@ -30,7 +30,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
      && [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.
diff --git a/gdb/testsuite/gdb.base/backtrace.exp b/gdb/testsuite/gdb.base/backtrace.exp
index 00e4681b93a..612dd2ad6a8 100644
--- a/gdb/testsuite/gdb.base/backtrace.exp
+++ b/gdb/testsuite/gdb.base/backtrace.exp
@@ -18,7 +18,7 @@
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/bang.exp b/gdb/testsuite/gdb.base/bang.exp
index d6d7adf9d8e..8a341d95fe5 100644
--- a/gdb/testsuite/gdb.base/bang.exp
+++ b/gdb/testsuite/gdb.base/bang.exp
@@ -20,7 +20,7 @@ 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.
diff --git a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
index 6587e71fd7e..2aae194e118 100644
--- a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
+++ b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
@@ -19,7 +19,7 @@
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug] == -1} {
-    return -1
+    return
 }
 
 set file_arg $binfile
diff --git a/gdb/testsuite/gdb.base/bfd-errors.exp b/gdb/testsuite/gdb.base/bfd-errors.exp
index 93d108cc148..d4e12f78d99 100644
--- a/gdb/testsuite/gdb.base/bfd-errors.exp
+++ b/gdb/testsuite/gdb.base/bfd-errors.exp
@@ -57,7 +57,7 @@ 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
@@ -71,7 +71,7 @@ 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.
@@ -93,7 +93,7 @@ if { [catch {exec $objcopy_program \
 		 ${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
@@ -144,7 +144,7 @@ if { [catch {exec $objcopy_program \
 		 ${binfile_lib}} output] } {
     untested "failed objcopy update-section"
     verbose -log "objcopy output: $output"
-    return -1
+    return
 }
 
 clean_restart
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 43ef98e16da..44b84b3755d 100644
--- a/gdb/testsuite/gdb.base/bg-exec-sigint-bp-cond.exp
+++ b/gdb/testsuite/gdb.base/bg-exec-sigint-bp-cond.exp
@@ -23,7 +23,7 @@ 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
diff --git a/gdb/testsuite/gdb.base/bg-execution-repeat.exp b/gdb/testsuite/gdb.base/bg-execution-repeat.exp
index 7567a0fbba5..48d650c0253 100644
--- a/gdb/testsuite/gdb.base/bg-execution-repeat.exp
+++ b/gdb/testsuite/gdb.base/bg-execution-repeat.exp
@@ -20,7 +20,7 @@
 standard_testfile
 
 if { [build_executable "failed to prepare" ${testfile} $srcfile] } {
-    return -1
+    return
 }
 
 set linenum [gdb_get_line_number "set break here"]
diff --git a/gdb/testsuite/gdb.base/bitfields.exp b/gdb/testsuite/gdb.base/bitfields.exp
index 6f4ace22371..8ec8e00393c 100644
--- a/gdb/testsuite/gdb.base/bitfields.exp
+++ b/gdb/testsuite/gdb.base/bitfields.exp
@@ -19,7 +19,7 @@
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/bitfields2.exp b/gdb/testsuite/gdb.base/bitfields2.exp
index 0f86a56db97..dac6a32fc9f 100644
--- a/gdb/testsuite/gdb.base/bitfields2.exp
+++ b/gdb/testsuite/gdb.base/bitfields2.exp
@@ -27,7 +27,7 @@ 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 4163c4c32b3..368507b2409 100644
--- a/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp
+++ b/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp
@@ -27,7 +27,7 @@ require {!target_info exists gdb,nointerrupts}
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # See intro.
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 491f1e2609f..7204a3736c0 100644
--- a/gdb/testsuite/gdb.base/bp-cmds-execution-x-script.exp
+++ b/gdb/testsuite/gdb.base/bp-cmds-execution-x-script.exp
@@ -20,7 +20,7 @@
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 set x_file ${srcdir}/${subdir}/$testfile.gdb
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 698c85c3e40..95c2811a3e0 100644
--- a/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp
+++ b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp
@@ -22,7 +22,7 @@
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 set script_file $srcdir/$subdir/$testfile.gdb
diff --git a/gdb/testsuite/gdb.base/bp-cmds-sourced-script.exp b/gdb/testsuite/gdb.base/bp-cmds-sourced-script.exp
index e12016f2fc5..2fa46d5bc09 100644
--- a/gdb/testsuite/gdb.base/bp-cmds-sourced-script.exp
+++ b/gdb/testsuite/gdb.base/bp-cmds-sourced-script.exp
@@ -19,7 +19,7 @@
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 set script_file ${srcdir}/${subdir}/$testfile.gdb
diff --git a/gdb/testsuite/gdb.base/bp-cond-failure.exp b/gdb/testsuite/gdb.base/bp-cond-failure.exp
index bde1eab21bd..f6ca85027e4 100644
--- a/gdb/testsuite/gdb.base/bp-cond-failure.exp
+++ b/gdb/testsuite/gdb.base/bp-cond-failure.exp
@@ -36,7 +36,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 # '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.
diff --git a/gdb/testsuite/gdb.base/bp-permanent.exp b/gdb/testsuite/gdb.base/bp-permanent.exp
index eb716cac6b5..dac54fadef1 100644
--- a/gdb/testsuite/gdb.base/bp-permanent.exp
+++ b/gdb/testsuite/gdb.base/bp-permanent.exp
@@ -25,7 +25,7 @@ if { ![target_info exists gdb,nosignals] } {
 }
 
 if {[build_executable "failed to prepare" $testfile $srcfile $options]} {
-    return -1
+    return
 }
 
 set line_bp [gdb_get_line_number "write permanent bp"]
diff --git a/gdb/testsuite/gdb.base/branch-to-self.exp b/gdb/testsuite/gdb.base/branch-to-self.exp
index 03758ebb942..ffd15780d72 100644
--- a/gdb/testsuite/gdb.base/branch-to-self.exp
+++ b/gdb/testsuite/gdb.base/branch-to-self.exp
@@ -20,7 +20,7 @@ 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" {
diff --git a/gdb/testsuite/gdb.base/break-always.exp b/gdb/testsuite/gdb.base/break-always.exp
index 050eac05942..f2eb1a3ba8b 100644
--- a/gdb/testsuite/gdb.base/break-always.exp
+++ b/gdb/testsuite/gdb.base/break-always.exp
@@ -18,7 +18,7 @@
 # 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]
diff --git a/gdb/testsuite/gdb.base/break-caller-line.exp b/gdb/testsuite/gdb.base/break-caller-line.exp
index 0bdda52caab..7fdef95cc60 100644
--- a/gdb/testsuite/gdb.base/break-caller-line.exp
+++ b/gdb/testsuite/gdb.base/break-caller-line.exp
@@ -16,7 +16,7 @@
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 if {![runto callee]} {
diff --git a/gdb/testsuite/gdb.base/break-entry.exp b/gdb/testsuite/gdb.base/break-entry.exp
index 2b51c822c0c..2629d99c7ef 100644
--- a/gdb/testsuite/gdb.base/break-entry.exp
+++ b/gdb/testsuite/gdb.base/break-entry.exp
@@ -30,7 +30,7 @@ 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"
diff --git a/gdb/testsuite/gdb.base/break-include.exp b/gdb/testsuite/gdb.base/break-include.exp
index d9b0a6b6441..5a66dbf1fce 100644
--- a/gdb/testsuite/gdb.base/break-include.exp
+++ b/gdb/testsuite/gdb.base/break-include.exp
@@ -18,7 +18,7 @@
 standard_testfile
 
 if { [prepare_for_testing ${testfile}.exp $testfile] } {
-    return -1
+    return
 }
 
 set bp_line [gdb_get_line_number "break here" ${testfile}.c]
diff --git a/gdb/testsuite/gdb.base/break-inline.exp b/gdb/testsuite/gdb.base/break-inline.exp
index 99f55f64f83..057dd3b03b9 100644
--- a/gdb/testsuite/gdb.base/break-inline.exp
+++ b/gdb/testsuite/gdb.base/break-inline.exp
@@ -15,7 +15,7 @@
 
 
 if { [prepare_for_testing "failed to prepare" "break-inline" {} {debug nowarnings optimize=-O2}] } {
-    return -1
+    return
 }
 
 gdb_breakpoint "main" "temporary"
diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp
index 2b9a66d9aa1..527eece5d86 100644
--- a/gdb/testsuite/gdb.base/break-interp.exp
+++ b/gdb/testsuite/gdb.base/break-interp.exp
@@ -31,11 +31,11 @@ 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
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 face6205da7..b0a22962bba 100644
--- a/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp
+++ b/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp
@@ -21,7 +21,7 @@
 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
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 780b226a373..f430c51f946 100644
--- a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp
+++ b/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp
@@ -31,7 +31,7 @@ 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
diff --git a/gdb/testsuite/gdb.base/break-probes.exp b/gdb/testsuite/gdb.base/break-probes.exp
index 81ceb99d983..12a3c55b081 100644
--- a/gdb/testsuite/gdb.base/break-probes.exp
+++ b/gdb/testsuite/gdb.base/break-probes.exp
@@ -23,14 +23,14 @@ 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
@@ -57,7 +57,7 @@ gdb_test_multiple "p /x \$pc" "" {
 }
 if { $pc == "" } {
     unsupported "Couldn't get $pc"
-    return -1
+    return
 }
 regsub "0x0*" $pc "" pc
 
@@ -72,7 +72,7 @@ gdb_test_multiple "info probes stap rtld" "" {
 
 if { ! $using_probes } {
     unsupported "probes not present on this system"
-    return -1
+    return
 }
 
 set sysroot ""
diff --git a/gdb/testsuite/gdb.base/break-unload-file.exp b/gdb/testsuite/gdb.base/break-unload-file.exp
index 63e0c9462a1..1b7e8b0a5b0 100644
--- a/gdb/testsuite/gdb.base/break-unload-file.exp
+++ b/gdb/testsuite/gdb.base/break-unload-file.exp
@@ -19,7 +19,7 @@
 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
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index d5f92e469ac..2f5fa3d8e59 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -16,7 +16,7 @@
 # This file was written by Rob Savoye. ([email protected])
 
 if { [build_executable "failed to prepare" "break" {break.c break1.c} {debug nowarnings}] } {
-    return -1
+    return
 }
 set srcfile break.c
 set srcfile1 break1.c
@@ -805,7 +805,7 @@ test_next_with_recursion
 # 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 {} {
diff --git a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp b/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp
index 2ab0354ee8c..b7ae91155d4 100644
--- a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp
+++ b/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp
@@ -22,11 +22,11 @@ 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.
@@ -141,7 +141,7 @@ 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'.
diff --git a/gdb/testsuite/gdb.base/breakpoint-shadow.exp b/gdb/testsuite/gdb.base/breakpoint-shadow.exp
index 9d270e8b148..1be637848eb 100644
--- a/gdb/testsuite/gdb.base/breakpoint-shadow.exp
+++ b/gdb/testsuite/gdb.base/breakpoint-shadow.exp
@@ -16,12 +16,12 @@
 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
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 a710b9c5908..a9a1db344d2 100644
--- a/gdb/testsuite/gdb.base/bt-on-error-and-warning.exp
+++ b/gdb/testsuite/gdb.base/bt-on-error-and-warning.exp
@@ -20,13 +20,13 @@
 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
diff --git a/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp b/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp
index ae9463f2369..9bf5f09c566 100644
--- a/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp
+++ b/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp
@@ -26,13 +26,13 @@ standard_testfile
 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
diff --git a/gdb/testsuite/gdb.base/bt-selected-frame.exp b/gdb/testsuite/gdb.base/bt-selected-frame.exp
index f6c34b1a181..0bd1024e987 100644
--- a/gdb/testsuite/gdb.base/bt-selected-frame.exp
+++ b/gdb/testsuite/gdb.base/bt-selected-frame.exp
@@ -18,7 +18,7 @@
 standard_testfile
 
 if { [build_executable "failed to prepare" $testfile $srcfile debug] } {
-    return -1
+    return
 }
 
 proc check_selected_frame_after_bt { bt_cmd stack_pattern } {
diff --git a/gdb/testsuite/gdb.base/build-id-seqno.exp b/gdb/testsuite/gdb.base/build-id-seqno.exp
index 907c4b74caf..68ac4208f1d 100644
--- a/gdb/testsuite/gdb.base/build-id-seqno.exp
+++ b/gdb/testsuite/gdb.base/build-id-seqno.exp
@@ -31,12 +31,12 @@ 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.
diff --git a/gdb/testsuite/gdb.base/c-linkage-name.exp b/gdb/testsuite/gdb.base/c-linkage-name.exp
index f0c0f6e87ec..70115709e3d 100644
--- a/gdb/testsuite/gdb.base/c-linkage-name.exp
+++ b/gdb/testsuite/gdb.base/c-linkage-name.exp
@@ -22,7 +22,7 @@ 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
diff --git a/gdb/testsuite/gdb.base/cached-source-file.exp b/gdb/testsuite/gdb.base/cached-source-file.exp
index 19b62a4a376..ec523b29830 100644
--- a/gdb/testsuite/gdb.base/cached-source-file.exp
+++ b/gdb/testsuite/gdb.base/cached-source-file.exp
@@ -26,7 +26,7 @@ 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
@@ -37,7 +37,7 @@ 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.
@@ -79,7 +79,7 @@ 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
diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp
index 9337c2433c9..0f8d65d2eaa 100644
--- a/gdb/testsuite/gdb.base/call-ar-st.exp
+++ b/gdb/testsuite/gdb.base/call-ar-st.exp
@@ -33,7 +33,7 @@ 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
 }
 
 
diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp
index dff0e95be11..d9d011ed811 100644
--- a/gdb/testsuite/gdb.base/call-strs.exp
+++ b/gdb/testsuite/gdb.base/call-strs.exp
@@ -34,7 +34,7 @@ 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"
diff --git a/gdb/testsuite/gdb.base/cast-call.exp b/gdb/testsuite/gdb.base/cast-call.exp
index de2f77da19c..9f6d526f6a0 100644
--- a/gdb/testsuite/gdb.base/cast-call.exp
+++ b/gdb/testsuite/gdb.base/cast-call.exp
@@ -21,11 +21,11 @@ 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"]
diff --git a/gdb/testsuite/gdb.base/cast-indirection.exp b/gdb/testsuite/gdb.base/cast-indirection.exp
index c446a54021b..193c02a6625 100644
--- a/gdb/testsuite/gdb.base/cast-indirection.exp
+++ b/gdb/testsuite/gdb.base/cast-indirection.exp
@@ -19,11 +19,11 @@ 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 ()" \
diff --git a/gdb/testsuite/gdb.base/catch-fork-static.exp b/gdb/testsuite/gdb.base/catch-fork-static.exp
index cad0cf88532..1b4a6b86008 100644
--- a/gdb/testsuite/gdb.base/catch-fork-static.exp
+++ b/gdb/testsuite/gdb.base/catch-fork-static.exp
@@ -28,7 +28,7 @@ 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\\)"
diff --git a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp
index 1fa567ad3ca..21f0e9bc98c 100644
--- a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp
+++ b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp
@@ -33,11 +33,11 @@ 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" \
diff --git a/gdb/testsuite/gdb.base/catch-load.exp b/gdb/testsuite/gdb.base/catch-load.exp
index dbf45941f5e..eac42ba9f0a 100644
--- a/gdb/testsuite/gdb.base/catch-load.exp
+++ b/gdb/testsuite/gdb.base/catch-load.exp
@@ -18,7 +18,7 @@ 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
@@ -27,7 +27,7 @@ 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.
diff --git a/gdb/testsuite/gdb.base/catch-signal-fork.exp b/gdb/testsuite/gdb.base/catch-signal-fork.exp
index 2ed6929848d..fd872ecb318 100644
--- a/gdb/testsuite/gdb.base/catch-signal-fork.exp
+++ b/gdb/testsuite/gdb.base/catch-signal-fork.exp
@@ -19,11 +19,11 @@ 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"
diff --git a/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp b/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp
index 0cca484dd57..dc0e77076df 100644
--- a/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp
+++ b/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp
@@ -32,11 +32,11 @@ 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"]
diff --git a/gdb/testsuite/gdb.base/catch-signal.exp b/gdb/testsuite/gdb.base/catch-signal.exp
index 7b46d8bbe38..6da1b6aeda7 100644
--- a/gdb/testsuite/gdb.base/catch-signal.exp
+++ b/gdb/testsuite/gdb.base/catch-signal.exp
@@ -18,7 +18,7 @@ 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} {
diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp
index 31a42e33b5f..673fca4a998 100644
--- a/gdb/testsuite/gdb.base/catch-syscall.exp
+++ b/gdb/testsuite/gdb.base/catch-syscall.exp
@@ -795,7 +795,7 @@ proc setup_all_syscalls {} {
 }
 
 if { ![setup_all_syscalls] } {
-    return -1
+    return
 }
 
 # Fill all the syscalls numbers before starting anything.
diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
index f7ee7a76bb7..13e874ec955 100644
--- a/gdb/testsuite/gdb.base/charset.exp
+++ b/gdb/testsuite/gdb.base/charset.exp
@@ -24,7 +24,7 @@
 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
@@ -158,7 +158,7 @@ gdb_expect {
 # is pointless.
 if {[llength [array names charsets]] < 3} {
     untested "fewer than 3 charsets"
-    return -1
+    return
 }
 
 send_gdb "set target-charset\n"
diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
index b8b44d8f874..c64c5fa3135 100644
--- a/gdb/testsuite/gdb.base/commands.exp
+++ b/gdb/testsuite/gdb.base/commands.exp
@@ -33,7 +33,7 @@ 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
diff --git a/gdb/testsuite/gdb.base/compare-sections.exp b/gdb/testsuite/gdb.base/compare-sections.exp
index 56f0b2a6ca8..f647cc5a849 100644
--- a/gdb/testsuite/gdb.base/compare-sections.exp
+++ b/gdb/testsuite/gdb.base/compare-sections.exp
@@ -18,7 +18,7 @@
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} {
-    return -1
+    return
 }
 
 set is_pie [exec_is_pie $binfile]
diff --git a/gdb/testsuite/gdb.base/complete-empty.exp b/gdb/testsuite/gdb.base/complete-empty.exp
index 7a77224857c..295f44591ad 100644
--- a/gdb/testsuite/gdb.base/complete-empty.exp
+++ b/gdb/testsuite/gdb.base/complete-empty.exp
@@ -25,7 +25,7 @@ gdb_start
 
 if { ![readline_is_used] } {
     untested "no tab completion support without readline"
-    return -1
+    return
 }
 
 # Start of tests.
diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index 4469f0dbbc3..e7407e75ee0 100644
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -54,7 +54,7 @@ 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]} {
@@ -165,7 +165,7 @@ gdb_assert {$all_regs eq $completed_regs} "complete 'info registers '"
 # 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
diff --git a/gdb/testsuite/gdb.base/complex-parts.exp b/gdb/testsuite/gdb.base/complex-parts.exp
index c010ffee1ca..56260996bdb 100644
--- a/gdb/testsuite/gdb.base/complex-parts.exp
+++ b/gdb/testsuite/gdb.base/complex-parts.exp
@@ -16,7 +16,7 @@
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/complex.exp b/gdb/testsuite/gdb.base/complex.exp
index c4be874e376..0d7a83fb667 100644
--- a/gdb/testsuite/gdb.base/complex.exp
+++ b/gdb/testsuite/gdb.base/complex.exp
@@ -17,7 +17,7 @@
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {[runto f2]} {
diff --git a/gdb/testsuite/gdb.base/cond-eval-mode.exp b/gdb/testsuite/gdb.base/cond-eval-mode.exp
index b963ae45a75..e2afc3a9593 100644
--- a/gdb/testsuite/gdb.base/cond-eval-mode.exp
+++ b/gdb/testsuite/gdb.base/cond-eval-mode.exp
@@ -26,7 +26,7 @@ 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]} {
diff --git a/gdb/testsuite/gdb.base/condbreak-call-false.exp b/gdb/testsuite/gdb.base/condbreak-call-false.exp
index 767d6d181e7..32113e3b950 100644
--- a/gdb/testsuite/gdb.base/condbreak-call-false.exp
+++ b/gdb/testsuite/gdb.base/condbreak-call-false.exp
@@ -19,7 +19,7 @@
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/condbreak.exp
index ed76c261dbe..6a6c9c1d4f8 100644
--- a/gdb/testsuite/gdb.base/condbreak.exp
+++ b/gdb/testsuite/gdb.base/condbreak.exp
@@ -25,7 +25,7 @@ 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"]
diff --git a/gdb/testsuite/gdb.base/consecutive-step-over.exp b/gdb/testsuite/gdb.base/consecutive-step-over.exp
index 9a10f19c040..d7efec8f418 100644
--- a/gdb/testsuite/gdb.base/consecutive-step-over.exp
+++ b/gdb/testsuite/gdb.base/consecutive-step-over.exp
@@ -21,7 +21,7 @@
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/consecutive.exp b/gdb/testsuite/gdb.base/consecutive.exp
index 71d207c95bf..4c657a8f897 100644
--- a/gdb/testsuite/gdb.base/consecutive.exp
+++ b/gdb/testsuite/gdb.base/consecutive.exp
@@ -23,7 +23,7 @@
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
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 48867741386..1285c4f1415 100644
--- a/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp
+++ b/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp
@@ -37,7 +37,7 @@
 standard_testfile
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # DISPLACED indicates whether to use displaced-stepping.
diff --git a/gdb/testsuite/gdb.base/coredump-filter-build-id.exp b/gdb/testsuite/gdb.base/coredump-filter-build-id.exp
index 1eba93c0f6a..d267221e1bf 100644
--- a/gdb/testsuite/gdb.base/coredump-filter-build-id.exp
+++ b/gdb/testsuite/gdb.base/coredump-filter-build-id.exp
@@ -26,16 +26,16 @@ 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.
@@ -43,7 +43,7 @@ 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
diff --git a/gdb/testsuite/gdb.base/coredump-filter.exp b/gdb/testsuite/gdb.base/coredump-filter.exp
index e2ce86d48e8..6bf26f1643a 100644
--- a/gdb/testsuite/gdb.base/coredump-filter.exp
+++ b/gdb/testsuite/gdb.base/coredump-filter.exp
@@ -18,15 +18,15 @@ 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"]
@@ -184,7 +184,7 @@ set all_anon_corefiles { { "non-Private-Anonymous" "0x7e" \
 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" {
diff --git a/gdb/testsuite/gdb.base/corefile-exec-context.exp b/gdb/testsuite/gdb.base/corefile-exec-context.exp
index 17d7e23f333..bf935a795e7 100644
--- a/gdb/testsuite/gdb.base/corefile-exec-context.exp
+++ b/gdb/testsuite/gdb.base/corefile-exec-context.exp
@@ -24,7 +24,7 @@ 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
@@ -136,7 +136,7 @@ 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.
diff --git a/gdb/testsuite/gdb.base/corefile-find-exec.exp b/gdb/testsuite/gdb.base/corefile-find-exec.exp
index d766aa69f1b..7d79b70c41b 100644
--- a/gdb/testsuite/gdb.base/corefile-find-exec.exp
+++ b/gdb/testsuite/gdb.base/corefile-find-exec.exp
@@ -24,7 +24,7 @@ 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.
diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp
index f6a0a7a1eca..31249355353 100644
--- a/gdb/testsuite/gdb.base/corefile.exp
+++ b/gdb/testsuite/gdb.base/corefile.exp
@@ -23,7 +23,7 @@ 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
diff --git a/gdb/testsuite/gdb.base/corefile2.exp b/gdb/testsuite/gdb.base/corefile2.exp
index 4ad218b3462..805e08973f6 100644
--- a/gdb/testsuite/gdb.base/corefile2.exp
+++ b/gdb/testsuite/gdb.base/corefile2.exp
@@ -35,7 +35,7 @@ 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 {}]
diff --git a/gdb/testsuite/gdb.base/ctf-ptype.exp b/gdb/testsuite/gdb.base/ctf-ptype.exp
index e6bae63562b..d3c3b46140c 100644
--- a/gdb/testsuite/gdb.base/ctf-ptype.exp
+++ b/gdb/testsuite/gdb.base/ctf-ptype.exp
@@ -88,16 +88,16 @@ 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" \
diff --git a/gdb/testsuite/gdb.base/ctxobj.exp b/gdb/testsuite/gdb.base/ctxobj.exp
index 567c4292aaf..3b1b12a9b18 100644
--- a/gdb/testsuite/gdb.base/ctxobj.exp
+++ b/gdb/testsuite/gdb.base/ctxobj.exp
@@ -39,17 +39,17 @@ set libobj2_opts { debug
 		   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
@@ -57,7 +57,7 @@ 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"]
diff --git a/gdb/testsuite/gdb.base/cursal.exp b/gdb/testsuite/gdb.base/cursal.exp
index 1385a30632b..a52ec3f844e 100644
--- a/gdb/testsuite/gdb.base/cursal.exp
+++ b/gdb/testsuite/gdb.base/cursal.exp
@@ -18,7 +18,7 @@ standard_testfile
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != ""} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
@@ -32,7 +32,7 @@ gdb_test "list" \
 
 gdb_load ${binfile}
 if {! [runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "list" \
@@ -40,7 +40,7 @@ gdb_test "list" \
     "list in main"
 
 if {! [runto "func2"]} {
-    return -1
+    return
 }
 
 gdb_test "list" \
@@ -58,7 +58,7 @@ gdb_test "list -1" \
 gdb_test_no_output "set listsize 3"
 
 if {! [runto_main]} {
-    return -1
+    return
 }
 gdb_test "list" \
     "func1 \\(\\);" \
diff --git a/gdb/testsuite/gdb.base/dcache-flush.exp b/gdb/testsuite/gdb.base/dcache-flush.exp
index 7ed60e3e913..df05ab554b6 100644
--- a/gdb/testsuite/gdb.base/dcache-flush.exp
+++ b/gdb/testsuite/gdb.base/dcache-flush.exp
@@ -18,11 +18,11 @@
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 if {![runto func]} {
-    return -1
+    return
 }
 
 gdb_test "up" ".* main .*"
diff --git a/gdb/testsuite/gdb.base/dcache-line-read-error.exp b/gdb/testsuite/gdb.base/dcache-line-read-error.exp
index 207724af756..98095c18866 100644
--- a/gdb/testsuite/gdb.base/dcache-line-read-error.exp
+++ b/gdb/testsuite/gdb.base/dcache-line-read-error.exp
@@ -18,11 +18,11 @@
 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
diff --git a/gdb/testsuite/gdb.base/debug-expr.exp b/gdb/testsuite/gdb.base/debug-expr.exp
index 80f6d5a968b..b9377541847 100644
--- a/gdb/testsuite/gdb.base/debug-expr.exp
+++ b/gdb/testsuite/gdb.base/debug-expr.exp
@@ -22,11 +22,11 @@ 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 } {
diff --git a/gdb/testsuite/gdb.base/debug-frame.exp b/gdb/testsuite/gdb.base/debug-frame.exp
index 1f5f015f5dd..2038fa992d2 100644
--- a/gdb/testsuite/gdb.base/debug-frame.exp
+++ b/gdb/testsuite/gdb.base/debug-frame.exp
@@ -20,11 +20,11 @@ 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.
diff --git a/gdb/testsuite/gdb.base/decl-before-def.exp b/gdb/testsuite/gdb.base/decl-before-def.exp
index 2c4de8f42f9..66083d2aa71 100644
--- a/gdb/testsuite/gdb.base/decl-before-def.exp
+++ b/gdb/testsuite/gdb.base/decl-before-def.exp
@@ -17,7 +17,7 @@ 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.
diff --git a/gdb/testsuite/gdb.base/default-args.exp b/gdb/testsuite/gdb.base/default-args.exp
index edd3bea3c33..3046aaf7c5f 100644
--- a/gdb/testsuite/gdb.base/default-args.exp
+++ b/gdb/testsuite/gdb.base/default-args.exp
@@ -22,7 +22,7 @@ load_lib completion-support.exp
 standard_testfile .c
 
 if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.base/define.exp b/gdb/testsuite/gdb.base/define.exp
index 33aee1d46cf..e0e440e455c 100644
--- a/gdb/testsuite/gdb.base/define.exp
+++ b/gdb/testsuite/gdb.base/define.exp
@@ -24,7 +24,7 @@ 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"]
diff --git a/gdb/testsuite/gdb.base/del.exp b/gdb/testsuite/gdb.base/del.exp
index ea3c639e0dd..a34dba5845e 100644
--- a/gdb/testsuite/gdb.base/del.exp
+++ b/gdb/testsuite/gdb.base/del.exp
@@ -20,7 +20,7 @@
 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"
diff --git a/gdb/testsuite/gdb.base/disabled-location.exp b/gdb/testsuite/gdb.base/disabled-location.exp
index 300f73cd0c7..17e8987ded1 100644
--- a/gdb/testsuite/gdb.base/disabled-location.exp
+++ b/gdb/testsuite/gdb.base/disabled-location.exp
@@ -16,7 +16,7 @@
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/disasm-end-cu.exp b/gdb/testsuite/gdb.base/disasm-end-cu.exp
index dc0dc25882a..66cd2f92d87 100644
--- a/gdb/testsuite/gdb.base/disasm-end-cu.exp
+++ b/gdb/testsuite/gdb.base/disasm-end-cu.exp
@@ -18,11 +18,11 @@
 # 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"]
@@ -30,7 +30,7 @@ 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" {
diff --git a/gdb/testsuite/gdb.base/disasm-optim.exp b/gdb/testsuite/gdb.base/disasm-optim.exp
index 70841ac2723..c926a020075 100644
--- a/gdb/testsuite/gdb.base/disasm-optim.exp
+++ b/gdb/testsuite/gdb.base/disasm-optim.exp
@@ -20,11 +20,11 @@ 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" \
diff --git a/gdb/testsuite/gdb.base/displaced-step-closure.exp b/gdb/testsuite/gdb.base/displaced-step-closure.exp
index 358020fed85..6d0521d3141 100644
--- a/gdb/testsuite/gdb.base/displaced-step-closure.exp
+++ b/gdb/testsuite/gdb.base/displaced-step-closure.exp
@@ -21,11 +21,11 @@
 
 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
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
index 1eae678111b..3acc512de0e 100644
--- a/gdb/testsuite/gdb.base/display.exp
+++ b/gdb/testsuite/gdb.base/display.exp
@@ -29,7 +29,7 @@ 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
diff --git a/gdb/testsuite/gdb.base/dmsym.exp b/gdb/testsuite/gdb.base/dmsym.exp
index 89e38a29d45..3820b13bfdc 100644
--- a/gdb/testsuite/gdb.base/dmsym.exp
+++ b/gdb/testsuite/gdb.base/dmsym.exp
@@ -35,7 +35,7 @@ if {[gdb_compile \
       [standard_output_file ${testfile}] \
       executable {debug}] != ""} {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.base/document.exp b/gdb/testsuite/gdb.base/document.exp
index a7d685e5f35..905ce59af97 100644
--- a/gdb/testsuite/gdb.base/document.exp
+++ b/gdb/testsuite/gdb.base/document.exp
@@ -17,7 +17,7 @@ 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.
diff --git a/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp b/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp
index 6fc9ec99ebc..b2cc3ddb144 100644
--- a/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp
+++ b/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp
@@ -19,7 +19,7 @@ standard_testfile
 
 if {[build_executable "failed to prepare" \
 	 ${testfile} ${srcfile} {debug}]} {
-    return -1
+    return
 }
 
 set dp_location [gdb_get_line_number "set dprintf here"]
diff --git a/gdb/testsuite/gdb.base/dprintf-detach.exp b/gdb/testsuite/gdb.base/dprintf-detach.exp
index 4aad0158291..dd9bfde8f47 100644
--- a/gdb/testsuite/gdb.base/dprintf-detach.exp
+++ b/gdb/testsuite/gdb.base/dprintf-detach.exp
@@ -28,7 +28,7 @@ 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 } {
diff --git a/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp b/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp
index 3f149381f4f..5263d15a83d 100644
--- a/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp
+++ b/gdb/testsuite/gdb.base/dprintf-execution-x-script.exp
@@ -25,7 +25,7 @@ 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.
@@ -47,7 +47,7 @@ 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
diff --git a/gdb/testsuite/gdb.base/dprintf-next.exp b/gdb/testsuite/gdb.base/dprintf-next.exp
index 6ddf949c531..325478fb471 100644
--- a/gdb/testsuite/gdb.base/dprintf-next.exp
+++ b/gdb/testsuite/gdb.base/dprintf-next.exp
@@ -21,11 +21,11 @@ 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" \
diff --git a/gdb/testsuite/gdb.base/dprintf-non-stop.exp b/gdb/testsuite/gdb.base/dprintf-non-stop.exp
index 3807a7b6623..89b1c894c04 100644
--- a/gdb/testsuite/gdb.base/dprintf-non-stop.exp
+++ b/gdb/testsuite/gdb.base/dprintf-non-stop.exp
@@ -18,7 +18,7 @@ set executable ${testfile}
 
 if {[build_executable "failed to prepare for dprintf with non-stop" \
 	 ${testfile} ${srcfile} {debug}]} {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
@@ -27,7 +27,7 @@ save_vars { GDBFLAGS } {
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "dprintf foo,\"At foo entry\\n\"" "Dprintf .*"
diff --git a/gdb/testsuite/gdb.base/dprintf-pending.exp b/gdb/testsuite/gdb.base/dprintf-pending.exp
index ec101f2bdc7..5b13cfda595 100644
--- a/gdb/testsuite/gdb.base/dprintf-pending.exp
+++ b/gdb/testsuite/gdb.base/dprintf-pending.exp
@@ -27,7 +27,7 @@ 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" {
diff --git a/gdb/testsuite/gdb.base/dprintf.exp b/gdb/testsuite/gdb.base/dprintf.exp
index ef1f09443c1..9896f2c1924 100644
--- a/gdb/testsuite/gdb.base/dprintf.exp
+++ b/gdb/testsuite/gdb.base/dprintf.exp
@@ -20,14 +20,14 @@ 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"
diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp
index 84be9df6d6e..798cca9a6b0 100644
--- a/gdb/testsuite/gdb.base/dump.exp
+++ b/gdb/testsuite/gdb.base/dump.exp
@@ -94,7 +94,7 @@ remote_exec host "rm -f $filenames"
 
 if {![runto checkpoint1]} {
     untested "couldn't run to checkpoint"
-    return -1
+    return
 }
 
 # Get the endianness for the later use with endianless formats.
diff --git a/gdb/testsuite/gdb.base/dup-sect.exp b/gdb/testsuite/gdb.base/dup-sect.exp
index a2c74f51a6c..ef9ba340ae2 100644
--- a/gdb/testsuite/gdb.base/dup-sect.exp
+++ b/gdb/testsuite/gdb.base/dup-sect.exp
@@ -37,7 +37,7 @@ set srcmainfile start.c
 set executable ${testfile}
 
 if {[build_executable ${testfile}.exp $executable [list ${srcfile} ${srcmainfile}] {}] == -1} {
-    return -1
+    return
 }
 
 set test "rename section"
diff --git a/gdb/testsuite/gdb.base/duplicate-bp.exp b/gdb/testsuite/gdb.base/duplicate-bp.exp
index 959eb7697d9..5fd96928e2e 100644
--- a/gdb/testsuite/gdb.base/duplicate-bp.exp
+++ b/gdb/testsuite/gdb.base/duplicate-bp.exp
@@ -16,7 +16,7 @@
 standard_testfile
 
 if { [build_executable "failed to prepare" ${testfile}] } {
-    return -1
+    return
 }
 
 # Setup for the test, create COUNT breakpoints at the function BREAKPT.
diff --git a/gdb/testsuite/gdb.base/early-init-file.exp b/gdb/testsuite/gdb.base/early-init-file.exp
index b609e2c1992..cbbfefa6912 100644
--- a/gdb/testsuite/gdb.base/early-init-file.exp
+++ b/gdb/testsuite/gdb.base/early-init-file.exp
@@ -22,7 +22,7 @@ standard_testfile
 
 # Compile the test executable.
 if {[build_executable "failed to build" $testfile $srcfile]} {
-    return -1
+    return
 }
 
 set custom_signal_handle_re \
diff --git a/gdb/testsuite/gdb.base/eh_return.exp b/gdb/testsuite/gdb.base/eh_return.exp
index 55cca9362d3..c6f1d7375c5 100644
--- a/gdb/testsuite/gdb.base/eh_return.exp
+++ b/gdb/testsuite/gdb.base/eh_return.exp
@@ -54,7 +54,7 @@ if {[istarget "powerpc*"]} {
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 $compile_flags]} {
-    return -1
+    return
 }
 
 set address -1
diff --git a/gdb/testsuite/gdb.base/ena-dis-br.exp b/gdb/testsuite/gdb.base/ena-dis-br.exp
index bdf54d083f0..5f208644a36 100644
--- a/gdb/testsuite/gdb.base/ena-dis-br.exp
+++ b/gdb/testsuite/gdb.base/ena-dis-br.exp
@@ -23,7 +23,7 @@ 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"]
diff --git a/gdb/testsuite/gdb.base/endianity.exp b/gdb/testsuite/gdb.base/endianity.exp
index 661a83d5e54..0da319a824c 100644
--- a/gdb/testsuite/gdb.base/endianity.exp
+++ b/gdb/testsuite/gdb.base/endianity.exp
@@ -45,7 +45,7 @@ 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"
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index 4dac31eb059..c8d3672cd87 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -28,7 +28,7 @@ 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"
 
diff --git a/gdb/testsuite/gdb.base/enum_cond.exp b/gdb/testsuite/gdb.base/enum_cond.exp
index 9d660fe0557..0421ea37d8f 100644
--- a/gdb/testsuite/gdb.base/enum_cond.exp
+++ b/gdb/testsuite/gdb.base/enum_cond.exp
@@ -35,7 +35,7 @@ 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
diff --git a/gdb/testsuite/gdb.base/enumval.exp b/gdb/testsuite/gdb.base/enumval.exp
index aab68ba0730..6942d0265b5 100644
--- a/gdb/testsuite/gdb.base/enumval.exp
+++ b/gdb/testsuite/gdb.base/enumval.exp
@@ -18,7 +18,7 @@
 standard_testfile
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-    return -1
+    return
 }
 
 # Check the real contents.
diff --git a/gdb/testsuite/gdb.base/eu-strip-infcall.exp b/gdb/testsuite/gdb.base/eu-strip-infcall.exp
index be1793305dc..73df0e5650b 100644
--- a/gdb/testsuite/gdb.base/eu-strip-infcall.exp
+++ b/gdb/testsuite/gdb.base/eu-strip-infcall.exp
@@ -16,7 +16,7 @@
 standard_testfile
 
 if {[build_executable ${testfile}.exp $testfile] == -1} {
-    return -1
+    return
 }
 
 set test "eu-strip"
@@ -29,7 +29,7 @@ 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 ce0e1cfa873..1a6d76cad8d 100644
--- a/gdb/testsuite/gdb.base/eval-avoid-side-effects.exp
+++ b/gdb/testsuite/gdb.base/eval-avoid-side-effects.exp
@@ -19,11 +19,11 @@
 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]
diff --git a/gdb/testsuite/gdb.base/examine-backward.exp b/gdb/testsuite/gdb.base/examine-backward.exp
index 76a904ad7a4..9f986374ebc 100644
--- a/gdb/testsuite/gdb.base/examine-backward.exp
+++ b/gdb/testsuite/gdb.base/examine-backward.exp
@@ -19,11 +19,11 @@
 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 {} {
diff --git a/gdb/testsuite/gdb.base/exe-lock.exp b/gdb/testsuite/gdb.base/exe-lock.exp
index d6ad59172f3..c4c6585cf7f 100644
--- a/gdb/testsuite/gdb.base/exe-lock.exp
+++ b/gdb/testsuite/gdb.base/exe-lock.exp
@@ -31,7 +31,7 @@ if { [prepare_for_testing "prepare" $testfile $srcfile] != 0 } {
 # it really has been deleted.
 if { ! [file exists $binfile] } {
     fail "executable does not exist (${binfile})"
-    return -1
+    return
     }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
index 5f96b703997..98d38c9ccef 100644
--- a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
+++ b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
@@ -31,13 +31,13 @@ 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
@@ -45,7 +45,7 @@ if { [gdb_compile $objfile $exec1 executable {debug text_segment=0x1000000}] !=
 
 clean_restart $testfile1
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set addr ""
@@ -59,7 +59,7 @@ gdb_test_multiple "p/x &main" $test {
 
 clean_restart $testfile2
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set cannot_access 0
diff --git a/gdb/testsuite/gdb.base/execution-termios.exp b/gdb/testsuite/gdb.base/execution-termios.exp
index f82b62afc98..c448b1e2913 100644
--- a/gdb/testsuite/gdb.base/execution-termios.exp
+++ b/gdb/testsuite/gdb.base/execution-termios.exp
@@ -16,7 +16,7 @@
 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
diff --git a/gdb/testsuite/gdb.base/exitsignal.exp b/gdb/testsuite/gdb.base/exitsignal.exp
index 7bbf82db79c..aa2710450b5 100644
--- a/gdb/testsuite/gdb.base/exitsignal.exp
+++ b/gdb/testsuite/gdb.base/exitsignal.exp
@@ -26,7 +26,7 @@ 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
@@ -34,7 +34,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 set_inferior_cwd_to_output_dir
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 # Get the inferior's PID for later.
@@ -85,7 +85,7 @@ gdb_test "print \$_exitcode" " = void" \
 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
@@ -97,7 +97,7 @@ gdb_test "print \$_exitcode" " = void" \
 
 # Run the inferior until the end.
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 gdb_continue_to_end
diff --git a/gdb/testsuite/gdb.base/expand-psymtabs.exp b/gdb/testsuite/gdb.base/expand-psymtabs.exp
index cd29d1098f4..fb670204dcb 100644
--- a/gdb/testsuite/gdb.base/expand-psymtabs.exp
+++ b/gdb/testsuite/gdb.base/expand-psymtabs.exp
@@ -34,7 +34,7 @@ standard_testfile
 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"]
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index d33c8224a10..b68645e8bb6 100644
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -29,7 +29,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	   executable \
 	   [list debug additional_flags=[quote_for_host -DOUTDIR=\"$outdir/\"[...]

[diff truncated at 100000 bytes]
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.