[binutils-gdb] [gdb/testsuite] Don't return -1 from top-level

Tom de Vries via Gdb-cvs <[email protected]> Mon, 3 Aug 2026 12:14:04 +0000 (GMT)
Newsgroups gmane.comp.gdb.cvs
Message-ID <[email protected]>
https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D7023cf901ca6=
adb8a6ffa46b9856bc95eb78ed85

commit 7023cf901ca6adb8a6ffa46b9856bc95eb78ed85
Author: Tom de Vries <[email protected]>
Date:   Mon Aug 3 14:13:56 2026 +0200

    [gdb/testsuite] Don't return -1 from top-level
   =20
    Replace:
    ...
    if {<cond>} {
       return -1
    }
    ...
    with:
    ...
    if {<cond>} {
       return
    }
    ...
   =20
    See also commit 51f8decb2fc ("GDB: testsuite: TUI: Don't return -1 from
    top-level (sed)").
   =20
    Generated by a script written by Claude Code.
   =20
    Tested on x86_64-linux and aarch64-linux.
   =20
    Approved-By: Andrew Burgess <[email protected]>

Diff:
---
 gdb/testsuite/gdb.asm/asm-source.exp                 | 10 +++++-----
 gdb/testsuite/gdb.base/rbreak.exp                    |  2 +-
 gdb/testsuite/gdb.base/stap-probe.exp                |  2 +-
 gdb/testsuite/gdb.btrace/buffer-size.exp             |  4 ++--
 gdb/testsuite/gdb.btrace/data.exp                    |  4 ++--
 gdb/testsuite/gdb.btrace/delta.exp                   |  4 ++--
 gdb/testsuite/gdb.btrace/dlopen.exp                  |  6 +++---
 gdb/testsuite/gdb.btrace/enable-new-thread.exp       |  4 ++--
 gdb/testsuite/gdb.btrace/enable-running.exp          |  4 ++--
 gdb/testsuite/gdb.btrace/enable.exp                  | 12 ++++++------
 gdb/testsuite/gdb.btrace/event-tracing-gap.exp       |  4 ++--
 gdb/testsuite/gdb.btrace/event-tracing.exp           |  4 ++--
 gdb/testsuite/gdb.btrace/exception.exp               |  4 ++--
 gdb/testsuite/gdb.btrace/function_call_history.exp   |  6 +++---
 gdb/testsuite/gdb.btrace/gcore.exp                   |  4 ++--
 gdb/testsuite/gdb.btrace/instruction_history.exp     |  4 ++--
 gdb/testsuite/gdb.btrace/multi-inferior.exp          |  6 +++---
 gdb/testsuite/gdb.btrace/multi-thread-step.exp       |  4 ++--
 gdb/testsuite/gdb.btrace/nohist.exp                  |  4 ++--
 gdb/testsuite/gdb.btrace/non-stop.exp                |  4 ++--
 gdb/testsuite/gdb.btrace/ptwrite.exp                 |  6 +++---
 gdb/testsuite/gdb.btrace/reconnect.exp               |  2 +-
 gdb/testsuite/gdb.btrace/record_goto-step.exp        |  4 ++--
 gdb/testsuite/gdb.btrace/record_goto.exp             |  6 +++---
 gdb/testsuite/gdb.btrace/rn-dl-bind.exp              |  4 ++--
 gdb/testsuite/gdb.btrace/segv.exp                    |  4 ++--
 gdb/testsuite/gdb.btrace/step.exp                    |  4 ++--
 gdb/testsuite/gdb.btrace/stepi.exp                   |  6 +++---
 gdb/testsuite/gdb.btrace/tailcall-only.exp           |  6 +++---
 gdb/testsuite/gdb.btrace/tailcall.exp                |  6 +++---
 gdb/testsuite/gdb.btrace/tsx.exp                     |  4 ++--
 gdb/testsuite/gdb.btrace/unknown_functions.exp       |  4 ++--
 gdb/testsuite/gdb.btrace/vdso.exp                    |  4 ++--
 .../gdb.compile/compile-cplus-anonymous.exp          |  6 +++---
 .../gdb.compile/compile-cplus-array-decay.exp        |  6 +++---
 gdb/testsuite/gdb.compile/compile-cplus-inherit.exp  |  6 +++---
 gdb/testsuite/gdb.compile/compile-cplus-member.exp   |  6 +++---
 gdb/testsuite/gdb.compile/compile-cplus-method.exp   |  6 +++---
 .../gdb.compile/compile-cplus-namespace.exp          |  6 +++---
 gdb/testsuite/gdb.compile/compile-cplus-nested.exp   |  6 +++---
 gdb/testsuite/gdb.compile/compile-cplus-print.exp    |  6 +++---
 gdb/testsuite/gdb.compile/compile-cplus-virtual.exp  |  6 +++---
 gdb/testsuite/gdb.compile/compile-cplus.exp          |  6 +++---
 gdb/testsuite/gdb.compile/compile-ifunc.exp          | 10 +++++-----
 gdb/testsuite/gdb.compile/compile-ops.exp            |  8 ++++----
 gdb/testsuite/gdb.compile/compile-print.exp          |  6 +++---
 gdb/testsuite/gdb.compile/compile-setjmp.exp         |  6 +++---
 gdb/testsuite/gdb.compile/compile-tls.exp            |  4 ++--
 gdb/testsuite/gdb.compile/compile.exp                | 10 +++++-----
 gdb/testsuite/gdb.ctf/dwarf2-and-ctf.exp             |  6 +++---
 gdb/testsuite/gdb.dap/catch-unhandled.exp            |  2 +-
 .../gdb.debuginfod/build-id-no-debug-warning.exp     |  4 ++--
 gdb/testsuite/gdb.debuginfod/crc_mismatch.exp        |  4 ++--
 .../gdb.debuginfod/fetch_src_and_symbols.exp         |  6 +++---
 gdb/testsuite/gdb.disasm/am33.exp                    |  2 +-
 gdb/testsuite/gdb.disasm/basics.exp                  |  4 ++--
 gdb/testsuite/gdb.disasm/h8300s.exp                  |  2 +-
 gdb/testsuite/gdb.disasm/hppa.exp                    |  2 +-
 gdb/testsuite/gdb.disasm/mn10300.exp                 |  2 +-
 gdb/testsuite/gdb.disasm/sh3.exp                     |  2 +-
 gdb/testsuite/gdb.disasm/t01_mov.exp                 |  4 ++--
 gdb/testsuite/gdb.disasm/t02_mova.exp                |  4 ++--
 gdb/testsuite/gdb.disasm/t03_add.exp                 |  4 ++--
 gdb/testsuite/gdb.disasm/t04_sub.exp                 |  4 ++--
 gdb/testsuite/gdb.disasm/t05_cmp.exp                 |  4 ++--
 gdb/testsuite/gdb.disasm/t06_ari2.exp                |  4 ++--
 gdb/testsuite/gdb.disasm/t07_ari3.exp                |  4 ++--
 gdb/testsuite/gdb.disasm/t08_or.exp                  |  4 ++--
 gdb/testsuite/gdb.disasm/t09_xor.exp                 |  4 ++--
 gdb/testsuite/gdb.disasm/t10_and.exp                 |  4 ++--
 gdb/testsuite/gdb.disasm/t11_logs.exp                |  4 ++--
 gdb/testsuite/gdb.disasm/t12_bit.exp                 |  4 ++--
 gdb/testsuite/gdb.disasm/t13_otr.exp                 |  4 ++--
 gdb/testsuite/gdb.dlang/circular.exp                 |  4 ++--
 gdb/testsuite/gdb.dlang/dlang-start-2.exp            |  4 ++--
 gdb/testsuite/gdb.dlang/dlang-start.exp              |  4 ++--
 gdb/testsuite/gdb.dlang/watch-loc.exp                |  4 ++--
 gdb/testsuite/gdb.dwarf2/fission-dw-form-strx.exp    |  2 +-
 gdb/testsuite/gdb.fortran/allocated.exp              |  4 ++--
 gdb/testsuite/gdb.fortran/array-bounds-high.exp      |  2 +-
 gdb/testsuite/gdb.fortran/array-bounds.exp           |  2 +-
 gdb/testsuite/gdb.fortran/array-element.exp          |  2 +-
 gdb/testsuite/gdb.fortran/array-no-bounds.exp        |  2 +-
 gdb/testsuite/gdb.fortran/array-slices-bad.exp       |  4 ++--
 .../gdb.fortran/array-slices-sub-slices.exp          |  4 ++--
 gdb/testsuite/gdb.fortran/array-slices.exp           |  2 +-
 gdb/testsuite/gdb.fortran/associated.exp             |  4 ++--
 gdb/testsuite/gdb.fortran/assumedrank.exp            |  6 +++---
 gdb/testsuite/gdb.fortran/backtrace.exp              |  2 +-
 gdb/testsuite/gdb.fortran/block-data.exp             |  4 ++--
 gdb/testsuite/gdb.fortran/call-no-debug.exp          |  4 ++--
 gdb/testsuite/gdb.fortran/charset.exp                |  4 ++--
 .../gdb.fortran/class-allocatable-array.exp          |  4 ++--
 gdb/testsuite/gdb.fortran/common-block.exp           |  2 +-
 gdb/testsuite/gdb.fortran/completion.exp             |  4 ++--
 gdb/testsuite/gdb.fortran/complex.exp                |  2 +-
 gdb/testsuite/gdb.fortran/debug-expr.exp             |  4 ++--
 gdb/testsuite/gdb.fortran/derived-type-function.exp  |  2 +-
 gdb/testsuite/gdb.fortran/derived-type-striding.exp  |  2 +-
 gdb/testsuite/gdb.fortran/derived-type.exp           |  2 +-
 gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp   |  2 +-
 gdb/testsuite/gdb.fortran/empty-string.exp           |  4 ++--
 gdb/testsuite/gdb.fortran/entry-point.exp            |  4 ++--
 gdb/testsuite/gdb.fortran/function-calls.exp         |  2 +-
 gdb/testsuite/gdb.fortran/huge.exp                   |  2 +-
 gdb/testsuite/gdb.fortran/info-main.exp              |  4 ++--
 gdb/testsuite/gdb.fortran/info-modules.exp           |  2 +-
 gdb/testsuite/gdb.fortran/info-types.exp             |  2 +-
 gdb/testsuite/gdb.fortran/intrinsic-precedence.exp   |  6 +++---
 gdb/testsuite/gdb.fortran/intrinsics.exp             |  2 +-
 gdb/testsuite/gdb.fortran/intvar-array.exp           |  4 ++--
 gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp   |  4 ++--
 gdb/testsuite/gdb.fortran/lbound-ubound.exp          |  4 ++--
 gdb/testsuite/gdb.fortran/library-module.exp         |  4 ++--
 gdb/testsuite/gdb.fortran/limited-length.exp         |  2 +-
 gdb/testsuite/gdb.fortran/logical.exp                |  2 +-
 gdb/testsuite/gdb.fortran/max-depth.exp              |  2 +-
 gdb/testsuite/gdb.fortran/mixed-lang-stack.exp       |  2 +-
 gdb/testsuite/gdb.fortran/module.exp                 |  2 +-
 gdb/testsuite/gdb.fortran/multi-dim.exp              |  2 +-
 gdb/testsuite/gdb.fortran/namelist.exp               |  2 +-
 gdb/testsuite/gdb.fortran/nested-funcs-2.exp         |  2 +-
 gdb/testsuite/gdb.fortran/nested-funcs.exp           |  2 +-
 gdb/testsuite/gdb.fortran/oop_extend_type.exp        |  4 ++--
 gdb/testsuite/gdb.fortran/pointer-to-pointer.exp     |  4 ++--
 gdb/testsuite/gdb.fortran/pointers.exp               |  4 ++--
 gdb/testsuite/gdb.fortran/print-formatted.exp        |  4 ++--
 gdb/testsuite/gdb.fortran/print_type.exp             |  4 ++--
 gdb/testsuite/gdb.fortran/printing-types.exp         |  4 ++--
 gdb/testsuite/gdb.fortran/ptr-indentation.exp        |  4 ++--
 gdb/testsuite/gdb.fortran/ptype-on-functions.exp     |  2 +-
 gdb/testsuite/gdb.fortran/rank.exp                   |  4 ++--
 gdb/testsuite/gdb.fortran/shape.exp                  |  4 ++--
 .../gdb.fortran/short-circuit-argument-list.exp      |  2 +-
 gdb/testsuite/gdb.fortran/size.exp                   |  4 ++--
 gdb/testsuite/gdb.fortran/sizeof.exp                 |  4 ++--
 gdb/testsuite/gdb.fortran/string-types.exp           |  2 +-
 gdb/testsuite/gdb.fortran/subarray.exp               |  2 +-
 gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp        |  4 ++--
 gdb/testsuite/gdb.fortran/vla-array.exp              |  4 ++--
 gdb/testsuite/gdb.fortran/vla-datatypes.exp          |  4 ++--
 gdb/testsuite/gdb.fortran/vla-history.exp            |  4 ++--
 gdb/testsuite/gdb.fortran/vla-ptr-info.exp           |  4 ++--
 gdb/testsuite/gdb.fortran/vla-ptype-sub.exp          |  4 ++--
 gdb/testsuite/gdb.fortran/vla-ptype.exp              |  4 ++--
 gdb/testsuite/gdb.fortran/vla-sizeof.exp             |  4 ++--
 gdb/testsuite/gdb.fortran/vla-type.exp               |  4 ++--
 .../gdb.fortran/vla-value-sub-arbitrary.exp          |  4 ++--
 gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp   |  4 ++--
 gdb/testsuite/gdb.fortran/vla-value-sub.exp          |  4 ++--
 gdb/testsuite/gdb.fortran/vla-value.exp              |  4 ++--
 gdb/testsuite/gdb.fortran/whatis_type.exp            |  2 +-
 gdb/testsuite/gdb.go/chan.exp                        |  4 ++--
 gdb/testsuite/gdb.go/global-local-var-shadow.exp     |  4 ++--
 gdb/testsuite/gdb.go/handcall.exp                    |  4 ++--
 gdb/testsuite/gdb.go/hello.exp                       |  4 ++--
 gdb/testsuite/gdb.go/integers.exp                    |  4 ++--
 gdb/testsuite/gdb.go/max-depth.exp                   |  4 ++--
 gdb/testsuite/gdb.go/methods.exp                     |  4 ++--
 gdb/testsuite/gdb.go/no-package.exp                  |  2 +-
 gdb/testsuite/gdb.go/package.exp                     |  6 +++---
 gdb/testsuite/gdb.go/strings.exp                     |  4 ++--
 gdb/testsuite/gdb.go/types.exp                       |  4 ++--
 gdb/testsuite/gdb.go/unsafe.exp                      |  4 ++--
 gdb/testsuite/gdb.modula2/builtin-procedure-adr.exp  |  2 +-
 gdb/testsuite/gdb.modula2/max-depth.exp              |  4 ++--
 gdb/testsuite/gdb.modula2/multidim.exp               |  2 +-
 gdb/testsuite/gdb.modula2/unbounded-array.exp        |  2 +-
 gdb/testsuite/gdb.multi/address-space-reset.exp      |  6 +++---
 gdb/testsuite/gdb.multi/attach-no-multi-process.exp  |  2 +-
 gdb/testsuite/gdb.multi/base.exp                     |  8 ++++----
 gdb/testsuite/gdb.multi/bkpt-multi-exec.exp          |  4 ++--
 gdb/testsuite/gdb.multi/bp-thread-specific.exp       |  6 +++---
 gdb/testsuite/gdb.multi/checkpoint-multi.exp         |  6 +++---
 gdb/testsuite/gdb.multi/detach-stepi.exp             |  6 +++---
 gdb/testsuite/gdb.multi/dummy-frame-restore.exp      |  2 +-
 gdb/testsuite/gdb.multi/gdb-settings.exp             |  4 ++--
 gdb/testsuite/gdb.multi/inferior-specific-bp.exp     |  4 ++--
 gdb/testsuite/gdb.multi/info-threads.exp             |  4 ++--
 gdb/testsuite/gdb.multi/multi-arch.exp               |  6 +++---
 gdb/testsuite/gdb.multi/multi-attach.exp             |  2 +-
 gdb/testsuite/gdb.multi/multi-exit.exp               |  8 ++++----
 gdb/testsuite/gdb.multi/multi-kill.exp               |  6 +++---
 gdb/testsuite/gdb.multi/multi-re-run.exp             |  4 ++--
 gdb/testsuite/gdb.multi/multi-term-settings.exp      |  2 +-
 gdb/testsuite/gdb.multi/pending-bp-del-inferior.exp  |  2 +-
 gdb/testsuite/gdb.multi/pending-bp.exp               |  4 ++--
 gdb/testsuite/gdb.multi/remove-inferiors.exp         |  2 +-
 gdb/testsuite/gdb.multi/run-only-second-inf.exp      |  2 +-
 gdb/testsuite/gdb.multi/start-inferior-specific.exp  |  4 ++--
 gdb/testsuite/gdb.multi/stop-all-on-exit.exp         |  6 +++---
 gdb/testsuite/gdb.multi/tids-gid-reset.exp           |  8 ++++----
 gdb/testsuite/gdb.multi/tids.exp                     |  4 ++--
 gdb/testsuite/gdb.multi/watchpoint-multi-exit.exp    |  2 +-
 gdb/testsuite/gdb.multi/watchpoint-multi.exp         |  2 +-
 gdb/testsuite/gdb.opencl/callfuncs.exp               |  2 +-
 gdb/testsuite/gdb.opencl/convs_casts.exp             |  2 +-
 gdb/testsuite/gdb.opencl/datatypes.exp               |  2 +-
 gdb/testsuite/gdb.opencl/operators.exp               |  2 +-
 gdb/testsuite/gdb.opencl/vec_comps.exp               |  2 +-
 gdb/testsuite/gdb.opt/break-on-_exit.exp             |  4 ++--
 gdb/testsuite/gdb.opt/clobbered-registers-O2.exp     |  2 +-
 gdb/testsuite/gdb.opt/fortran-string.exp             |  2 +-
 gdb/testsuite/gdb.opt/inline-break.exp               |  4 ++--
 gdb/testsuite/gdb.opt/inline-cmds.exp                |  2 +-
 gdb/testsuite/gdb.opt/inline-locals.exp              |  2 +-
 gdb/testsuite/gdb.opt/inline-small-func.exp          |  4 ++--
 gdb/testsuite/gdb.opt/solib-intra-step.exp           |  2 +-
 gdb/testsuite/gdb.opt/static-optimized-out.exp       |  2 +-
 .../gdb.pascal/case-insensitive-symbols.exp          |  2 +-
 gdb/testsuite/gdb.pascal/floats.exp                  |  2 +-
 gdb/testsuite/gdb.pascal/gdb11492.exp                |  2 +-
 gdb/testsuite/gdb.pascal/hello.exp                   |  2 +-
 gdb/testsuite/gdb.pascal/integers.exp                |  2 +-
 gdb/testsuite/gdb.pascal/str-chars.exp               |  2 +-
 gdb/testsuite/gdb.pascal/stub-method.exp             |  2 +-
 gdb/testsuite/gdb.perf/backtrace.exp                 |  4 ++--
 gdb/testsuite/gdb.perf/disassemble.exp               |  2 +-
 gdb/testsuite/gdb.perf/single-step.exp               |  4 ++--
 gdb/testsuite/gdb.perf/skip-command.exp              |  2 +-
 gdb/testsuite/gdb.perf/skip-prologue.exp             |  4 ++--
 gdb/testsuite/gdb.perf/solib.exp                     |  6 +++---
 gdb/testsuite/gdb.perf/template-breakpoints.exp      |  4 ++--
 gdb/testsuite/gdb.replay/connect.exp                 |  2 +-
 gdb/testsuite/gdb.replay/missing-thread.exp          |  2 +-
 .../code-object-load-while-breakpoint-hit.exp        |  4 ++--
 gdb/testsuite/gdb.threads/leader-exit-schedlock.exp  |  2 +-
 gdb/testsuite/gdb.threads/step-over-process-exit.exp |  2 +-
 gdb/testsuite/gdb.trace/actions-changed.exp          |  6 +++---
 gdb/testsuite/gdb.trace/actions.exp                  |  6 +++---
 gdb/testsuite/gdb.trace/ax.exp                       |  2 +-
 gdb/testsuite/gdb.trace/backtrace.exp                |  6 +++---
 gdb/testsuite/gdb.trace/basic-libipa.exp             |  4 ++--
 gdb/testsuite/gdb.trace/change-loc.exp               |  8 ++++----
 gdb/testsuite/gdb.trace/circ.exp                     |  4 ++--
 gdb/testsuite/gdb.trace/collection.exp               |  2 +-
 gdb/testsuite/gdb.trace/deltrace.exp                 |  2 +-
 gdb/testsuite/gdb.trace/disconnected-tracing.exp     |  8 ++++----
 gdb/testsuite/gdb.trace/entry-values.exp             | 16 ++++++++--------
 gdb/testsuite/gdb.trace/ftrace-lock.exp              |  6 +++---
 gdb/testsuite/gdb.trace/ftrace.exp                   |  8 ++++----
 gdb/testsuite/gdb.trace/infotrace.exp                |  4 ++--
 gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp |  6 +++---
 gdb/testsuite/gdb.trace/mi-trace-unavailable.exp     |  6 +++---
 gdb/testsuite/gdb.trace/mi-traceframe-changed.exp    |  2 +-
 gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp    |  4 ++--
 gdb/testsuite/gdb.trace/mi-tsv-changed.exp           |  6 +++---
 gdb/testsuite/gdb.trace/no-attach-trace.exp          |  4 ++--
 gdb/testsuite/gdb.trace/packetlen.exp                |  2 +-
 gdb/testsuite/gdb.trace/passc-dyn.exp                |  2 +-
 gdb/testsuite/gdb.trace/passcount.exp                |  2 +-
 gdb/testsuite/gdb.trace/pending.exp                  | 20 ++++++++++------=
----
 gdb/testsuite/gdb.trace/pr16508.exp                  |  6 +++---
 gdb/testsuite/gdb.trace/qtro.exp                     | 10 +++++-----
 gdb/testsuite/gdb.trace/range-stepping.exp           | 10 +++++-----
 gdb/testsuite/gdb.trace/read-memory.exp              |  6 +++---
 gdb/testsuite/gdb.trace/report.exp                   |  4 ++--
 gdb/testsuite/gdb.trace/save-trace.exp               |  2 +-
 gdb/testsuite/gdb.trace/signal.exp                   | 10 +++++-----
 gdb/testsuite/gdb.trace/stap-trace.exp               |  4 ++--
 gdb/testsuite/gdb.trace/status-stop.exp              |  6 +++---
 gdb/testsuite/gdb.trace/strace.exp                   |  6 +++---
 gdb/testsuite/gdb.trace/tfile.exp                    |  4 ++--
 gdb/testsuite/gdb.trace/tfind.exp                    |  6 +++---
 gdb/testsuite/gdb.trace/trace-break.exp              | 20 ++++++++++------=
----
 gdb/testsuite/gdb.trace/trace-buffer-size.exp        |  8 ++++----
 gdb/testsuite/gdb.trace/trace-condition.exp          |  8 ++++----
 gdb/testsuite/gdb.trace/trace-enable-disable.exp     |  8 ++++----
 gdb/testsuite/gdb.trace/trace-mt.exp                 |  8 ++++----
 gdb/testsuite/gdb.trace/tracecmd.exp                 |  2 +-
 gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp     |  6 +++---
 gdb/testsuite/gdb.trace/tspeed.exp                   |  8 ++++----
 gdb/testsuite/gdb.trace/tstatus.exp                  |  6 +++---
 gdb/testsuite/gdb.trace/tsv.exp                      |  2 +-
 gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp  | 10 +++++-----
 gdb/testsuite/gdb.trace/unavailable.exp              |  2 +-
 gdb/testsuite/gdb.trace/while-dyn.exp                |  2 +-
 gdb/testsuite/gdb.trace/while-stepping.exp           |  6 +++---
 278 files changed, 585 insertions(+), 585 deletions(-)

diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/a=
sm-source.exp
index f550f95573e..e32a2c6c5cc 100644
--- a/gdb/testsuite/gdb.asm/asm-source.exp
+++ b/gdb/testsuite/gdb.asm/asm-source.exp
@@ -162,7 +162,7 @@ switch -glob -- [istarget] {
=20
 if { "${asm-arch}" =3D=3D "" } {
     untested "skipping tests due to no asm architecture"
-    return -1
+    return
 }
=20
 # On NetBSD/ELF we need a special NetBSD-identifying note section.
@@ -188,7 +188,7 @@ if {[board_info $dest exists multilib_flags]} {
 	set multilib_flags [board_info $dest multilib_flags]
 	if { "${multilib_flags}" !=3D "" } {
 	   untested "failed to compile"
-	   return -1
+	   return
 	   return
 	 }
 }
@@ -245,11 +245,11 @@ set asm2obj [standard_output_file asmrc2.o]
=20
 if {[target_assemble ${srcdir}/${subdir}/${srcfile} $asm1obj "${asm-flags}=
 ${debug-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
 if {[target_assemble ${srcdir}/${subdir}/${srcfile2} $asm2obj "${asm-flags=
} ${debug-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
=20
 # We deliberately don't use gdb_compile here to link together the
@@ -260,7 +260,7 @@ if {[target_assemble ${srcdir}/${subdir}/${srcfile2} $a=
sm2obj "${asm-flags} ${de
 # *-*-*bsd* and *-*-solaris2*.
 if {[target_link [list $asm1obj $asm2obj] "${binfile}" ${link-flags}] !=3D=
 ""} {
      untested "failed to link"
-     return -1
+     return
 }
=20
 # Restore the target board linker script for HC11/HC12.
diff --git a/gdb/testsuite/gdb.base/rbreak.exp b/gdb/testsuite/gdb.base/rbr=
eak.exp
index 16c7e83cd49..16d191b2417 100644
--- a/gdb/testsuite/gdb.base/rbreak.exp
+++ b/gdb/testsuite/gdb.base/rbreak.exp
@@ -19,7 +19,7 @@ standard_testfile .c -2.c
=20
 if { [prepare_for_testing "failed to prepare" $testfile \
 	  [list $srcfile $srcfile2]] } {
-    return -1
+    return
 }
=20
 # Regression test for PR34112.  Check that "rbreak $srcfile:foo" doesn't s=
et
diff --git a/gdb/testsuite/gdb.base/stap-probe.exp b/gdb/testsuite/gdb.base=
/stap-probe.exp
index 00f91a5723a..ce4f9a2d8cd 100644
--- a/gdb/testsuite/gdb.base/stap-probe.exp
+++ b/gdb/testsuite/gdb.base/stap-probe.exp
@@ -331,7 +331,7 @@ proc stap_test_no_debuginfo {exec_name {args ""}} {
 with_test_prefix "without semaphore, not optimized" {
     if {[stap_test "stap-probe-nosem-noopt"] =3D=3D -1} {
 	untested "stap probe test failed"
-	  return -1
+	  return
     }
=20
     foreach_with_prefix pie { "nopie" "pie" } {
diff --git a/gdb/testsuite/gdb.btrace/buffer-size.exp b/gdb/testsuite/gdb.b=
trace/buffer-size.exp
index 1684cafa61f..63bc44dde39 100644
--- a/gdb/testsuite/gdb.btrace/buffer-size.exp
+++ b/gdb/testsuite/gdb.btrace/buffer-size.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
=20
 standard_testfile record_goto.c
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 gdb_test_no_output "set record btrace bts buffer-size 1"
diff --git a/gdb/testsuite/gdb.btrace/data.exp b/gdb/testsuite/gdb.btrace/d=
ata.exp
index 2aa02687611..2af688b95f0 100644
--- a/gdb/testsuite/gdb.btrace/data.exp
+++ b/gdb/testsuite/gdb.btrace/data.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
=20
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # trace the test code
diff --git a/gdb/testsuite/gdb.btrace/delta.exp b/gdb/testsuite/gdb.btrace/=
delta.exp
index eef6f2debc6..cfcad1d5b04 100644
--- a/gdb/testsuite/gdb.btrace/delta.exp
+++ b/gdb/testsuite/gdb.btrace/delta.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
=20
 standard_testfile record_goto.c
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # proceed to some sequential code
diff --git a/gdb/testsuite/gdb.btrace/dlopen.exp b/gdb/testsuite/gdb.btrace=
/dlopen.exp
index cc91c0d3c46..e197438f213 100644
--- a/gdb/testsuite/gdb.btrace/dlopen.exp
+++ b/gdb/testsuite/gdb.btrace/dlopen.exp
@@ -25,16 +25,16 @@ set binfile_lib [standard_output_file $basename_lib.so]
=20
 if { [gdb_compile_shlib $srcfile_lib $binfile_lib {}] !=3D "" } {
     untested "failed to prepare shlib"
-    return -1
+    return
 }
=20
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 	  [list additional_flags=3D-DDSO_NAME=3D\"$binfile_lib\" libs=3D-ldl]] } {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # Trace the test function
diff --git a/gdb/testsuite/gdb.btrace/enable-new-thread.exp b/gdb/testsuite=
/gdb.btrace/enable-new-thread.exp
index 6e93c59e1d7..72d8be5d47c 100644
--- a/gdb/testsuite/gdb.btrace/enable-new-thread.exp
+++ b/gdb/testsuite/gdb.btrace/enable-new-thread.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
=20
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pth=
reads}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # Record the main thread.  Recording will automatically be enabled for the
diff --git a/gdb/testsuite/gdb.btrace/enable-running.exp b/gdb/testsuite/gd=
b.btrace/enable-running.exp
index 591e42be7db..2a42b6ab62e 100644
--- a/gdb/testsuite/gdb.btrace/enable-running.exp
+++ b/gdb/testsuite/gdb.btrace/enable-running.exp
@@ -20,7 +20,7 @@ require allow_btrace_tests
 standard_testfile
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable=
 {debug}] !=3D "" } {
     untested "failed to prepare"
-    return -1
+    return
 }
=20
 # We need to enable non-stop mode for the remote case.
@@ -30,7 +30,7 @@ save_vars { GDBFLAGS } {
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 set bp_1 [gdb_get_line_number "bp.1" $srcfile]
diff --git a/gdb/testsuite/gdb.btrace/enable.exp b/gdb/testsuite/gdb.btrace=
/enable.exp
index dd7b6753eff..33ddd6fc931 100644
--- a/gdb/testsuite/gdb.btrace/enable.exp
+++ b/gdb/testsuite/gdb.btrace/enable.exp
@@ -36,11 +36,11 @@ gdb_test "info record" "No recording is currently activ=
e\\." "info record withou
=20
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile {} {debug}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # enable btrace
@@ -79,19 +79,19 @@ load_lib gdbserver-support.exp
 require allow_gdbserver_tests
 clean_restart $testfile
 if {![runto_main]} {
-    return -1
+    return
 }
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # make sure record-btrace can be enabled after re-run
 clean_restart $testfile
 if {![runto_main]} {
-    return -1
+    return
 }
 gdb_test_no_output "record btrace" "enable after restart"
 if {![runto_main]} {
-    return -1
+    return
 }
 gdb_test_no_output "record btrace" "enable after re-run"
diff --git a/gdb/testsuite/gdb.btrace/event-tracing-gap.exp b/gdb/testsuite=
/gdb.btrace/event-tracing-gap.exp
index b21ab93033a..b821126bda2 100644
--- a/gdb/testsuite/gdb.btrace/event-tracing-gap.exp
+++ b/gdb/testsuite/gdb.btrace/event-tracing-gap.exp
@@ -22,11 +22,11 @@ require allow_btrace_pt_event_trace_tests
 standard_testfile
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 gdb_test_no_output "set record btrace pt event-tracing on"
diff --git a/gdb/testsuite/gdb.btrace/event-tracing.exp b/gdb/testsuite/gdb=
.btrace/event-tracing.exp
index f41ebdb116e..df4086e0724 100644
--- a/gdb/testsuite/gdb.btrace/event-tracing.exp
+++ b/gdb/testsuite/gdb.btrace/event-tracing.exp
@@ -22,11 +22,11 @@ require allow_btrace_pt_event_trace_tests
 standard_testfile null-deref.c
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 gdb_test_no_output "set record btrace pt event-tracing on"
diff --git a/gdb/testsuite/gdb.btrace/exception.exp b/gdb/testsuite/gdb.btr=
ace/exception.exp
index 2ad6bbcdbe7..cf92dfa4a3e 100644
--- a/gdb/testsuite/gdb.btrace/exception.exp
+++ b/gdb/testsuite/gdb.btrace/exception.exp
@@ -24,11 +24,11 @@ require allow_btrace_tests
 standard_testfile exception.cc
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {nopie c++ debug}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # we want to see the full trace for this test
diff --git a/gdb/testsuite/gdb.btrace/function_call_history.exp b/gdb/tests=
uite/gdb.btrace/function_call_history.exp
index a8706a9e608..15098e32016 100644
--- a/gdb/testsuite/gdb.btrace/function_call_history.exp
+++ b/gdb/testsuite/gdb.btrace/function_call_history.exp
@@ -23,11 +23,11 @@ require allow_btrace_tests
 # PIE on 32-bit.
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile {} {nopie debug}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # start btrace
@@ -227,7 +227,7 @@ gdb_test "record function-call-history /c 21, +11" [mul=
ti_line \
=20
 # make sure we can handle incomplete trace with respect to indentation
 if {![runto_main]} {
-    return -1
+    return
 }
 # navigate to the fib in line 24 above
 gdb_breakpoint fib
diff --git a/gdb/testsuite/gdb.btrace/gcore.exp b/gdb/testsuite/gdb.btrace/=
gcore.exp
index 6a8730c53a7..d1766f5a5b9 100644
--- a/gdb/testsuite/gdb.btrace/gcore.exp
+++ b/gdb/testsuite/gdb.btrace/gcore.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
=20
 standard_testfile record_goto.c
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # trace the call to the test function
diff --git a/gdb/testsuite/gdb.btrace/instruction_history.exp b/gdb/testsui=
te/gdb.btrace/instruction_history.exp
index f61f5786cb2..fc8bf8f0f4b 100644
--- a/gdb/testsuite/gdb.btrace/instruction_history.exp
+++ b/gdb/testsuite/gdb.btrace/instruction_history.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
=20
 standard_testfile .c .S
 if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2=
" {debug}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # set bp before loop and continue
diff --git a/gdb/testsuite/gdb.btrace/multi-inferior.exp b/gdb/testsuite/gd=
b.btrace/multi-inferior.exp
index 50a3df416d4..ff338c21a35 100644
--- a/gdb/testsuite/gdb.btrace/multi-inferior.exp
+++ b/gdb/testsuite/gdb.btrace/multi-inferior.exp
@@ -31,14 +31,14 @@ require !use_gdb_stub
=20
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile {} {debug}]} {
-    return -1
+    return
 }
=20
 set host_binfile [gdb_remote_download host $binfile]
=20
 with_test_prefix "inferior 1" {
     if {![runto_main]} {
-	return -1
+	return
     }
 }
=20
@@ -48,7 +48,7 @@ with_test_prefix "inferior 2" {
     gdb_test "inferior 2" "Switching to inferior 2.*"
=20
     if {![runto_main]} {
-	return -1
+	return
     }
=20
     gdb_test_no_output "record btrace"
diff --git a/gdb/testsuite/gdb.btrace/multi-thread-step.exp b/gdb/testsuite=
/gdb.btrace/multi-thread-step.exp
index 2b851c415f8..ee43cfcf209 100644
--- a/gdb/testsuite/gdb.btrace/multi-thread-step.exp
+++ b/gdb/testsuite/gdb.btrace/multi-thread-step.exp
@@ -22,12 +22,12 @@ require allow_btrace_tests
 standard_testfile
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable=
 {debug}] !=3D "" } {
     untested "failed to prepare"
-    return -1
+    return
 }
 clean_restart $testfile
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # set up breakpoints
diff --git a/gdb/testsuite/gdb.btrace/nohist.exp b/gdb/testsuite/gdb.btrace=
/nohist.exp
index b2c53caa164..50587954165 100644
--- a/gdb/testsuite/gdb.btrace/nohist.exp
+++ b/gdb/testsuite/gdb.btrace/nohist.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
=20
 standard_testfile record_goto.c
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 proc check_not_replaying {} {
diff --git a/gdb/testsuite/gdb.btrace/non-stop.exp b/gdb/testsuite/gdb.btra=
ce/non-stop.exp
index 7f9050753cc..c27eab81450 100644
--- a/gdb/testsuite/gdb.btrace/non-stop.exp
+++ b/gdb/testsuite/gdb.btrace/non-stop.exp
@@ -20,7 +20,7 @@ require allow_btrace_tests
 standard_testfile
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable=
 {debug}] !=3D "" } {
     untested "failed to prepare"
-    return -1
+    return
 }
=20
 save_vars { GDBFLAGS } {
@@ -29,7 +29,7 @@ save_vars { GDBFLAGS } {
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # set up breakpoints
diff --git a/gdb/testsuite/gdb.btrace/ptwrite.exp b/gdb/testsuite/gdb.btrac=
e/ptwrite.exp
index b440bd12e7c..344683ca0b8 100644
--- a/gdb/testsuite/gdb.btrace/ptwrite.exp
+++ b/gdb/testsuite/gdb.btrace/ptwrite.exp
@@ -33,16 +33,16 @@ if {[info exists COMPILE]} {
     }
 } else {
     unsupported "target architecture not supported"
-    return -1
+    return
 }
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $opts]} {
-    return -1
+    return
 }
=20
 if { ![runto_main] } {
     untested "failed to run to main"
-    return -1
+    return
 }
=20
 ### 1. Default testrun
diff --git a/gdb/testsuite/gdb.btrace/reconnect.exp b/gdb/testsuite/gdb.btr=
ace/reconnect.exp
index 0acb0a794ed..0a00c6aff40 100644
--- a/gdb/testsuite/gdb.btrace/reconnect.exp
+++ b/gdb/testsuite/gdb.btrace/reconnect.exp
@@ -24,7 +24,7 @@ require allow_gdbserver_tests
=20
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
=20
 set target_binfile [gdb_remote_download target $binfile]
diff --git a/gdb/testsuite/gdb.btrace/record_goto-step.exp b/gdb/testsuite/=
gdb.btrace/record_goto-step.exp
index 155d0dfc3e7..f699fd9c823 100644
--- a/gdb/testsuite/gdb.btrace/record_goto-step.exp
+++ b/gdb/testsuite/gdb.btrace/record_goto-step.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
=20
 standard_testfile record_goto.c
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 set bp [gdb_get_line_number "fun4.3" $srcfile]
diff --git a/gdb/testsuite/gdb.btrace/record_goto.exp b/gdb/testsuite/gdb.b=
trace/record_goto.exp
index 1c8898bdf68..f66d0789439 100644
--- a/gdb/testsuite/gdb.btrace/record_goto.exp
+++ b/gdb/testsuite/gdb.btrace/record_goto.exp
@@ -40,15 +40,15 @@ if {[info exists COMPILE]} {
 	}
 } else {
     unsupported "target architecture not supported"
-    return -1
+    return
 }
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $opts]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # When GDB prints the file for a stop location, it may print the full path
diff --git a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp b/gdb/testsuite/gdb.bt=
race/rn-dl-bind.exp
index e72107df4c3..95454353298 100644
--- a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
+++ b/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
@@ -26,11 +26,11 @@ require allow_btrace_tests
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {debug ldflags=3D-Wl,-z,lazy}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # trace the code for the call to test
diff --git a/gdb/testsuite/gdb.btrace/segv.exp b/gdb/testsuite/gdb.btrace/s=
egv.exp
index 499d641c7e5..e21aecea9d8 100644
--- a/gdb/testsuite/gdb.btrace/segv.exp
+++ b/gdb/testsuite/gdb.btrace/segv.exp
@@ -21,10 +21,10 @@ require allow_btrace_tests
=20
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # trace the test code
diff --git a/gdb/testsuite/gdb.btrace/step.exp b/gdb/testsuite/gdb.btrace/s=
tep.exp
index ba7aefd8112..4ba763db018 100644
--- a/gdb/testsuite/gdb.btrace/step.exp
+++ b/gdb/testsuite/gdb.btrace/step.exp
@@ -21,11 +21,11 @@ require allow_btrace_tests
=20
 standard_testfile record_goto.c
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # Trace the call to the test function.
diff --git a/gdb/testsuite/gdb.btrace/stepi.exp b/gdb/testsuite/gdb.btrace/=
stepi.exp
index 86035f9cdc5..2f0162d6aa4 100644
--- a/gdb/testsuite/gdb.btrace/stepi.exp
+++ b/gdb/testsuite/gdb.btrace/stepi.exp
@@ -38,15 +38,15 @@ if {[info exists COMPILE]} {
 	}
 } else {
     unsupported "target architecture not supported"
-    return -1
+    return
 }
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
=20
diff --git a/gdb/testsuite/gdb.btrace/tailcall-only.exp b/gdb/testsuite/gdb=
.btrace/tailcall-only.exp
index f26055fb2fd..5e69f111109 100644
--- a/gdb/testsuite/gdb.btrace/tailcall-only.exp
+++ b/gdb/testsuite/gdb.btrace/tailcall-only.exp
@@ -42,15 +42,15 @@ if {[info exists COMPILE]} {
 	}
 } else {
     unsupported "target architecture not supported"
-    return -1
+    return
 }
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $opts]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # we want to see the full trace for this test
diff --git a/gdb/testsuite/gdb.btrace/tailcall.exp b/gdb/testsuite/gdb.btra=
ce/tailcall.exp
index 4a940c1d9e7..b52024c3f82 100644
--- a/gdb/testsuite/gdb.btrace/tailcall.exp
+++ b/gdb/testsuite/gdb.btrace/tailcall.exp
@@ -39,14 +39,14 @@ if {[info exists COMPILE]} {
 	}
 } else {
     unsupported "target architecture not supported"
-    return -1
+    return
 }
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $opts]} {
-    return -1
+    return
 }
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # When GDB prints the file for a stop location, it may print the full path
diff --git a/gdb/testsuite/gdb.btrace/tsx.exp b/gdb/testsuite/gdb.btrace/ts=
x.exp
index 4aaf2301994..84980bafb81 100644
--- a/gdb/testsuite/gdb.btrace/tsx.exp
+++ b/gdb/testsuite/gdb.btrace/tsx.exp
@@ -19,11 +19,11 @@ require allow_btrace_pt_tests allow_tsx_tests
=20
 standard_testfile .c x86-tsx.S
 if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2=
" {debug}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # record the test
diff --git a/gdb/testsuite/gdb.btrace/unknown_functions.exp b/gdb/testsuite=
/gdb.btrace/unknown_functions.exp
index c6037c153ae..a3c891d1a35 100644
--- a/gdb/testsuite/gdb.btrace/unknown_functions.exp
+++ b/gdb/testsuite/gdb.btrace/unknown_functions.exp
@@ -27,11 +27,11 @@ standard_testfile
 # Also discard local symbols.
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {ldflags=3D-Wl,-x nopie}]} {
-    return -1
+    return
 }
=20
 if {![runto test]} {
-    return -1
+    return
 }
=20
 # we want to see the full trace for this test
diff --git a/gdb/testsuite/gdb.btrace/vdso.exp b/gdb/testsuite/gdb.btrace/v=
dso.exp
index cd5d4aad8f9..d21290b38a9 100644
--- a/gdb/testsuite/gdb.btrace/vdso.exp
+++ b/gdb/testsuite/gdb.btrace/vdso.exp
@@ -24,11 +24,11 @@ require allow_btrace_tests
=20
 standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # capture the disassembly of gettimeofday while live debugging
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-anonymous.exp b/gdb/te=
stsuite/gdb.compile/compile-cplus-anonymous.exp
index 06c66ff2603..29646000e51 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-anonymous.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-anonymous.exp
@@ -27,18 +27,18 @@ require allow_compile_tests
=20
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
 gdb_continue_to_breakpoint "testing location"
=20
 if {[skip_compile_feature_untested "var =3D 0"]} {
-    return -1
+    return
 }
=20
 # Reminder, "var" is an integer; all these types get converted to `int'.
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp b/gdb/=
testsuite/gdb.compile/compile-cplus-array-decay.exp
index c38819e2932..23b03b4d7f6 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-array-decay.exp
@@ -27,15 +27,15 @@ require allow_compile_tests
=20
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++ additional_flags=3D-std=3Dc++11}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 if {[skip_compile_feature_untested]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp b/gdb/test=
suite/gdb.compile/compile-cplus-inherit.exp
index 9ae68235a7c..2bf0a5dec68 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-inherit.exp
@@ -27,18 +27,18 @@ require allow_compile_tests
=20
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
 gdb_continue_to_breakpoint "testing location"
=20
 if {[skip_compile_feature_untested "var =3D 0"]} {
-    return -1
+    return
 }
=20
 CompileExpression::new "var"
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-member.exp b/gdb/tests=
uite/gdb.compile/compile-cplus-member.exp
index 649ac46e24f..a499fcb2ba6 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-member.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-member.exp
@@ -27,18 +27,18 @@ require allow_compile_tests
=20
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
 gdb_continue_to_breakpoint "testing location"
=20
 if {[skip_compile_feature_untested "var =3D 0"]} {
-    return -1
+    return
 }
=20
 CompileExpression::new "var"
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-method.exp b/gdb/tests=
uite/gdb.compile/compile-cplus-method.exp
index 8760aab0e6b..a14e71b4ba3 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-method.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-method.exp
@@ -27,18 +27,18 @@ require allow_compile_tests
=20
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
 gdb_continue_to_breakpoint "testing location"
=20
 if {[skip_compile_feature_untested "var =3D 0"]} {
-    return -1
+    return
 }
=20
 CompileExpression::new "var"
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp b/gdb/te=
stsuite/gdb.compile/compile-cplus-namespace.exp
index ac5913718a1..bc3d71a2478 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-namespace.exp
@@ -27,18 +27,18 @@ require allow_compile_tests
=20
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
 gdb_continue_to_breakpoint "testing location"
=20
 if {[skip_compile_feature_untested "var =3D 0"]} {
-    return -1
+    return
 }
=20
 CompileExpression::new "var"
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-nested.exp b/gdb/tests=
uite/gdb.compile/compile-cplus-nested.exp
index 941a17a3688..c63f008ac0c 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-nested.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-nested.exp
@@ -27,18 +27,18 @@ require allow_compile_tests
=20
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
 gdb_continue_to_breakpoint "testing location"
=20
 if {[skip_compile_feature_untested "var =3D 0"]} {
-    return -1
+    return
 }
=20
 CompileExpression::new "var"
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-print.exp b/gdb/testsu=
ite/gdb.compile/compile-cplus-print.exp
index 9e809aa957a..9ad61184691 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-print.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-print.exp
@@ -32,17 +32,17 @@ set srcfilesoptions [list ${srcfile} ${options}]
=20
 if { [build_executable_from_specs $testfile.exp $testfile $options \
 	  {*}$srcfilesoptions] } {
-    return -1
+    return
 }
=20
 clean_restart ${testfile}
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 if {[skip_compile_feature_untested]} {
-    return -1
+    return
 }
=20
 gdb_test_no_output "set language c++" \
diff --git a/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp b/gdb/test=
suite/gdb.compile/compile-cplus-virtual.exp
index 117b353a87d..2f19abcf9e7 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus-virtual.exp
@@ -27,18 +27,18 @@ require allow_compile_tests
=20
 if {[prepare_for_testing $testfile $testfile $srcfile \
 	 {debug nowarnings c++}]} {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "break here" $srcfile]
 gdb_continue_to_breakpoint "testing location"
=20
 if {[skip_compile_feature_untested "var =3D 0"]} {
-    return -1
+    return
 }
=20
 CompileExpression::new "var"
diff --git a/gdb/testsuite/gdb.compile/compile-cplus.exp b/gdb/testsuite/gd=
b.compile/compile-cplus.exp
index 443a2e89a92..80967915301 100644
--- a/gdb/testsuite/gdb.compile/compile-cplus.exp
+++ b/gdb/testsuite/gdb.compile/compile-cplus.exp
@@ -42,7 +42,7 @@ lappend srcfilesoptions $srcfile4 $srcfile4options
=20
 if { [build_executable_from_specs $testfile.exp $testfile $options \
 	  {*}$srcfilesoptions] } {
-    return -1
+    return
 }
=20
 clean_restart ${testfile}
@@ -55,14 +55,14 @@ gdb_test_no_output "set language c++" \
     "Set language to C++"
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "break-here"]
 gdb_continue_to_breakpoint "break-here" ".* break-here .*"
=20
 if {[skip_compile_feature_untested "var =3D 0"]} {
-    return -1
+    return
 }
=20
 #
diff --git a/gdb/testsuite/gdb.compile/compile-ifunc.exp b/gdb/testsuite/gd=
b.compile/compile-ifunc.exp
index 024c37e42a2..e1cc7aee211 100644
--- a/gdb/testsuite/gdb.compile/compile-ifunc.exp
+++ b/gdb/testsuite/gdb.compile/compile-ifunc.exp
@@ -32,11 +32,11 @@ with_test_prefix "nodebug" {
=20
     if { [prepare_for_testing "failed to prepare" "$testfile-nodebug" \
 	      $srcfile $flags] } {
-	return -1
+	return
     }
=20
     if {![runto_main]} {
-	return -1
+	return
     }
=20
     # This binary has no debug information, so force the language to C in =
case
@@ -46,7 +46,7 @@ with_test_prefix "nodebug" {
     gdb_test_no_output "set language c" ""
=20
     if {[skip_compile_feature_untested]} {
-	return -1
+	return
     }
=20
     gdb_test "compile code resultvar =3D gnu_ifunc (10);" \
@@ -62,11 +62,11 @@ with_test_prefix "debug" {
=20
     if { [prepare_for_testing "failed to prepare" "$testfile-debug" \
 	      $srcfile "debug $flags"] } {
-	return -1
+	return
     }
=20
     if {![runto_main]} {
-	return -1
+	return
     }
     # gnu_ifunc (10): error: too many arguments to function 'gnu_ifunc'
     gdb_test "compile code resultvar =3D gnu_ifunc_alias (10);" \
diff --git a/gdb/testsuite/gdb.compile/compile-ops.exp b/gdb/testsuite/gdb.=
compile/compile-ops.exp
index 7ea2bb17f6a..c5c921f8b04 100644
--- a/gdb/testsuite/gdb.compile/compile-ops.exp
+++ b/gdb/testsuite/gdb.compile/compile-ops.exp
@@ -358,7 +358,7 @@ set program [subst_vars {
 }]
=20
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
=20
 # Make some DWARF for the test.
@@ -413,15 +413,15 @@ Dwarf::assemble $asm_file {
=20
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
=20
 if {![runto func]} {
-    return -1
+    return
 }
=20
 if {[skip_compile_feature_untested]} {
-    return -1
+    return
 }
=20
 # If we have a bug, this will hang.
diff --git a/gdb/testsuite/gdb.compile/compile-print.exp b/gdb/testsuite/gd=
b.compile/compile-print.exp
index 77bf7d894d2..a65096a663e 100644
--- a/gdb/testsuite/gdb.compile/compile-print.exp
+++ b/gdb/testsuite/gdb.compile/compile-print.exp
@@ -22,15 +22,15 @@ require is_c_compiler_gcc
 require allow_compile_tests
=20
 if { [prepare_for_testing "failed to prepare" "$testfile"] } {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 if {[skip_compile_feature_untested]} {
-    return -1
+    return
 }
=20
 gdb_test "compile print varint" " =3D 10"
diff --git a/gdb/testsuite/gdb.compile/compile-setjmp.exp b/gdb/testsuite/g=
db.compile/compile-setjmp.exp
index d4b17bfc996..9d2c47f7bc8 100644
--- a/gdb/testsuite/gdb.compile/compile-setjmp.exp
+++ b/gdb/testsuite/gdb.compile/compile-setjmp.exp
@@ -22,15 +22,15 @@ require is_c_compiler_gcc
 require allow_compile_tests
=20
 if { [prepare_for_testing "failed to prepare" $testfile] } {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 if {[skip_compile_feature_untested]} {
-    return -1
+    return
 }
=20
 gdb_test_no_output "compile file -r ${srcdir}/${subdir}/$srcfile2" \
diff --git a/gdb/testsuite/gdb.compile/compile-tls.exp b/gdb/testsuite/gdb.=
compile/compile-tls.exp
index 7685d97a118..d18ef837996 100644
--- a/gdb/testsuite/gdb.compile/compile-tls.exp
+++ b/gdb/testsuite/gdb.compile/compile-tls.exp
@@ -23,7 +23,7 @@ require allow_compile_tests
=20
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable {debug}] !=3D "" } {
-    return -1
+    return
 }
=20
 clean_restart ${::testfile}
@@ -32,7 +32,7 @@ if {![runto_main]} {
 }
=20
 if {[skip_compile_feature_untested]} {
-    return -1
+    return
 }
=20
 gdb_test "compile code local_scope =3D 1" \
diff --git a/gdb/testsuite/gdb.compile/compile.exp b/gdb/testsuite/gdb.comp=
ile/compile.exp
index 0522c3c3770..4429f653a63 100644
--- a/gdb/testsuite/gdb.compile/compile.exp
+++ b/gdb/testsuite/gdb.compile/compile.exp
@@ -34,7 +34,7 @@ if { $srcfile3 !=3D "" } {
 lappend srcfilesoptions $srcfile4 "nodebug"
 if { [build_executable_from_specs $testfile.exp $testfile $options \
 	  {*}$srcfilesoptions] } {
-    return -1
+    return
 }
=20
 clean_restart ${testfile}
@@ -55,11 +55,11 @@ gdb_test "compile file -r ${srcdir}/${subdir}/${testfil=
e}-mod.c" \
     "test compile file command without running inferior"
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 if {[skip_compile_feature_untested]} {
-    return -1
+    return
 }
=20
 #
@@ -386,14 +386,14 @@ set binfile [standard_output_file $testfile]
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile2} $libbin {debug}] !=
=3D ""
      || [gdb_compile ${srcdir}/${subdir}/${srcfile} $binfile executable \
 	     [list debug shlib=3D$libbin]] =3D=3D -1 } {
-    return -1
+    return
 }
=20
 clean_restart $testfile
 gdb_load_shlib $libbin
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 gdb_test_no_output "compile code shlib_func ();" "call shared library func=
tion"
diff --git a/gdb/testsuite/gdb.ctf/dwarf2-and-ctf.exp b/gdb/testsuite/gdb.c=
tf/dwarf2-and-ctf.exp
index 020d1742529..b3d2b3583d7 100644
--- a/gdb/testsuite/gdb.ctf/dwarf2-and-ctf.exp
+++ b/gdb/testsuite/gdb.ctf/dwarf2-and-ctf.exp
@@ -27,21 +27,21 @@ set opts {}
 lappend opts debug
 if { [gdb_compile $s1 ${objfile} object $opts] !=3D "" } {
     untested "failed to compile"
-    return -1
+    return
 }
=20
 set opts {}
 lappend opts "additional_flags=3D-gctf"
 if { [gdb_compile $s2 ${objfile2} object $opts] !=3D "" } {
     untested "failed to compile"
-    return -1
+    return
 }
=20
 set opts {}
 lappend opts "additional_flags=3D-Wl,-ctf-variables"
 if { [gdb_compile [list ${objfile} ${objfile2}] $binfile executable $opts]=
 !=3D "" } {
     unsupported "failed to link"
-    return -1
+    return
 }
=20
 clean_restart
diff --git a/gdb/testsuite/gdb.dap/catch-unhandled.exp b/gdb/testsuite/gdb.=
dap/catch-unhandled.exp
index fae071a11ac..399d73c914a 100644
--- a/gdb/testsuite/gdb.dap/catch-unhandled.exp
+++ b/gdb/testsuite/gdb.dap/catch-unhandled.exp
@@ -21,7 +21,7 @@ require allow_ada_tests allow_dap_tests gnat_runtime_has_=
debug_info
 standard_ada_testfile prog
=20
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] !=3D ""} {
-    return -1
+    return
 }
=20
 if {[dap_initialize] =3D=3D ""} {
diff --git a/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp b/g=
db/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
index 4fabc9931b4..eae60901329 100644
--- a/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
+++ b/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
@@ -27,7 +27,7 @@ require allow_debuginfod_tests
=20
 if {[build_executable "build executable" ${testfile} ${srcfile} \
 	 {debug build-id}] =3D=3D -1} {
-    return -1
+    return
 }
=20
 # Split debug information from BINFILE into BINFILE.debug.
@@ -37,7 +37,7 @@ if {[build_executable "build executable" ${testfile} ${sr=
cfile} \
 # information by GDB will need to be done based on the build-id.
 if {[gdb_gnu_strip_debug $binfile no-debuglink]} {
     unsupported "cannot produce separate debug info files"
-    return -1
+    return
 }
=20
 # Get the .build-id/PREFIX/SUFFIX.debug file name, and convert it to
diff --git a/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp b/gdb/testsuite/=
gdb.debuginfod/crc_mismatch.exp
index ce154044a38..35f91bff261 100644
--- a/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp
+++ b/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp
@@ -28,7 +28,7 @@ require allow_debuginfod_tests
=20
 if {[build_executable "build executable" $testfile $srcfile debug] =3D=3D =
-1} {
     untested "failed to compile"
-    return -1
+    return
 }
=20
 # The procedure gdb_gnu_strip_debug will produce an executable called
@@ -38,7 +38,7 @@ if {[build_executable "build executable" $testfile $srcfi=
le debug] =3D=3D -1} {
 if {[gdb_gnu_strip_debug $binfile]} {
     # Check that you have a recent version of strip and objcopy installed.
     unsupported "cannot produce separate debug info files"
-    return -1
+    return
 }
=20
 set debugfile [standard_output_file ${testfile}.debug]
diff --git a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp b/gdb/t=
estsuite/gdb.debuginfod/fetch_src_and_symbols.exp
index 6a79ceaa606..e7c2f524abe 100644
--- a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
+++ b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
@@ -29,17 +29,17 @@ set outputdir [standard_output_file {}]
 if { [catch {file copy -force ${srcdir}/${subdir}/${srcfile} \
 	     [standard_output_file ${sourcetmp}]}] !=3D 0 } {
     error "create temporary file"
-    return -1
+    return
 }
=20
 if { [gdb_compile "$sourcetmp" "$binfile" executable {debug build-id}] !=
=3D "" } {
     untested "failed to compile"
-    return -1
+    return
 }
=20
 if { [gdb_compile "$sourcetmp" "${binfile}2" executable {debug build-id}] =
!=3D "" } {
     fail "compile"
-    return -1
+    return
 }
=20
 # Write some assembly that just has a .gnu_debugaltlink section.
diff --git a/gdb/testsuite/gdb.disasm/am33.exp b/gdb/testsuite/gdb.disasm/a=
m33.exp
index 878b462754a..32a61a2c1e7 100644
--- a/gdb/testsuite/gdb.disasm/am33.exp
+++ b/gdb/testsuite/gdb.disasm/am33.exp
@@ -24,7 +24,7 @@ set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" object ""] !=3D "" } {
      untested "failed to compile"
-     return -1
+     return
 }
=20
 proc call_tests { } {
diff --git a/gdb/testsuite/gdb.disasm/basics.exp b/gdb/testsuite/gdb.disasm=
/basics.exp
index cca864bbbd2..e2596dc5e2c 100644
--- a/gdb/testsuite/gdb.disasm/basics.exp
+++ b/gdb/testsuite/gdb.disasm/basics.exp
@@ -19,11 +19,11 @@
 standard_testfile
=20
 if { [prepare_for_testing "failed to prepare" $testfile ${srcfile}] =3D=3D=
 -1 } {
-    return -1
+    return
 }
=20
 if {![runto_main]} {
-    return -1
+    return
 }
=20
 # Check the '/s' and '/m' flags can't be used together.
diff --git a/gdb/testsuite/gdb.disasm/h8300s.exp b/gdb/testsuite/gdb.disasm=
/h8300s.exp
index b9852454aa4..78e1704b1ca 100644
--- a/gdb/testsuite/gdb.disasm/h8300s.exp
+++ b/gdb/testsuite/gdb.disasm/h8300s.exp
@@ -23,7 +23,7 @@ set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable {debug additional_=
flags=3D-ms}] !=3D "" } {
      untested "failed to compile"
-     return -1
+     return
 }
=20
 proc all_set_machine_h8300s { } {
diff --git a/gdb/testsuite/gdb.disasm/hppa.exp b/gdb/testsuite/gdb.disasm/h=
ppa.exp
index c8e27614cee..957ccb3b1bd 100644
--- a/gdb/testsuite/gdb.disasm/hppa.exp
+++ b/gdb/testsuite/gdb.disasm/hppa.exp
@@ -28,7 +28,7 @@ if  { $comp_output !=3D "" } {
 	return
     } else {
 	perror "Couldn't compile ${srcfile}"
-	return -1
+	return
     }
 }
=20
diff --git a/gdb/testsuite/gdb.disasm/mn10300.exp b/gdb/testsuite/gdb.disas=
m/mn10300.exp
index 699905ec3b1..75d3df78938 100644
--- a/gdb/testsuite/gdb.disasm/mn10300.exp
+++ b/gdb/testsuite/gdb.disasm/mn10300.exp
@@ -24,7 +24,7 @@ set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable ""] !=3D "" } {
      untested "failed to compile"
-     return -1
+     return
 }
=20
 proc add_tests { } {
diff --git a/gdb/testsuite/gdb.disasm/sh3.exp b/gdb/testsuite/gdb.disasm/sh=
3.exp
index 9873abce9dc..f85594b8ff2 100644
--- a/gdb/testsuite/gdb.disasm/sh3.exp
+++ b/gdb/testsuite/gdb.disasm/sh3.exp
@@ -23,7 +23,7 @@ set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable ""] !=3D "" } {
      untested "failed to compile"
-     return -1
+     return
 }
=20
 proc all_fp_move_and_load_tests { } {
diff --git a/gdb/testsuite/gdb.disasm/t01_mov.exp b/gdb/testsuite/gdb.disas=
m/t01_mov.exp
index 18455eb124c..c344d826a35 100644
--- a/gdb/testsuite/gdb.disasm/t01_mov.exp
+++ b/gdb/testsuite/gdb.disasm/t01_mov.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
=20
 if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
=20
 if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
-     return -1
+     return
 }
=20
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t02_mova.exp b/gdb/testsuite/gdb.disa=
sm/t02_mova.exp
index 2015c969851..24ae8422c6a 100644
--- a/gdb/testsuite/gdb.disasm/t02_mova.exp
+++ b/gdb/testsuite/gdb.disasm/t02_mova.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
=20
 if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
=20
 if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
-     return -1
+     return
 }
=20
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t03_add.exp b/gdb/testsuite/gdb.disas=
m/t03_add.exp
index 34171a0f277..ac3d96dd9b1 100644
--- a/gdb/testsuite/gdb.disasm/t03_add.exp
+++ b/gdb/testsuite/gdb.disasm/t03_add.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
=20
 if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
=20
 if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
-     return -1
+     return
 }
=20
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t04_sub.exp b/gdb/testsuite/gdb.disas=
m/t04_sub.exp
index a291220bfd8..917c5c714b7 100644
--- a/gdb/testsuite/gdb.disasm/t04_sub.exp
+++ b/gdb/testsuite/gdb.disasm/t04_sub.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
=20
 if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
=20
 if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
-     return -1
+     return
 }
=20
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t05_cmp.exp b/gdb/testsuite/gdb.disas=
m/t05_cmp.exp
index 08a722d0e94..3887e691548 100644
--- a/gdb/testsuite/gdb.disasm/t05_cmp.exp
+++ b/gdb/testsuite/gdb.disasm/t05_cmp.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
=20
 if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
=20
 if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
-     return -1
+     return
 }
=20
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t06_ari2.exp b/gdb/testsuite/gdb.disa=
sm/t06_ari2.exp
index be9bbf8c9b5..e12db1e908a 100644
--- a/gdb/testsuite/gdb.disasm/t06_ari2.exp
+++ b/gdb/testsuite/gdb.disasm/t06_ari2.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
=20
 if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
=20
 if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
-     return -1
+     return
 }
=20
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t07_ari3.exp b/gdb/testsuite/gdb.disa=
sm/t07_ari3.exp
index 9b175be2fa9..fb55055f7fc 100644
--- a/gdb/testsuite/gdb.disasm/t07_ari3.exp
+++ b/gdb/testsuite/gdb.disasm/t07_ari3.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
=20
 if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
=20
 if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
-     return -1
+     return
 }
=20
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t08_or.exp b/gdb/testsuite/gdb.disasm=
/t08_or.exp
index 3d46ab37fe7..fa083f92a50 100644
--- a/gdb/testsuite/gdb.disasm/t08_or.exp
+++ b/gdb/testsuite/gdb.disasm/t08_or.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
=20
 if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
=20
 if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
-     return -1
+     return
 }
=20
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t09_xor.exp b/gdb/testsuite/gdb.disas=
m/t09_xor.exp
index 57622deec96..430ab662ab6 100644
--- a/gdb/testsuite/gdb.disasm/t09_xor.exp
+++ b/gdb/testsuite/gdb.disasm/t09_xor.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
=20
 if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
=20
 if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
-     return -1
+     return
 }
=20
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t10_and.exp b/gdb/testsuite/gdb.disas=
m/t10_and.exp
index 2d4dc4376ac..e702ef0c4d3 100644
--- a/gdb/testsuite/gdb.disasm/t10_and.exp
+++ b/gdb/testsuite/gdb.disasm/t10_and.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
=20
 if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
=20
 if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
-     return -1
+     return
 }
=20
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t11_logs.exp b/gdb/testsuite/gdb.disa=
sm/t11_logs.exp
index 9bdc363e476..fc28e2c4fb7 100644
--- a/gdb/testsuite/gdb.disasm/t11_logs.exp
+++ b/gdb/testsuite/gdb.disasm/t11_logs.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
=20
 if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
=20
 if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
-     return -1
+     return
 }
=20
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t12_bit.exp b/gdb/testsuite/gdb.disas=
m/t12_bit.exp
index f1df5a0bd2e..e335f7b30ae 100644
--- a/gdb/testsuite/gdb.disasm/t12_bit.exp
+++ b/gdb/testsuite/gdb.disasm/t12_bit.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
=20
 if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
=20
 if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
-     return -1
+     return
 }
=20
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t13_otr.exp b/gdb/testsuite/gdb.disas=
m/t13_otr.exp
index 8ee990ed074..e36b7b492cb 100644
--- a/gdb/testsuite/gdb.disasm/t13_otr.exp
+++ b/gdb/testsuite/gdb.disasm/t13_otr.exp
@@ -29,12 +29,12 @@ set link-flags "-m h8300sxelf"
=20
 if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
-     return -1
+     return
 }
=20
 if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
-     return -1
+     return
 }
=20
 gdb_start
diff --git a/gdb/testsuite/gdb.dlang/circular.exp b/gdb/testsuite/gdb.dlang=
/circular.exp
index 87148e2e0c6..c6c4dcb3af9 100644
--- a/gdb/testsuite/gdb.dlang/circular.exp
+++ b/gdb/testsuite/gdb.dlang/circular.exp
@@ -127,13 +127,13 @@ Dwarf::assemble $asm_file {
=20
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
=20
 gdb_test_no_output "set language d"
=20
 if {![runto "circular1.found"]} {
-    return -1
+    return
 }
=20
 # This last test shouldn't timeout.
diff --git a/gdb/testsuite/gdb.dlang/dlang-start-2.exp b/gdb/testsuite/gdb.=
dlang/dlang-start-2.exp
index 95764e68f35..368db31a015 100644
--- a/gdb/testsuite/gdb.dlang/dlang-start-2.exp
+++ b/gdb/testsuite/gdb.dlang/dlang-start-2.exp
@@ -70,13 +70,13 @@ Dwarf::assemble $asm_file {
=20
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
=20
 # Verify that "start" lands inside the right procedure.
 if {[gdb_start_cmd] < 0} {
     unsupported "start failed"
-    return -1
+    return
 }
=20
 gdb_test "" \
diff --git a/gdb/testsuite/gdb.dlang/dlang-start.exp b/gdb/testsuite/gdb.dl=
ang/dlang-start.exp
index c0eca57cddf..b3271c850b2 100644
--- a/gdb/testsuite/gdb.dlang/dlang-start.exp
+++ b/gdb/testsuite/gdb.dlang/dlang-start.exp
@@ -25,13 +25,13 @@ require !use_gdb_stub
=20
 standard_testfile simple.d
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug d}]=
} {
-    return -1
+    return
 }
=20
 # Verify that "start" lands inside the right procedure.
 if {[gdb_start_cmd] < 0} {
     unsupported "start failed"
-    return -1
+    return
 }
=20
 gdb_test "" \
diff --git a/gdb/testsuite/gdb.dlang/watch-loc.exp b/gdb/testsuite/gdb.dlan=
g/watch-loc.exp
index 139fe8f0579..b61a444d54f 100644
--- a/gdb/testsuite/gdb.dlang/watch-loc.exp
+++ b/gdb/testsuite/gdb.dlang/watch-loc.exp
@@ -69,13 +69,13 @@ Dwarf::assemble $asm_file {
=20
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
=20
 gdb_test_no_output "set language d"
=20
 if {![runto "_Dmain"]} {
-    return -1
+    return
 }
=20
 # watch -l will rewrite the expression to "*(watch.tstruct *) 0x12345",
diff --git a/gdb/testsuite/gdb.dwarf2/fission-dw-form-strx.exp b/gdb/testsu=
ite/gdb.dwarf2/fission-dw-form-strx.exp
index c2ca03a6693..38c77084e58 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-dw-form-strx.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-dw-form-strx.exp
@@ -78,7 +78,7 @@ set obj [standard_output_file "${testfile}-dw.o"]
 if {[build_executable_and_dwo_files "$testfile.exp" "${binfile}" {nodebug}=
 \
 	 [list $asm_file [list nodebug split-dwo] $obj] \
 	 [list $srcfile  [list nodebug]]]} {
-    return -1
+    return
 }
=20
 clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.fortran/allocated.exp b/gdb/testsuite/gdb.fo=
rtran/allocated.exp
index 4d3687afeea..bffe33a9289 100644
--- a/gdb/testsuite/gdb.fortran/allocated.exp
+++ b/gdb/testsuite/gdb.fortran/allocated.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 # Avoid libc symbols, in particular the 'array' type.
diff --git a/gdb/testsuite/gdb.fortran/array-bounds-high.exp b/gdb/testsuit=
e/gdb.fortran/array-bounds-high.exp
index 11de8791627..dfa2c88af0b 100644
--- a/gdb/testsuite/gdb.fortran/array-bounds-high.exp
+++ b/gdb/testsuite/gdb.fortran/array-bounds-high.exp
@@ -23,7 +23,7 @@ standard_testfile .f90
 load_lib fortran.exp
=20
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {f90 debug}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/array-bounds.exp b/gdb/testsuite/gdb=
.fortran/array-bounds.exp
index 7a5de350430..ef762a9ae14 100644
--- a/gdb/testsuite/gdb.fortran/array-bounds.exp
+++ b/gdb/testsuite/gdb.fortran/array-bounds.exp
@@ -23,7 +23,7 @@ standard_testfile .f90
 load_lib fortran.exp
=20
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {f90 debug}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/array-element.exp b/gdb/testsuite/gd=
b.fortran/array-element.exp
index f2ac7c5ce59..78425bde8d5 100644
--- a/gdb/testsuite/gdb.fortran/array-element.exp
+++ b/gdb/testsuite/gdb.fortran/array-element.exp
@@ -23,7 +23,7 @@ require allow_fortran_tests
 standard_testfile .f
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90=
}]} {
-    return -1
+    return
 }
=20
 if {![runto sub_]} {
diff --git a/gdb/testsuite/gdb.fortran/array-no-bounds.exp b/gdb/testsuite/=
gdb.fortran/array-no-bounds.exp
index b62fde31172..a69a6e4988c 100644
--- a/gdb/testsuite/gdb.fortran/array-no-bounds.exp
+++ b/gdb/testsuite/gdb.fortran/array-no-bounds.exp
@@ -23,7 +23,7 @@ load_lib fortran.exp
=20
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {f90 debug}] } {
-    return -1
+    return
 }
=20
 if { ![fortran_runto_main] } {
diff --git a/gdb/testsuite/gdb.fortran/array-slices-bad.exp b/gdb/testsuite=
/gdb.fortran/array-slices-bad.exp
index c4aa0ec01b4..6547b75c94a 100644
--- a/gdb/testsuite/gdb.fortran/array-slices-bad.exp
+++ b/gdb/testsuite/gdb.fortran/array-slices-bad.exp
@@ -22,12 +22,12 @@ load_lib fortran.exp
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![runto [gdb_get_line_number "First Breakpoint"]]} {
     perror "couldn't run to breakpoint First Breakpoint"
-    return -1
+    return
 }
=20
 # Avoid libc symbols, in particular the 'array' type.
diff --git a/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp b/gdb/te=
stsuite/gdb.fortran/array-slices-sub-slices.exp
index e56b777bad3..53744b5c848 100644
--- a/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp
+++ b/gdb/testsuite/gdb.fortran/array-slices-sub-slices.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 # Avoid libc symbols, in particular the 'array' type.
diff --git a/gdb/testsuite/gdb.fortran/array-slices.exp b/gdb/testsuite/gdb=
.fortran/array-slices.exp
index 84ef464f809..df96c6f46cb 100644
--- a/gdb/testsuite/gdb.fortran/array-slices.exp
+++ b/gdb/testsuite/gdb.fortran/array-slices.exp
@@ -43,7 +43,7 @@ load_lib fortran.exp
=20
 if {[build_executable ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
=20
 # Takes the name of an array slice as used in the test source, and extracts
diff --git a/gdb/testsuite/gdb.fortran/associated.exp b/gdb/testsuite/gdb.f=
ortran/associated.exp
index 47ad222198e..95e215acb1e 100644
--- a/gdb/testsuite/gdb.fortran/associated.exp
+++ b/gdb/testsuite/gdb.fortran/associated.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "Test Breakpoint"]
diff --git a/gdb/testsuite/gdb.fortran/assumedrank.exp b/gdb/testsuite/gdb.=
fortran/assumedrank.exp
index d8574ebdff9..05091b6b608 100644
--- a/gdb/testsuite/gdb.fortran/assumedrank.exp
+++ b/gdb/testsuite/gdb.fortran/assumedrank.exp
@@ -24,17 +24,17 @@ load_lib fortran.exp
 if { [test_compiler_info {gfortran-*} f90] &&
      ![test_compiler_info {gfortran-1[1-9]-*} f90] } {
     untested "compiler does not support assumed rank"
-    return -1
+    return
 }
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90 dwarf5}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
     untested "could not run to main"
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "Test Breakpoint"]
diff --git a/gdb/testsuite/gdb.fortran/backtrace.exp b/gdb/testsuite/gdb.fo=
rtran/backtrace.exp
index 32adad8dd1b..9bc4cb991aa 100644
--- a/gdb/testsuite/gdb.fortran/backtrace.exp
+++ b/gdb/testsuite/gdb.fortran/backtrace.exp
@@ -20,7 +20,7 @@ load_lib fortran.exp
 standard_testfile .f90
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90=
}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/block-data.exp b/gdb/testsuite/gdb.f=
ortran/block-data.exp
index 32bd4f3c46c..f15d6ada5e2 100644
--- a/gdb/testsuite/gdb.fortran/block-data.exp
+++ b/gdb/testsuite/gdb.fortran/block-data.exp
@@ -27,11 +27,11 @@ standard_testfile .f
 load_lib "fortran.exp"
=20
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 with_test_prefix "default values" {
diff --git a/gdb/testsuite/gdb.fortran/call-no-debug.exp b/gdb/testsuite/gd=
b.fortran/call-no-debug.exp
index e3161635536..6ddcf10e411 100644
--- a/gdb/testsuite/gdb.fortran/call-no-debug.exp
+++ b/gdb/testsuite/gdb.fortran/call-no-debug.exp
@@ -25,7 +25,7 @@ if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile [list debug f90] \
 	      $srcfile [list debug f90] \
 	      $srcfile2 [list nodebug f90]]]} {
-    return -1
+    return
 }
=20
 # Find a possibly mangled version of NAME, a function we want to call
@@ -68,7 +68,7 @@ set some_func [find_mangled_name "some_func"]
 set string_func [find_mangled_name "string_func"]
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 # Call the function SOME_FUNC, that takes a single integer and returns
diff --git a/gdb/testsuite/gdb.fortran/charset.exp b/gdb/testsuite/gdb.fort=
ran/charset.exp
index c73960dd9a6..3dd00fea956 100644
--- a/gdb/testsuite/gdb.fortran/charset.exp
+++ b/gdb/testsuite/gdb.fortran/charset.exp
@@ -23,11 +23,11 @@ load_lib fortran.exp
=20
 # Ifx, and ifort do not support kind=3D4 for CHARACTER.
 if { [test_compiler_info {ifx-*} f90] || [test_compiler_info {ifort-*} f90=
] } {
-    return -1
+    return
 }
=20
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debu=
g additional_flags=3D-fbackslash f90}] } {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/class-allocatable-array.exp b/gdb/te=
stsuite/gdb.fortran/class-allocatable-array.exp
index ba221cc5038..c6a9e96c63e 100644
--- a/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
+++ b/gdb/testsuite/gdb.fortran/class-allocatable-array.exp
@@ -23,11 +23,11 @@ load_lib fortran.exp
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "Break Here"]
diff --git a/gdb/testsuite/gdb.fortran/common-block.exp b/gdb/testsuite/gdb=
.fortran/common-block.exp
index d0d03b395be..07a66b03837 100644
--- a/gdb/testsuite/gdb.fortran/common-block.exp
+++ b/gdb/testsuite/gdb.fortran/common-block.exp
@@ -22,7 +22,7 @@ load_lib "fortran.exp"
=20
 if {[prepare_for_testing "failed to prepare" ${testfile} \
 	 $srcfile {debug f90 quiet}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/completion.exp b/gdb/testsuite/gdb.f=
ortran/completion.exp
index 17640a9479d..159d92e3a67 100644
--- a/gdb/testsuite/gdb.fortran/completion.exp
+++ b/gdb/testsuite/gdb.fortran/completion.exp
@@ -23,11 +23,11 @@ load_lib completion-support.exp
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 test_gdb_complete_none "p var%x"
diff --git a/gdb/testsuite/gdb.fortran/complex.exp b/gdb/testsuite/gdb.fort=
ran/complex.exp
index 39aff4268c9..f0fdc556601 100644
--- a/gdb/testsuite/gdb.fortran/complex.exp
+++ b/gdb/testsuite/gdb.fortran/complex.exp
@@ -19,7 +19,7 @@ load_lib fortran.exp
 require allow_fortran_tests
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90=
 quiet}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/debug-expr.exp b/gdb/testsuite/gdb.f=
ortran/debug-expr.exp
index 4cd78c7d478..85fc5477043 100644
--- a/gdb/testsuite/gdb.fortran/debug-expr.exp
+++ b/gdb/testsuite/gdb.fortran/debug-expr.exp
@@ -25,11 +25,11 @@ standard_testfile .f90
 load_lib fortran.exp
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90=
}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "Break Here"]
diff --git a/gdb/testsuite/gdb.fortran/derived-type-function.exp b/gdb/test=
suite/gdb.fortran/derived-type-function.exp
index 4551f71a3b8..05eaf6b9761 100644
--- a/gdb/testsuite/gdb.fortran/derived-type-function.exp
+++ b/gdb/testsuite/gdb.fortran/derived-type-function.exp
@@ -24,7 +24,7 @@ standard_testfile .f90
 load_lib fortran.exp
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90=
}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/derived-type-striding.exp b/gdb/test=
suite/gdb.fortran/derived-type-striding.exp
index 322001fc8a3..c17ff946831 100644
--- a/gdb/testsuite/gdb.fortran/derived-type-striding.exp
+++ b/gdb/testsuite/gdb.fortran/derived-type-striding.exp
@@ -26,7 +26,7 @@ set gcc_with_broken_stride [test_compiler_info {gfortran-=
[89]-*} f90]
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![runto [gdb_get_line_number "post_init"]]} {
diff --git a/gdb/testsuite/gdb.fortran/derived-type.exp b/gdb/testsuite/gdb=
.fortran/derived-type.exp
index c55ebb338e2..04cab4b1196 100644
--- a/gdb/testsuite/gdb.fortran/derived-type.exp
+++ b/gdb/testsuite/gdb.fortran/derived-type.exp
@@ -24,7 +24,7 @@ standard_testfile .f90
 load_lib "fortran.exp"
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90=
}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp b/gdb/tests=
uite/gdb.fortran/dynamic-ptype-whatis.exp
index fc508434f07..70d0ccbfe89 100644
--- a/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp
+++ b/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp
@@ -23,7 +23,7 @@ load_lib fortran.exp
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/empty-string.exp b/gdb/testsuite/gdb=
.fortran/empty-string.exp
index f191893c1a8..4a6a9de8194 100644
--- a/gdb/testsuite/gdb.fortran/empty-string.exp
+++ b/gdb/testsuite/gdb.fortran/empty-string.exp
@@ -21,11 +21,11 @@ standard_testfile ".f90"
 load_lib fortran.exp
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90=
}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "Break here"]
diff --git a/gdb/testsuite/gdb.fortran/entry-point.exp b/gdb/testsuite/gdb.=
fortran/entry-point.exp
index cbdfbf629cf..43b0492cdd3 100644
--- a/gdb/testsuite/gdb.fortran/entry-point.exp
+++ b/gdb/testsuite/gdb.fortran/entry-point.exp
@@ -21,12 +21,12 @@ standard_testfile .f90
 load_lib "fortran.exp"
=20
 if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}] } {
-    return -1
+    return
 }
=20
 if { ![fortran_runto_main] } {
     untested "could not run to main"
-    return -1
+    return
 }
=20
 # Test if we can set a breakpoint via the entry-point name.
diff --git a/gdb/testsuite/gdb.fortran/function-calls.exp b/gdb/testsuite/g=
db.fortran/function-calls.exp
index 2b92a793763..2edc4fccbba 100644
--- a/gdb/testsuite/gdb.fortran/function-calls.exp
+++ b/gdb/testsuite/gdb.fortran/function-calls.exp
@@ -21,7 +21,7 @@ require allow_fortran_tests
 standard_testfile ".f90"
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90=
}]} {
-    return -1
+    return
 }
=20
 with_complaints 5 {
diff --git a/gdb/testsuite/gdb.fortran/huge.exp b/gdb/testsuite/gdb.fortran=
/huge.exp
index f854600d446..07f1fac6ff8 100644
--- a/gdb/testsuite/gdb.fortran/huge.exp
+++ b/gdb/testsuite/gdb.fortran/huge.exp
@@ -53,7 +53,7 @@ clean_restart ${::testfile}
=20
 with_timeout_factor 3 {
     if {![fortran_runto_main]} {
-	return -1
+	return
     }
=20
     gdb_test_no_output "set max-value-size unlimited"
diff --git a/gdb/testsuite/gdb.fortran/info-main.exp b/gdb/testsuite/gdb.fo=
rtran/info-main.exp
index e21fb4456a6..11a97a9ded1 100644
--- a/gdb/testsuite/gdb.fortran/info-main.exp
+++ b/gdb/testsuite/gdb.fortran/info-main.exp
@@ -23,7 +23,7 @@ save_vars { GDBFLAGS } {
     set GDBFLAGS [string map {"-readnow" ""} "$GDBFLAGS"]
=20
     if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug=
 f90}]} {
-	return -1
+	return
     }
 }
=20
@@ -31,7 +31,7 @@ gdb_test "info main" "simple" "info main prior to start"
=20
 if {![fortran_runto_main]} {
     untested "could not run to main"
-    return -1
+    return
 }
=20
 gdb_test "info main" "simple" "info main post start"
diff --git a/gdb/testsuite/gdb.fortran/info-modules.exp b/gdb/testsuite/gdb=
.fortran/info-modules.exp
index 06158f9c674..a1873900910 100644
--- a/gdb/testsuite/gdb.fortran/info-modules.exp
+++ b/gdb/testsuite/gdb.fortran/info-modules.exp
@@ -25,7 +25,7 @@ standard_testfile info-types.f90 info-types-2.f90
=20
 if { [prepare_for_testing "failed to prepare" $testfile \
 	  [list $srcfile2 $srcfile] {debug f90}] } {
-    return -1
+    return
 }
=20
 if { ![fortran_runto_main] } {
diff --git a/gdb/testsuite/gdb.fortran/info-types.exp b/gdb/testsuite/gdb.f=
ortran/info-types.exp
index 63058ad2852..2a6e6a15988 100644
--- a/gdb/testsuite/gdb.fortran/info-types.exp
+++ b/gdb/testsuite/gdb.fortran/info-types.exp
@@ -24,7 +24,7 @@ standard_testfile info-types.f90 info-types-2.f90
=20
 if { [prepare_for_testing "failed to prepare" $testfile \
 	  [list $srcfile2 $srcfile] {debug f90}] } {
-    return -1
+    return
 }
=20
 # Don't run to main to avoid increasing the search scope to include
diff --git a/gdb/testsuite/gdb.fortran/intrinsic-precedence.exp b/gdb/tests=
uite/gdb.fortran/intrinsic-precedence.exp
index f47a3775510..a93d70c2beb 100644
--- a/gdb/testsuite/gdb.fortran/intrinsic-precedence.exp
+++ b/gdb/testsuite/gdb.fortran/intrinsic-precedence.exp
@@ -25,16 +25,16 @@ set lib_flags [list debug]
 set bin_flags [list f90 debug shlib=3D${binfile_lib}]
=20
 if {[gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] !=3D "" }=
 {
-    return -1
+    return
 }
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
      ${bin_flags}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "all-assigned"]
diff --git a/gdb/testsuite/gdb.fortran/intrinsics.exp b/gdb/testsuite/gdb.f=
ortran/intrinsics.exp
index 898cab86f8f..a5278700a2b 100644
--- a/gdb/testsuite/gdb.fortran/intrinsics.exp
+++ b/gdb/testsuite/gdb.fortran/intrinsics.exp
@@ -22,7 +22,7 @@ require allow_fortran_tests
 standard_testfile .f90
=20
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f9=
0}] } {
-    return -1
+    return
 }
=20
 if { ![fortran_runto_main] } {
diff --git a/gdb/testsuite/gdb.fortran/intvar-array.exp b/gdb/testsuite/gdb=
.fortran/intvar-array.exp
index b454b013991..4d05a6c6bb2 100644
--- a/gdb/testsuite/gdb.fortran/intvar-array.exp
+++ b/gdb/testsuite/gdb.fortran/intvar-array.exp
@@ -22,11 +22,11 @@ load_lib "fortran.exp"
=20
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "Break here"]
diff --git a/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp b/gdb/tests=
uite/gdb.fortran/intvar-dynamic-types.exp
index ba98fec7777..3f47072e11a 100644
--- a/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp
+++ b/gdb/testsuite/gdb.fortran/intvar-dynamic-types.exp
@@ -21,11 +21,11 @@ load_lib "fortran.exp"
=20
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "Break here"]
diff --git a/gdb/testsuite/gdb.fortran/lbound-ubound.exp b/gdb/testsuite/gd=
b.fortran/lbound-ubound.exp
index 6d3c4b98779..c11956ef3c8 100644
--- a/gdb/testsuite/gdb.fortran/lbound-ubound.exp
+++ b/gdb/testsuite/gdb.fortran/lbound-ubound.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 # Avoid libc symbols, in particular the 'array' type.
diff --git a/gdb/testsuite/gdb.fortran/library-module.exp b/gdb/testsuite/g=
db.fortran/library-module.exp
index d2eb95ff3de..b340e401c6f 100644
--- a/gdb/testsuite/gdb.fortran/library-module.exp
+++ b/gdb/testsuite/gdb.fortran/library-module.exp
@@ -23,7 +23,7 @@ set libfile [standard_output_file ${testfile}-lib.so]
=20
 if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $libfile {deb=
ug f90}] !=3D "" } {
     untested "failed to compile shared library"
-    return -1
+    return
 }
=20
 # prepare_for_testing cannot be used as linking with $libfile cannot be pa=
ssed
@@ -32,7 +32,7 @@ if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfil=
e}" $libfile {debug f90
=20
 if  { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list debu=
g f90 shlib=3D$libfile]] !=3D "" } {
     untested "failed to compile"
-    return -1
+    return
 }
=20
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.fortran/limited-length.exp b/gdb/testsuite/g=
db.fortran/limited-length.exp
index dbaa7d7afe1..09d14418c2c 100644
--- a/gdb/testsuite/gdb.fortran/limited-length.exp
+++ b/gdb/testsuite/gdb.fortran/limited-length.exp
@@ -22,7 +22,7 @@ require allow_fortran_tests
 standard_testfile .f90
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90=
}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/logical.exp b/gdb/testsuite/gdb.fort=
ran/logical.exp
index 185d63d1b87..8b6e266746e 100644
--- a/gdb/testsuite/gdb.fortran/logical.exp
+++ b/gdb/testsuite/gdb.fortran/logical.exp
@@ -21,7 +21,7 @@ load_lib fortran.exp
 require allow_fortran_tests
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90=
 quiet}]} {
-    return -1
+    return
 }
=20
 if { ![fortran_runto_main] } {
diff --git a/gdb/testsuite/gdb.fortran/max-depth.exp b/gdb/testsuite/gdb.fo=
rtran/max-depth.exp
index 5a2abcc5ea5..34623d30606 100644
--- a/gdb/testsuite/gdb.fortran/max-depth.exp
+++ b/gdb/testsuite/gdb.fortran/max-depth.exp
@@ -23,7 +23,7 @@ require allow_fortran_tests
 standard_testfile .f90
=20
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f9=
0}] } {
-    return -1
+    return
 }
=20
 if { ![fortran_runto_main] } {
diff --git a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp b/gdb/testsuite=
/gdb.fortran/mixed-lang-stack.exp
index 43f77d3eb66..3a8ee17da06 100644
--- a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
+++ b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
@@ -32,7 +32,7 @@ if {[prepare_for_testing_full "failed to prepare" \
 	      $srcfile {debug} \
 	      $srcfile2 {debug c++ additional_flags=3D-std=3Dc++11} \
 	      $srcfile3 {debug f90}]]} {
-    return -1
+    return
 }
=20
 set have_index [exec_has_index_section $binfile]
diff --git a/gdb/testsuite/gdb.fortran/module.exp b/gdb/testsuite/gdb.fortr=
an/module.exp
index e3b0c95b76f..653d75366cf 100644
--- a/gdb/testsuite/gdb.fortran/module.exp
+++ b/gdb/testsuite/gdb.fortran/module.exp
@@ -20,7 +20,7 @@ require allow_fortran_tests
 standard_testfile .f90
=20
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f9=
0}] } {
-    return -1
+    return
 }
=20
 # Test automatic language detection before the inferior starts.  It tests =
the
diff --git a/gdb/testsuite/gdb.fortran/multi-dim.exp b/gdb/testsuite/gdb.fo=
rtran/multi-dim.exp
index d7df19e98ae..efb0399f454 100644
--- a/gdb/testsuite/gdb.fortran/multi-dim.exp
+++ b/gdb/testsuite/gdb.fortran/multi-dim.exp
@@ -22,7 +22,7 @@ standard_testfile .f90
 load_lib "fortran.exp"
=20
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debu=
g f90}] } {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/namelist.exp b/gdb/testsuite/gdb.for=
tran/namelist.exp
index 25c9ae920a6..9f1aad15429 100644
--- a/gdb/testsuite/gdb.fortran/namelist.exp
+++ b/gdb/testsuite/gdb.fortran/namelist.exp
@@ -22,7 +22,7 @@ standard_testfile .f90
 load_lib "fortran.exp"
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90=
}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp b/gdb/testsuite/g=
db.fortran/nested-funcs-2.exp
index 84f1d3394f3..a17e48ee57a 100644
--- a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp
+++ b/gdb/testsuite/gdb.fortran/nested-funcs-2.exp
@@ -22,7 +22,7 @@ standard_testfile ".f90"
=20
 if {[build_executable ${testfile}.exp ${testfile} \
 	 ${srcfile} {debug f90}]} {
-    return -1
+    return
 }
=20
 set int4 [fortran_int4]
diff --git a/gdb/testsuite/gdb.fortran/nested-funcs.exp b/gdb/testsuite/gdb=
.fortran/nested-funcs.exp
index 03f3013ea9c..b9f7785e9f1 100644
--- a/gdb/testsuite/gdb.fortran/nested-funcs.exp
+++ b/gdb/testsuite/gdb.fortran/nested-funcs.exp
@@ -22,7 +22,7 @@ standard_testfile .f90
 load_lib "fortran.exp"
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90=
}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/oop_extend_type.exp b/gdb/testsuite/=
gdb.fortran/oop_extend_type.exp
index 070a72a9211..4804228c280 100644
--- a/gdb/testsuite/gdb.fortran/oop_extend_type.exp
+++ b/gdb/testsuite/gdb.fortran/oop_extend_type.exp
@@ -20,12 +20,12 @@ require allow_fortran_tests
=20
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
      {debug f90 quiet}] } {
-	 return -1
+	 return
 }
=20
 if {![fortran_runto_main]} {
     perror "could not run to main"
-    return -1
+    return
 }
=20
 # Depending on the compiler being used, the type names can be printed diff=
erently.
diff --git a/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp b/gdb/testsui=
te/gdb.fortran/pointer-to-pointer.exp
index 801738b9acc..c987789c09d 100644
--- a/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp
+++ b/gdb/testsuite/gdb.fortran/pointer-to-pointer.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 # Depending on the compiler being used, the type names can be printed
diff --git a/gdb/testsuite/gdb.fortran/pointers.exp b/gdb/testsuite/gdb.for=
tran/pointers.exp
index c5e191af74d..2ef955d9b3e 100644
--- a/gdb/testsuite/gdb.fortran/pointers.exp
+++ b/gdb/testsuite/gdb.fortran/pointers.exp
@@ -18,12 +18,12 @@ load_lib fortran.exp
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
     {debug f90 quiet}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
     untested "could not run to main"
-    return -1
+    return
 }
=20
 # Depending on the compiler being used, the type names can be printed
diff --git a/gdb/testsuite/gdb.fortran/print-formatted.exp b/gdb/testsuite/=
gdb.fortran/print-formatted.exp
index 78f3b1745da..f674d26ed2a 100644
--- a/gdb/testsuite/gdb.fortran/print-formatted.exp
+++ b/gdb/testsuite/gdb.fortran/print-formatted.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
 standard_testfile .f90
=20
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f9=
0}] } {
-    return -1
+    return
 }
=20
 if { ![fortran_runto_main] } {
-    return -1
+    return
 }
=20
 gdb_test "next" ".*" "go to the end of the program"
diff --git a/gdb/testsuite/gdb.fortran/print_type.exp b/gdb/testsuite/gdb.f=
ortran/print_type.exp
index a41cc03b4c2..a7df15f3905 100644
--- a/gdb/testsuite/gdb.fortran/print_type.exp
+++ b/gdb/testsuite/gdb.fortran/print_type.exp
@@ -23,11 +23,11 @@ require allow_fortran_tests
=20
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 # Depending on the compiler being used, the type names can be printed
diff --git a/gdb/testsuite/gdb.fortran/printing-types.exp b/gdb/testsuite/g=
db.fortran/printing-types.exp
index 7e0219ecee7..862101b0d9d 100644
--- a/gdb/testsuite/gdb.fortran/printing-types.exp
+++ b/gdb/testsuite/gdb.fortran/printing-types.exp
@@ -19,11 +19,11 @@ standard_testfile .f90
 load_lib fortran.exp
=20
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "write"]
diff --git a/gdb/testsuite/gdb.fortran/ptr-indentation.exp b/gdb/testsuite/=
gdb.fortran/ptr-indentation.exp
index 5325fb4214e..0748be70ce5 100644
--- a/gdb/testsuite/gdb.fortran/ptr-indentation.exp
+++ b/gdb/testsuite/gdb.fortran/ptr-indentation.exp
@@ -19,11 +19,11 @@ standard_testfile .f90
 load_lib fortran.exp
=20
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 set int [fortran_int4]
diff --git a/gdb/testsuite/gdb.fortran/ptype-on-functions.exp b/gdb/testsui=
te/gdb.fortran/ptype-on-functions.exp
index 31380592641..35eb900fbab 100644
--- a/gdb/testsuite/gdb.fortran/ptype-on-functions.exp
+++ b/gdb/testsuite/gdb.fortran/ptype-on-functions.exp
@@ -21,7 +21,7 @@ standard_testfile .f90
 load_lib "fortran.exp"
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90=
}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/rank.exp b/gdb/testsuite/gdb.fortran=
/rank.exp
index 61831e91e72..58b1b0d3228 100644
--- a/gdb/testsuite/gdb.fortran/rank.exp
+++ b/gdb/testsuite/gdb.fortran/rank.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "Test Breakpoint"]
diff --git a/gdb/testsuite/gdb.fortran/shape.exp b/gdb/testsuite/gdb.fortra=
n/shape.exp
index d52325b5b42..224f9771593 100644
--- a/gdb/testsuite/gdb.fortran/shape.exp
+++ b/gdb/testsuite/gdb.fortran/shape.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "Test Breakpoint"]
diff --git a/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp b/gd=
b/testsuite/gdb.fortran/short-circuit-argument-list.exp
index f81a1c507d6..243e777b13d 100644
--- a/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp
+++ b/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp
@@ -22,7 +22,7 @@ require allow_fortran_tests
 standard_testfile ".f90"
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90=
}]} {
-    return -1
+    return
 }
=20
 if {![runto [gdb_get_line_number "post_truth_table_init"]]} {
diff --git a/gdb/testsuite/gdb.fortran/size.exp b/gdb/testsuite/gdb.fortran=
/size.exp
index c6368d1fdae..1c4dbc2bfd3 100644
--- a/gdb/testsuite/gdb.fortran/size.exp
+++ b/gdb/testsuite/gdb.fortran/size.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "Test Breakpoint 1"]
diff --git a/gdb/testsuite/gdb.fortran/sizeof.exp b/gdb/testsuite/gdb.fortr=
an/sizeof.exp
index 2d0bf2e732f..2cc5a27ff1e 100644
--- a/gdb/testsuite/gdb.fortran/sizeof.exp
+++ b/gdb/testsuite/gdb.fortran/sizeof.exp
@@ -22,11 +22,11 @@ load_lib fortran.exp
=20
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
     {debug f90}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 gdb_breakpoint [gdb_get_line_number "Test breakpoint"]
diff --git a/gdb/testsuite/gdb.fortran/string-types.exp b/gdb/testsuite/gdb=
.fortran/string-types.exp
index d8a54c66dc9..aa8a0f14a89 100644
--- a/gdb/testsuite/gdb.fortran/string-types.exp
+++ b/gdb/testsuite/gdb.fortran/string-types.exp
@@ -23,7 +23,7 @@ require allow_fortran_tests
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {debug f90 quiet}]} {
-    return -1
+    return
 }
=20
 if { ![fortran_runto_main] } {
diff --git a/gdb/testsuite/gdb.fortran/subarray.exp b/gdb/testsuite/gdb.for=
tran/subarray.exp
index f8677168b33..20a60953370 100644
--- a/gdb/testsuite/gdb.fortran/subarray.exp
+++ b/gdb/testsuite/gdb.fortran/subarray.exp
@@ -24,7 +24,7 @@ standard_testfile .f
 load_lib fortran.exp
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90=
}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
diff --git a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp b/gdb/testsuite/=
gdb.fortran/vla-alloc-assoc.exp
index 91582272356..6ba20822d01 100644
--- a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp
+++ b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
=20
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 # Check the association status of various types of VLA's
diff --git a/gdb/testsuite/gdb.fortran/vla-array.exp b/gdb/testsuite/gdb.fo=
rtran/vla-array.exp
index 9487f1de24e..f36521c4473 100644
--- a/gdb/testsuite/gdb.fortran/vla-array.exp
+++ b/gdb/testsuite/gdb.fortran/vla-array.exp
@@ -20,12 +20,12 @@ require allow_fortran_tests
=20
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}]} {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
     untested "could not run to main"
-    return -1
+    return
 }
=20
 # Try to access vla string / vla string array / string array values.
diff --git a/gdb/testsuite/gdb.fortran/vla-datatypes.exp b/gdb/testsuite/gd=
b.fortran/vla-datatypes.exp
index 1e68fcebd9e..39849d4b5fc 100644
--- a/gdb/testsuite/gdb.fortran/vla-datatypes.exp
+++ b/gdb/testsuite/gdb.fortran/vla-datatypes.exp
@@ -20,14 +20,14 @@ require allow_fortran_tests
=20
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
=20
 # check that all fortran standard datatypes will be
 # handled correctly when using as VLA's
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 # Depending on the compiler being used, the type names can be printed diff=
erently.
diff --git a/gdb/testsuite/gdb.fortran/vla-history.exp b/gdb/testsuite/gdb.=
fortran/vla-history.exp
index 84e769b6112..83a17480b4b 100644
--- a/gdb/testsuite/gdb.fortran/vla-history.exp
+++ b/gdb/testsuite/gdb.fortran/vla-history.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
=20
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 # Set some breakpoints and print complete vla.
diff --git a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp b/gdb/testsuite/gdb=
.fortran/vla-ptr-info.exp
index 493c1cf6578..1c0db4a69c9 100644
--- a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp
+++ b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp
@@ -20,11 +20,11 @@ require allow_fortran_tests
=20
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
     {debug f90 quiet}] } {
-    return -1
+    return
 }
=20
 if {![fortran_runto_main]} {
-    return -1
+    return
 }
=20
 set real4[...]

[diff truncated at 100000 bytes]