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

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

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

    GDB: testsuite: DWARF: Don't return value from top-level (sed)
    
    This patch is purely the result of running:
    
    $ sed -i 's/^    return -1/    return/' *.exp*
    
    and
    
    $ sed -i 's/^    return 0/    return/' *.exp*
    
    inside gdb/testsuite/gdb.dwarf2.
    
    Approved-By: Tom Tromey <[email protected]>

Diff:
---
 .../gdb.dwarf2/DW_OP_piece_with_DW_OP_GNU_uninit.exp     |  4 ++--
 gdb/testsuite/gdb.dwarf2/ada-array-bound.exp             |  2 +-
 gdb/testsuite/gdb.dwarf2/ada-cold-name.exp               |  2 +-
 gdb/testsuite/gdb.dwarf2/ada-linkage-name.exp            |  2 +-
 gdb/testsuite/gdb.dwarf2/ada-thick-pointer.exp           |  2 +-
 gdb/testsuite/gdb.dwarf2/ada-valprint-error.exp          |  4 ++--
 gdb/testsuite/gdb.dwarf2/anon-ns-fn.exp                  |  2 +-
 gdb/testsuite/gdb.dwarf2/arr-opt-out.exp                 |  2 +-
 gdb/testsuite/gdb.dwarf2/arr-stride.exp                  |  2 +-
 gdb/testsuite/gdb.dwarf2/arr-subrange.exp                |  2 +-
 gdb/testsuite/gdb.dwarf2/atomic-type.exp                 |  2 +-
 gdb/testsuite/gdb.dwarf2/backward-spec-inter-cu.exp      |  2 +-
 gdb/testsuite/gdb.dwarf2/bad-regnum.exp                  |  4 ++--
 .../gdb.dwarf2/bitfield-parent-optimized-out.exp         |  4 ++--
 gdb/testsuite/gdb.dwarf2/break-inline-psymtab.exp        |  6 +++---
 gdb/testsuite/gdb.dwarf2/callframecfa.exp                |  4 ++--
 gdb/testsuite/gdb.dwarf2/calling-convention.exp          |  6 +++---
 gdb/testsuite/gdb.dwarf2/clztest.exp                     |  4 ++--
 gdb/testsuite/gdb.dwarf2/corrupt.exp                     |  2 +-
 gdb/testsuite/gdb.dwarf2/count.exp                       |  4 ++--
 gdb/testsuite/gdb.dwarf2/cpp-linkage-name.exp            |  2 +-
 gdb/testsuite/gdb.dwarf2/cu-empty-name.exp               |  4 ++--
 gdb/testsuite/gdb.dwarf2/cu-no-addrs.exp                 |  2 +-
 gdb/testsuite/gdb.dwarf2/data-loc.exp                    |  6 +++---
 gdb/testsuite/gdb.dwarf2/debug-names-bad-cu-index.exp    |  2 +-
 gdb/testsuite/gdb.dwarf2/debug-names-duplicate-cu.exp    |  2 +-
 gdb/testsuite/gdb.dwarf2/debug-names-missing-cu.exp      |  2 +-
 gdb/testsuite/gdb.dwarf2/debug-names-tu.exp.tcl          |  2 +-
 gdb/testsuite/gdb.dwarf2/debug-names.exp                 |  2 +-
 gdb/testsuite/gdb.dwarf2/dup-psym.exp                    |  2 +-
 .../gdb.dwarf2/dw-form-ref-addr-with-type-units.exp      |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp               |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.exp            |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-align.exp                   |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp               |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp          |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-aranges.exp                 |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp                 |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp   |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp      |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp          |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-basic.exp                   |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-bfloat16.exp                |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp       |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-common-block.exp            |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp          |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-complex-parts.exp           |  6 +++---
 gdb/testsuite/gdb.dwarf2/dw2-compressed.exp              |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-const.exp                   |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp   |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp                 |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp           |  6 +++---
 gdb/testsuite/gdb.dwarf2/dw2-disasm-over-non-stmt.exp    |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp               |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.exp     |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-dummy-cu.exp                |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp               |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-empty-file-name.exp         |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-empty-inline-ranges.exp     |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp         |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.exp          |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-entry-pc.exp                |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-entry-points.exp            |  6 +++---
 gdb/testsuite/gdb.dwarf2/dw2-entry-value-2.exp           |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp             |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp.tcl      |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-error.exp                   |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-filename.exp                |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-fixed-point.exp             |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp          |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-icycle.exp                  |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp         |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-inheritance.exp             |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp            |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp         |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp         |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-inline-many-frames.exp      |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp            |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp       |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-inline-stepping.exp         |  4 ++--
 .../gdb.dwarf2/dw2-inline-with-lexical-scope.exp         |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-inter-cu-error-2.exp        |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-inter-cu-error.exp          |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-inter-cu-forth-and-back.exp |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-inter-cu-symbol.exp         |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-intercu.exp                 |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-intermix.exp                |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-is-stmt-2.exp               |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp                 |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp      |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp        |  6 +++---
 gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp      |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-main-no-line-number.exp     |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp            |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp          |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.exp       |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-multiple-debug-info.exp     |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-namespaceless-anonymous.exp |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-no-code-cu.exp              |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-noloc.exp                   |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp         |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-op-call.exp                 |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp            |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-op-stack-value.exp          |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp           |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-param-error.exp             |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-producer.exp                |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-prologue-end-2.exp          |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp            |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp             |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-ranges-overlap.exp          |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-ranges-psym-warning.exp     |  6 +++---
 gdb/testsuite/gdb.dwarf2/dw2-ranges-psym.exp             |  6 +++---
 gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp       |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp           |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp           |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-restore.exp                 |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-restrict.exp                |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-simple-locdesc.exp          |  2 +-
 .../gdb.dwarf2/dw2-single-line-discriminators.exp        |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-skip-prologue.exp           |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-skipped-line-entries.exp    |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp          |  2 +-
 .../dw2-step-between-different-inline-functions.exp      |  4 ++--
 .../gdb.dwarf2/dw2-step-between-inline-func-blocks.exp   |  4 ++--
 .../gdb.dwarf2/dw2-step-out-of-function-no-stmt.exp      |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-strp.exp                    |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-symtab-includes-lookup.exp  |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp         |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-tu-dwarf-4-5.exp            |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp      |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp              |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.exp        |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-unusual-field-names.exp     |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp         | 10 +++++-----
 gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp           |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp  |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-weird-type-len.exp          |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-wrong-mangled-name.exp      |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.exp         |  2 +-
 gdb/testsuite/gdb.dwarf2/dw4-sig-types.exp               |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw4-toplevel-types.exp          |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw5-rnglist-test.exp            |  4 ++--
 gdb/testsuite/gdb.dwarf2/dwp-sepdebug.exp                |  6 +++---
 gdb/testsuite/gdb.dwarf2/dwp-symlink.exp                 | 16 ++++++++--------
 gdb/testsuite/gdb.dwarf2/dwz-many.exp                    |  2 +-
 gdb/testsuite/gdb.dwarf2/dwz-unused-pu.exp               |  2 +-
 gdb/testsuite/gdb.dwarf2/dwz.exp                         |  4 ++--
 gdb/testsuite/gdb.dwarf2/dwznolink.exp                   |  2 +-
 gdb/testsuite/gdb.dwarf2/dyn-type-unallocated.exp        |  6 +++---
 gdb/testsuite/gdb.dwarf2/dynamic-bit-offset.exp          |  2 +-
 gdb/testsuite/gdb.dwarf2/dynarr-ptr.exp                  |  6 +++---
 gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp       |  2 +-
 gdb/testsuite/gdb.dwarf2/enum-type-c++.exp               |  2 +-
 gdb/testsuite/gdb.dwarf2/enum-type.exp                   |  2 +-
 gdb/testsuite/gdb.dwarf2/fission-absolute-dwo.exp        |  4 ++--
 gdb/testsuite/gdb.dwarf2/fission-base.exp                |  4 ++--
 gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp        |  4 ++--
 gdb/testsuite/gdb.dwarf2/fission-loclists.exp            |  4 ++--
 gdb/testsuite/gdb.dwarf2/fission-mix.exp                 |  6 +++---
 gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp            |  4 ++--
 gdb/testsuite/gdb.dwarf2/fission-relative-dwo.exp        |  4 ++--
 gdb/testsuite/gdb.dwarf2/fission-reread.exp              |  2 +-
 gdb/testsuite/gdb.dwarf2/fission-type-unit-locexpr.exp   |  2 +-
 gdb/testsuite/gdb.dwarf2/formdata16.exp                  |  4 ++--
 gdb/testsuite/gdb.dwarf2/fortran-var-string.exp          |  6 +++---
 gdb/testsuite/gdb.dwarf2/forward-spec-inter-cu.exp       |  2 +-
 gdb/testsuite/gdb.dwarf2/forward-spec.exp                |  2 +-
 gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp       |  4 ++--
 gdb/testsuite/gdb.dwarf2/gdb-add-index.exp               |  4 ++--
 gdb/testsuite/gdb.dwarf2/gdb-index-cxx.exp               |  2 +-
 gdb/testsuite/gdb.dwarf2/gdb-index-nodebug.exp           |  2 +-
 gdb/testsuite/gdb.dwarf2/gdb-index-tilde.exp             |  8 ++++----
 gdb/testsuite/gdb.dwarf2/gdb-index-types-dwarf5.exp      |  4 ++--
 gdb/testsuite/gdb.dwarf2/gdb-index.exp                   |  6 +++---
 gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp       |  4 ++--
 gdb/testsuite/gdb.dwarf2/implptr.exp                     |  4 ++--
 gdb/testsuite/gdb.dwarf2/implptrconst.exp                |  4 ++--
 gdb/testsuite/gdb.dwarf2/implptrpiece.exp                |  4 ++--
 gdb/testsuite/gdb.dwarf2/implref-array.exp               |  6 +++---
 gdb/testsuite/gdb.dwarf2/implref-const.exp               |  6 +++---
 gdb/testsuite/gdb.dwarf2/implref-global.exp              |  6 +++---
 gdb/testsuite/gdb.dwarf2/implref-struct.exp              |  6 +++---
 .../gdb.dwarf2/imported-unit-abstract-const-value.exp    |  4 ++--
 gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl        |  2 +-
 gdb/testsuite/gdb.dwarf2/imported-unit-c.exp             |  6 +++---
 gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp    |  6 +++---
 gdb/testsuite/gdb.dwarf2/imported-unit.exp               |  4 ++--
 gdb/testsuite/gdb.dwarf2/info-locals-optimized-out.exp   |  4 ++--
 gdb/testsuite/gdb.dwarf2/inline.exp                      |  2 +-
 .../gdb.dwarf2/inlined_subroutine-inheritance.exp        |  2 +-
 gdb/testsuite/gdb.dwarf2/intbits.exp                     |  6 +++---
 gdb/testsuite/gdb.dwarf2/local-var.exp                   |  2 +-
 .../gdb.dwarf2/locexpr-data-member-location.exp          |  2 +-
 gdb/testsuite/gdb.dwarf2/mac-fileno.exp                  |  2 +-
 gdb/testsuite/gdb.dwarf2/main-subprogram.exp             |  4 ++--
 gdb/testsuite/gdb.dwarf2/malformed-line-header.exp       |  2 +-
 gdb/testsuite/gdb.dwarf2/mega-enum.exp                   |  2 +-
 gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp       |  2 +-
 gdb/testsuite/gdb.dwarf2/method-ptr.exp                  |  2 +-
 gdb/testsuite/gdb.dwarf2/missing-line-table.exp          |  2 +-
 gdb/testsuite/gdb.dwarf2/missing-sig-type.exp            |  2 +-
 .../gdb.dwarf2/missing-type-name-for-templates.exp       |  4 ++--
 gdb/testsuite/gdb.dwarf2/missing-type-name.exp           |  4 ++--
 gdb/testsuite/gdb.dwarf2/multidictionary.exp             |  2 +-
 gdb/testsuite/gdb.dwarf2/nameless-enum.exp               |  2 +-
 gdb/testsuite/gdb.dwarf2/no-gnu-debuglink.exp            |  2 +-
 gdb/testsuite/gdb.dwarf2/nonvar-access.exp               |  4 ++--
 gdb/testsuite/gdb.dwarf2/nostaticblock.exp               |  2 +-
 gdb/testsuite/gdb.dwarf2/nullptr_t.exp                   |  2 +-
 gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp          |  4 ++--
 gdb/testsuite/gdb.dwarf2/opt-out-not-implptr.exp         |  4 ++--
 gdb/testsuite/gdb.dwarf2/pieces-optimized-out.exp        |  4 ++--
 gdb/testsuite/gdb.dwarf2/pieces.exp                      |  4 ++--
 gdb/testsuite/gdb.dwarf2/pr10770.exp                     |  6 +++---
 gdb/testsuite/gdb.dwarf2/pr11465.exp                     |  2 +-
 gdb/testsuite/gdb.dwarf2/pr13961.exp                     |  2 +-
 gdb/testsuite/gdb.dwarf2/rust-enum.exp                   |  2 +-
 gdb/testsuite/gdb.dwarf2/self-spec.exp                   |  2 +-
 gdb/testsuite/gdb.dwarf2/shortpiece.exp                  |  2 +-
 gdb/testsuite/gdb.dwarf2/static-optimized-out.exp        |  2 +-
 gdb/testsuite/gdb.dwarf2/staticvirtual.exp               |  2 +-
 gdb/testsuite/gdb.dwarf2/struct-decl.exp                 |  2 +-
 gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp           |  2 +-
 gdb/testsuite/gdb.dwarf2/struct-with-sig.exp             |  4 ++--
 gdb/testsuite/gdb.dwarf2/subrange-enum.exp               |  2 +-
 gdb/testsuite/gdb.dwarf2/subrange.exp                    |  2 +-
 gdb/testsuite/gdb.dwarf2/symbol_needs_eval_fail.exp      |  4 ++--
 gdb/testsuite/gdb.dwarf2/symbol_needs_eval_timeout.exp   |  4 ++--
 .../gdb.dwarf2/template-specification-full-name.exp      |  4 ++--
 gdb/testsuite/gdb.dwarf2/trace-crash.exp                 |  2 +-
 gdb/testsuite/gdb.dwarf2/typeddwarf.exp                  |  6 +++---
 gdb/testsuite/gdb.dwarf2/typedef-void-finish.exp         |  4 ++--
 gdb/testsuite/gdb.dwarf2/utf-rust.exp                    |  4 ++--
 gdb/testsuite/gdb.dwarf2/valop.exp                       |  4 ++--
 gdb/testsuite/gdb.dwarf2/var-access.exp                  |  4 ++--
 gdb/testsuite/gdb.dwarf2/variant.exp                     |  4 ++--
 gdb/testsuite/gdb.dwarf2/varval.exp                      | 10 +++++-----
 gdb/testsuite/gdb.dwarf2/void-type.exp                   |  4 ++--
 gdb/testsuite/gdb.dwarf2/watch-notconst.exp              |  2 +-
 241 files changed, 398 insertions(+), 398 deletions(-)

diff --git a/gdb/testsuite/gdb.dwarf2/DW_OP_piece_with_DW_OP_GNU_uninit.exp b/gdb/testsuite/gdb.dwarf2/DW_OP_piece_with_DW_OP_GNU_uninit.exp
index eb5899661a6..52599ca3ced 100644
--- a/gdb/testsuite/gdb.dwarf2/DW_OP_piece_with_DW_OP_GNU_uninit.exp
+++ b/gdb/testsuite/gdb.dwarf2/DW_OP_piece_with_DW_OP_GNU_uninit.exp
@@ -73,13 +73,13 @@ Dwarf::assemble $asm_file {
 
 if {[build_executable ${testfile}.exp ${testfile} \
 	 [list $srcfile $asm_file] {nodebug}]} {
-    return -1
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set cmd "print i64_var"
diff --git a/gdb/testsuite/gdb.dwarf2/ada-array-bound.exp b/gdb/testsuite/gdb.dwarf2/ada-array-bound.exp
index 90858e26e65..4a5e14e2c2e 100644
--- a/gdb/testsuite/gdb.dwarf2/ada-array-bound.exp
+++ b/gdb/testsuite/gdb.dwarf2/ada-array-bound.exp
@@ -82,7 +82,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 gdb_test_no_output "set language ada"
diff --git a/gdb/testsuite/gdb.dwarf2/ada-cold-name.exp b/gdb/testsuite/gdb.dwarf2/ada-cold-name.exp
index f4dc9acf4b1..144bec7e532 100644
--- a/gdb/testsuite/gdb.dwarf2/ada-cold-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/ada-cold-name.exp
@@ -59,7 +59,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 gdb_test_no_output "set language ada"
diff --git a/gdb/testsuite/gdb.dwarf2/ada-linkage-name.exp b/gdb/testsuite/gdb.dwarf2/ada-linkage-name.exp
index e50763109c4..01c0fbe5e4e 100644
--- a/gdb/testsuite/gdb.dwarf2/ada-linkage-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/ada-linkage-name.exp
@@ -63,7 +63,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 with_test_prefix "first first" {
diff --git a/gdb/testsuite/gdb.dwarf2/ada-thick-pointer.exp b/gdb/testsuite/gdb.dwarf2/ada-thick-pointer.exp
index 526ebaffe68..b53d8a35935 100644
--- a/gdb/testsuite/gdb.dwarf2/ada-thick-pointer.exp
+++ b/gdb/testsuite/gdb.dwarf2/ada-thick-pointer.exp
@@ -86,7 +86,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 gdb_test_no_output "set language ada"
diff --git a/gdb/testsuite/gdb.dwarf2/ada-valprint-error.exp b/gdb/testsuite/gdb.dwarf2/ada-valprint-error.exp
index 00e737bcef2..171e0cbf3aa 100644
--- a/gdb/testsuite/gdb.dwarf2/ada-valprint-error.exp
+++ b/gdb/testsuite/gdb.dwarf2/ada-valprint-error.exp
@@ -28,7 +28,7 @@ standard_testfile .c -dw.S
 
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Make some DWARF for the test.
@@ -104,7 +104,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing ${testfile}.exp ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 # Note: This test may fail with certain clang + linker combinations
diff --git a/gdb/testsuite/gdb.dwarf2/anon-ns-fn.exp b/gdb/testsuite/gdb.dwarf2/anon-ns-fn.exp
index 0f47b7783ed..1d04ea176d0 100644
--- a/gdb/testsuite/gdb.dwarf2/anon-ns-fn.exp
+++ b/gdb/testsuite/gdb.dwarf2/anon-ns-fn.exp
@@ -18,7 +18,7 @@ require allow_cplus_tests
 standard_testfile .cc
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
-    return -1
+    return
 }
 
 set cmd "ptype main"
diff --git a/gdb/testsuite/gdb.dwarf2/arr-opt-out.exp b/gdb/testsuite/gdb.dwarf2/arr-opt-out.exp
index bef0d63528e..8587897ccef 100644
--- a/gdb/testsuite/gdb.dwarf2/arr-opt-out.exp
+++ b/gdb/testsuite/gdb.dwarf2/arr-opt-out.exp
@@ -81,7 +81,7 @@ Dwarf::assemble $asm_file {
 
 if {[prepare_for_testing "failed to prepare" ${testfile} \
 	 [list $srcfile $asm_file] {nodebug}]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set language ada"
diff --git a/gdb/testsuite/gdb.dwarf2/arr-stride.exp b/gdb/testsuite/gdb.dwarf2/arr-stride.exp
index f1ef47efd51..cdec17eed07 100644
--- a/gdb/testsuite/gdb.dwarf2/arr-stride.exp
+++ b/gdb/testsuite/gdb.dwarf2/arr-stride.exp
@@ -111,7 +111,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 gdb_test_no_output "set language ada"
diff --git a/gdb/testsuite/gdb.dwarf2/arr-subrange.exp b/gdb/testsuite/gdb.dwarf2/arr-subrange.exp
index c466d1b8257..ec2640cdb7a 100644
--- a/gdb/testsuite/gdb.dwarf2/arr-subrange.exp
+++ b/gdb/testsuite/gdb.dwarf2/arr-subrange.exp
@@ -76,7 +76,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 gdb_test_no_output "set language ada"
diff --git a/gdb/testsuite/gdb.dwarf2/atomic-type.exp b/gdb/testsuite/gdb.dwarf2/atomic-type.exp
index c2f9bfcece4..92865016ea3 100644
--- a/gdb/testsuite/gdb.dwarf2/atomic-type.exp
+++ b/gdb/testsuite/gdb.dwarf2/atomic-type.exp
@@ -81,7 +81,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 gdb_test "ptype f" "int \\(const _Atomic char \\\* volatile _Atomic\\)"
diff --git a/gdb/testsuite/gdb.dwarf2/backward-spec-inter-cu.exp b/gdb/testsuite/gdb.dwarf2/backward-spec-inter-cu.exp
index c59e0463e29..de76cc8aca2 100644
--- a/gdb/testsuite/gdb.dwarf2/backward-spec-inter-cu.exp
+++ b/gdb/testsuite/gdb.dwarf2/backward-spec-inter-cu.exp
@@ -75,7 +75,7 @@ Dwarf::assemble $asm_file {
 
 if {[build_executable "failed to build executable" ${testfile} \
 	 [list $srcfile $asm_file] {nodebug}]} {
-    return -1
+    return
 }
 
 set eol "\r\n"
diff --git a/gdb/testsuite/gdb.dwarf2/bad-regnum.exp b/gdb/testsuite/gdb.dwarf2/bad-regnum.exp
index 84c1895e5d2..6c9d80b1e04 100644
--- a/gdb/testsuite/gdb.dwarf2/bad-regnum.exp
+++ b/gdb/testsuite/gdb.dwarf2/bad-regnum.exp
@@ -62,11 +62,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "info addr foo1" \
diff --git a/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp b/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp
index 45e66a42f0f..0e7318bfd64 100644
--- a/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp
+++ b/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp
@@ -70,11 +70,11 @@ Dwarf::assemble $asm_file {
 }
 
 if {[prepare_for_testing "failed to prepare" $executable "${asm_file} ${srcfile}" {}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "p var" " = <optimized out>"
diff --git a/gdb/testsuite/gdb.dwarf2/break-inline-psymtab.exp b/gdb/testsuite/gdb.dwarf2/break-inline-psymtab.exp
index 45213468abb..3f03bf78df9 100644
--- a/gdb/testsuite/gdb.dwarf2/break-inline-psymtab.exp
+++ b/gdb/testsuite/gdb.dwarf2/break-inline-psymtab.exp
@@ -17,16 +17,16 @@ standard_testfile .c -2.c
 
 set sources [list $srcfile $srcfile2]
 if { [prepare_for_testing "failed to prepare" ${testfile} $sources] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 get_debug_format
 if { [skip_inline_frame_tests] } {
-    return -1
+    return
 }
 
 # Set a break-point in inline function bar, in a CU for which the partial
diff --git a/gdb/testsuite/gdb.dwarf2/callframecfa.exp b/gdb/testsuite/gdb.dwarf2/callframecfa.exp
index 315ce0a12f6..91a1be56506 100644
--- a/gdb/testsuite/gdb.dwarf2/callframecfa.exp
+++ b/gdb/testsuite/gdb.dwarf2/callframecfa.exp
@@ -24,11 +24,11 @@ standard_testfile .S
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 [list {additional_flags=-nostdlib}]]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "break *func" "Breakpoint 2.*" "set breakpoint for call-frame-cfa"
diff --git a/gdb/testsuite/gdb.dwarf2/calling-convention.exp b/gdb/testsuite/gdb.dwarf2/calling-convention.exp
index 294a250408c..202371400ea 100644
--- a/gdb/testsuite/gdb.dwarf2/calling-convention.exp
+++ b/gdb/testsuite/gdb.dwarf2/calling-convention.exp
@@ -34,7 +34,7 @@ standard_testfile .c .S
 # First compile the .c file so we can ask GDB what is sizeof(int).
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 # Make some DWARF for the test.
@@ -69,11 +69,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "call foo ()" \
diff --git a/gdb/testsuite/gdb.dwarf2/clztest.exp b/gdb/testsuite/gdb.dwarf2/clztest.exp
index 43f17889f5a..c827ae6175c 100644
--- a/gdb/testsuite/gdb.dwarf2/clztest.exp
+++ b/gdb/testsuite/gdb.dwarf2/clztest.exp
@@ -26,11 +26,11 @@ require is_x86_64_m64_target
 
 if { [prepare_for_testing "failed to prepare" "${test}" ${test}.S \
       {nodebug nopie additional_flags=-nostdlib}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Initialize tests to be an empty array.
diff --git a/gdb/testsuite/gdb.dwarf2/corrupt.exp b/gdb/testsuite/gdb.dwarf2/corrupt.exp
index aff41113214..b46f0cb1b43 100644
--- a/gdb/testsuite/gdb.dwarf2/corrupt.exp
+++ b/gdb/testsuite/gdb.dwarf2/corrupt.exp
@@ -69,7 +69,7 @@ Dwarf::assemble $asm_file {
 
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 [list $srcfile $asm_file] {nodebug}]} {
-    return -1
+    return
 }
 
 gdb_test "print 1" "= 1" "recover from corrupt DWARF"
diff --git a/gdb/testsuite/gdb.dwarf2/count.exp b/gdb/testsuite/gdb.dwarf2/count.exp
index a238c352d97..8ed443fe734 100644
--- a/gdb/testsuite/gdb.dwarf2/count.exp
+++ b/gdb/testsuite/gdb.dwarf2/count.exp
@@ -127,11 +127,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" $testfile \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "ptype array" "type = char \\\[5\\\]"
diff --git a/gdb/testsuite/gdb.dwarf2/cpp-linkage-name.exp b/gdb/testsuite/gdb.dwarf2/cpp-linkage-name.exp
index bbb3a3765ab..6a3abaf83a4 100644
--- a/gdb/testsuite/gdb.dwarf2/cpp-linkage-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/cpp-linkage-name.exp
@@ -82,7 +82,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 gdb_assert [runto_main] "run to main"
diff --git a/gdb/testsuite/gdb.dwarf2/cu-empty-name.exp b/gdb/testsuite/gdb.dwarf2/cu-empty-name.exp
index 32f4a4c007f..d4aa0203807 100644
--- a/gdb/testsuite/gdb.dwarf2/cu-empty-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/cu-empty-name.exp
@@ -38,11 +38,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 gdb_continue_to_end
diff --git a/gdb/testsuite/gdb.dwarf2/cu-no-addrs.exp b/gdb/testsuite/gdb.dwarf2/cu-no-addrs.exp
index 8ff6765d170..844b01d1b4a 100644
--- a/gdb/testsuite/gdb.dwarf2/cu-no-addrs.exp
+++ b/gdb/testsuite/gdb.dwarf2/cu-no-addrs.exp
@@ -53,7 +53,7 @@ Dwarf::assemble $asm_file {
 
 if {[prepare_for_testing "failed to prepare" ${testfile} \
 	 [list $srcfile $asm_file] {nodebug}]} {
-    return -1
+    return
 }
 
 gdb_test "break *$main_start" ".*Breakpoint $decimal at $hex" \
diff --git a/gdb/testsuite/gdb.dwarf2/data-loc.exp b/gdb/testsuite/gdb.dwarf2/data-loc.exp
index 3a2787e9f26..b78afe25716 100644
--- a/gdb/testsuite/gdb.dwarf2/data-loc.exp
+++ b/gdb/testsuite/gdb.dwarf2/data-loc.exp
@@ -27,7 +27,7 @@ standard_testfile .c -dw.S
 # specifically for this testcase, might as well use that.
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 # Make some DWARF for the test.
@@ -121,11 +121,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set language ada"
diff --git a/gdb/testsuite/gdb.dwarf2/debug-names-bad-cu-index.exp b/gdb/testsuite/gdb.dwarf2/debug-names-bad-cu-index.exp
index 00dacb78b81..10e649f06af 100644
--- a/gdb/testsuite/gdb.dwarf2/debug-names-bad-cu-index.exp
+++ b/gdb/testsuite/gdb.dwarf2/debug-names-bad-cu-index.exp
@@ -82,7 +82,7 @@ Dwarf::assemble {
 
 if {[build_executable ${testfile}.exp $testfile "${asm_file} ${srcfile}" \
 	 [list ldflags=-nostartfiles]] == -1} {
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.dwarf2/debug-names-duplicate-cu.exp b/gdb/testsuite/gdb.dwarf2/debug-names-duplicate-cu.exp
index b9ad865a79d..11294ae5a13 100644
--- a/gdb/testsuite/gdb.dwarf2/debug-names-duplicate-cu.exp
+++ b/gdb/testsuite/gdb.dwarf2/debug-names-duplicate-cu.exp
@@ -62,7 +62,7 @@ Dwarf::assemble {
 
 if {[prepare_for_testing "failed to prepare" $testfile "${asm_file} ${srcfile}" \
 	 [list ldflags=-nostartfiles]]} {
-    return -1
+    return
 }
 
 # Check for warning.
diff --git a/gdb/testsuite/gdb.dwarf2/debug-names-missing-cu.exp b/gdb/testsuite/gdb.dwarf2/debug-names-missing-cu.exp
index 532482318dd..c5eca54b55c 100644
--- a/gdb/testsuite/gdb.dwarf2/debug-names-missing-cu.exp
+++ b/gdb/testsuite/gdb.dwarf2/debug-names-missing-cu.exp
@@ -69,7 +69,7 @@ Dwarf::assemble {
 
 if {[prepare_for_testing "failed to prepare" $testfile "${asm_file} ${srcfile}" \
 	 [list ldflags=-nostartfiles]]} {
-    return -1
+    return
 }
 
 # Verify that .debug_names section is not ignored.
diff --git a/gdb/testsuite/gdb.dwarf2/debug-names-tu.exp.tcl b/gdb/testsuite/gdb.dwarf2/debug-names-tu.exp.tcl
index 4d588ab6cec..af3f263a273 100644
--- a/gdb/testsuite/gdb.dwarf2/debug-names-tu.exp.tcl
+++ b/gdb/testsuite/gdb.dwarf2/debug-names-tu.exp.tcl
@@ -90,7 +90,7 @@ Dwarf::assemble {
 
 if {[prepare_for_testing "failed to prepare" $testfile "${asm_file} ${srcfile}" \
 	 [list ldflags=-nostartfiles]]} {
-    return -1
+    return
 }
 
 # Verify that .debug_names section is not ignored.
diff --git a/gdb/testsuite/gdb.dwarf2/debug-names.exp b/gdb/testsuite/gdb.dwarf2/debug-names.exp
index 23e8dad4577..39bdd3d59e8 100644
--- a/gdb/testsuite/gdb.dwarf2/debug-names.exp
+++ b/gdb/testsuite/gdb.dwarf2/debug-names.exp
@@ -65,7 +65,7 @@ Dwarf::assemble {
 
 if {[prepare_for_testing "failed to prepare" $testfile "${asm_file} ${srcfile}" \
 	 [list ldflags=-nostartfiles]]} {
-    return -1
+    return
 }
 
 # Verify that .debug_names section is not ignored.
diff --git a/gdb/testsuite/gdb.dwarf2/dup-psym.exp b/gdb/testsuite/gdb.dwarf2/dup-psym.exp
index da3a8947c2f..b020146e285 100644
--- a/gdb/testsuite/gdb.dwarf2/dup-psym.exp
+++ b/gdb/testsuite/gdb.dwarf2/dup-psym.exp
@@ -23,7 +23,7 @@ standard_testfile .S
 
 if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile {debug} main.c debug $srcfile nodebug]]} {
-    return -1
+    return
 }
 
 set test "info sources should contain only one reference to file1.txt"
diff --git a/gdb/testsuite/gdb.dwarf2/dw-form-ref-addr-with-type-units.exp b/gdb/testsuite/gdb.dwarf2/dw-form-ref-addr-with-type-units.exp
index 9a8a396375b..6c330435298 100644
--- a/gdb/testsuite/gdb.dwarf2/dw-form-ref-addr-with-type-units.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw-form-ref-addr-with-type-units.exp
@@ -100,7 +100,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 # Without the corresponding fix, we get an internal error:
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp b/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp
index 04d8f91be5b..367871e3094 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp
@@ -50,7 +50,7 @@ lappend flags additional_flags=[quote_for_host -DWORLD_END=$world_start \
 
 set executable ${testfile}
 if {[build_executable ${testfile}.exp ${executable} $sources $flags] == -1} {
-    return -1
+    return
 }
 
 clean_restart $executable
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.exp b/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.exp
index 06d4f693024..1716741c0c1 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.exp
@@ -21,7 +21,7 @@ standard_testfile .S
 set executable ${testfile}
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "" } {
-    return -1
+    return
 }
 
 clean_restart $executable
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-align.exp b/gdb/testsuite/gdb.dwarf2/dw2-align.exp
index f4e6947f755..6671dd5a3fd 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-align.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-align.exp
@@ -68,11 +68,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test_no_output "set lang c++"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp b/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp
index 50b949345fc..bbfdf23168b 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp
@@ -25,7 +25,7 @@ standard_testfile .S
 if {[gdb_compile [file join $srcdir $subdir $srcfile] $binfile \
 	 object {debug}] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp
index 949464bd3c1..a02d580bfd2 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp
@@ -24,7 +24,7 @@ set dwarf_srcfile "file1.txt"
 
 if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile debug main.c debug $srcfile nodebug]]} {
-    return -1
+    return
 }
 
 gdb_remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-aranges.exp b/gdb/testsuite/gdb.dwarf2/dw2-aranges.exp
index d1d2a09c883..beda49270c7 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-aranges.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-aranges.exp
@@ -36,7 +36,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" $testfile \
 	  [list $asm_file $srcfile ]] } {
-    return -1
+    return
 }
 
 # Failed gdb_load would abort the testcase execution earlier.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp
index 134397cdfcb..b148ae0e005 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp
@@ -36,7 +36,7 @@ standard_testfile main.c -other.S -dwarf.S
 
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set int_size [get_sizeof "int" 4]
@@ -160,7 +160,7 @@ Dwarf::assemble $asm_file {
 
 if { [build_executable ${testfile}.exp ${testfile} \
 	  [list $srcfile $srcfile2 $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 # Attempt to place a breakpoint on 'some_func', then check GDB is
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp
index 5a8e902b018..aa7c12c12fa 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp
@@ -55,7 +55,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 # A successful run will have two PASSes.  A GDB that's lacking
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp
index 9bba38c8102..79cd67af65d 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp
@@ -22,7 +22,7 @@ set executable ${testfile}
 
 # First try referencing DW_AT_frame_base which is not defined.
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "" } {
-    return -1
+    return
 }
 
 clean_restart $executable
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp
index 307fcc1546d..6f6eb153c3a 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp
@@ -52,7 +52,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 gdb_test "ptype var" "type = bool"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp
index 305fc7173ab..f94bb8633ce 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp
@@ -24,7 +24,7 @@ set dwarf_srcfile "file1.txt"
 
 if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile debug main.c debug $srcfile nodebug]]} {
-    return -1
+    return
 }
 
 gdb_remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bfloat16.exp b/gdb/testsuite/gdb.dwarf2/dw2-bfloat16.exp
index d7b76eaf6e7..6b71e1e0558 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-bfloat16.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-bfloat16.exp
@@ -68,11 +68,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Make sure we can print both types correctly.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp
index 4928bcb3e4c..48206cdc237 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp
@@ -25,7 +25,7 @@ set executable ${testfile}
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 [list nodebug $additional_flags]]} {
-    return -1
+    return
 }
 
 # The correct new[] and delete[] syntax is probably unsupported by GDB.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp
index 7c470ff25a0..38d2652cd3b 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp
@@ -28,7 +28,7 @@ standard_testfile .S
 
 if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile \
       {nodebug nopie f90}] } {
-    return -1
+    return
 }
 
 if {![runto MAIN__]} {
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp b/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp
index b067f3b7f28..6e729f8c6ec 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp
@@ -23,7 +23,7 @@ set additional_flags [gdb_target_symbol_prefix_flags_asm]
 standard_testfile .S
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	$additional_flags]} {
-    return -1
+    return
 }
 
 # Here should be GDB-computed "Compilation directory is".
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-complex-parts.exp b/gdb/testsuite/gdb.dwarf2/dw2-complex-parts.exp
index f0a159e4aa4..f8da14c0a5a 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-complex-parts.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-complex-parts.exp
@@ -33,7 +33,7 @@ standard_testfile main.c -debug.S
 
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 "${srcfile}" {}]} {
-    return -1
+    return
 }
 
 set float_size [get_sizeof float 0]
@@ -159,11 +159,11 @@ Dwarf::assemble $asm_file {
 
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 "${asm_file} ${srcfile}" {}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 proc do_test { type {clang 0}} {
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp
index 5ac342506c9..ff197a4d74f 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp
@@ -26,7 +26,7 @@ if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile \
 	      {debug additional_flags=-static additional_flags=-nostdlib} \
 	      main.c -g0 $srcfile nodebug]]} {
-    return -1
+    return
 }
 
 gdb_remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-const.exp b/gdb/testsuite/gdb.dwarf2/dw2-const.exp
index 41eea8063b1..93ddfaa0f2f 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-const.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-const.exp
@@ -21,7 +21,7 @@ standard_testfile .S
 
 if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile debug main.c debug $srcfile nodebug]]} {
-    return -1
+    return
 }
 
 gdb_test "print twelve" "= 12"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp b/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp
index 1ddf32aab57..a659ae7171a 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp
@@ -27,11 +27,11 @@ standard_testfile .S -main.c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile2 $srcfile] {}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # main is not provided by DWARF.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp b/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp
index db6ad49e996..ea3842fe7c0 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp
@@ -26,7 +26,7 @@ standard_testfile .S
 
 if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile debug main.c debug $srcfile nodebug]]} {
-    return -1
+    return
 }
 
 gdb_test "ptype noloc" "type = const int"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
index a21cc40284b..6b01e1d2880 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
@@ -82,7 +82,7 @@ set srctmpfile tmp-${testfile}.c
 # $srcdir may be relative.
 if {[file pathtype $srcabsdir] != "absolute"} {
     untested "objdir pathtype is not absolute"
-    return -1
+    return
 }
 
 set f [open $asmsrcfile "w"]
@@ -414,7 +414,7 @@ if { [test_compiler_info clang*] } {
 
 if { [gdb_compile "${asmsrcfile} ${srcdir}/${subdir}/$srcfile" "${binfile}" executable $opts] != "" } {
     untested "failed to compile"
-    return -1
+    return
 }
 
 set dirs {}
@@ -450,7 +450,7 @@ remote_exec host "sh -c \"for d in $dircreatelist; do cp ${srcdir}/${subdir}/${s
 clean_restart ${testfile}
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "cd ${srcabsdir}/rdir" "Working directory [string_to_regexp ${srcabsdir}]/rdir\\." "cd .../rdir"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-disasm-over-non-stmt.exp b/gdb/testsuite/gdb.dwarf2/dw2-disasm-over-non-stmt.exp
index 1c0d3979ee9..76de1bc4649 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-disasm-over-non-stmt.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-disasm-over-non-stmt.exp
@@ -94,11 +94,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug} ] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Global lines array, maps lines numbers to the list of addresses
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp b/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp
index f7ddd2280b9..9ae132fae2f 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp
@@ -20,7 +20,7 @@ standard_testfile .S
 set executable ${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "" } {
-    return -1
+    return
 }
 
 clean_restart $executable
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.exp
index dc76285c1ac..bd36d62a5d3 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.exp
@@ -24,7 +24,7 @@ standard_testfile .S
 
 if  { [gdb_compile [file join $srcdir $subdir $srcfile] $binfile \
 	   object {nodebug}] != "" } {
-    return -1
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dummy-cu.exp b/gdb/testsuite/gdb.dwarf2/dw2-dummy-cu.exp
index 6bbc25319b9..2933de41232 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-dummy-cu.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dummy-cu.exp
@@ -22,7 +22,7 @@ standard_testfile .S
 set executable ${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "" } {
-    return -1
+    return
 }
 
 clean_restart $executable
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp b/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp
index df925a65374..6f3c6a0092e 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp
@@ -23,12 +23,12 @@ require is_x86_64_m64_target
 standard_testfile .S
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug nopie}] } {
-    return -1
+    return
 }
 
 if {![runto stop_frame]} {
     perror "Failed to stop in stop_frame"
-    return -1
+    return
 }
 
 gdb_test "bt" \
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-empty-file-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-empty-file-name.exp
index 91ba571de6f..15539bad856 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-empty-file-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-empty-file-name.exp
@@ -52,7 +52,7 @@ Dwarf::assemble $asm_file {
 
 if { [build_executable "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-empty-inline-ranges.exp b/gdb/testsuite/gdb.dwarf2/dw2-empty-inline-ranges.exp
index 914b9d6f813..5c6ec7a2d4e 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-empty-inline-ranges.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-empty-inline-ranges.exp
@@ -60,7 +60,7 @@ get_func_info main
 # can't be disabled.
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list ${srcfile}] {debug nopie}] } {
-    return -1
+    return
 }
 
 # Some addresses that we need when generating the DWARF.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp b/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp
index a00eea2a28e..7b7dd946c00 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-empty-namespace.exp
@@ -23,7 +23,7 @@ standard_testfile .S
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \
 	   object {nodebug}] != "" } {
-    return -1
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.exp b/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.exp
index 9a8a88a7473..f365866c096 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.exp
@@ -21,7 +21,7 @@ standard_testfile .S
 set executable ${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "" } {
-    return -1
+    return
 }
 
 clean_restart $executable
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-entry-pc.exp b/gdb/testsuite/gdb.dwarf2/dw2-entry-pc.exp
index f7cc7f7c067..9a1f5e101e7 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-entry-pc.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-entry-pc.exp
@@ -29,7 +29,7 @@ get_func_info foo
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list ${srcfile}] {debug nopie}]} {
-    return -1
+    return
 }
 
 # Address for the middle of foo.  This is used as our entry point when
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-entry-points.exp b/gdb/testsuite/gdb.dwarf2/dw2-entry-points.exp
index 33feb375b9d..fa3bf5f4b3e 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-entry-points.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-entry-points.exp
@@ -191,11 +191,11 @@ Dwarf::assemble $asm_file {
 
 if {[prepare_for_testing "failed to prepare" ${testfile} \
 	 [list $srcfile $asm_file] {nodebug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Try whether we can set and hit breakpoints at the entry_points.
@@ -220,7 +220,7 @@ gdb_test "bt" [multi_line \
 clean_restart ${testfile}
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "*fooso"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-entry-value-2.exp b/gdb/testsuite/gdb.dwarf2/dw2-entry-value-2.exp
index 710b9285cec..3b48846fb71 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-entry-value-2.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-entry-value-2.exp
@@ -94,7 +94,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" $testfile \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if { ![runto *main] } {
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp b/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp
index 3739dff18cf..fecb2e9296d 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp
@@ -18,11 +18,11 @@ load_lib dwarf.exp
 require dwarf2_support
 
 if { [prepare_for_testing "failed to prepare" "dw2-entry-value" {dw2-entry-value-main.c dw2-entry-value.S} {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto f]} {
-    return -1
+    return
 }
 
 # FAIL was printing:
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp.tcl b/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp.tcl
index 89519f57784..d74a8db0a7b 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp.tcl
+++ b/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp.tcl
@@ -166,11 +166,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Moving to the scope with a local variable.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-error.exp b/gdb/testsuite/gdb.dwarf2/dw2-error.exp
index 6da0949b382..01d07a4e6ec 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-error.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-error.exp
@@ -25,7 +25,7 @@ require is_x86_64_m64_target
 # We can't use prepare_for_testing here because we need to check the
 # 'file' command's output.
 if {[build_executable $testfile.exp $testfile $srcfile {nodebug quiet}]} {
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-filename.exp b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp
index f5e9a4c5bd4..953ad7d8eb5 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-filename.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp
@@ -23,7 +23,7 @@ standard_testfile .S
 set dwarf_srcfile "file1.txt"
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {nodebug}] != "" } {
-    return -1
+    return
 }
 
 gdb_remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-fixed-point.exp b/gdb/testsuite/gdb.dwarf2/dw2-fixed-point.exp
index b3009fa3f83..c52f7302ea6 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-fixed-point.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-fixed-point.exp
@@ -114,11 +114,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing ${testfile}.exp ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Do the testing in Ada mode, since this is the language for which
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp b/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp
index 81048e4c2e2..a6e81e2407d 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp
@@ -90,7 +90,7 @@ proc create_dwarf_assembly {source_file one_diridx} {
 set asm_file [create_dwarf_assembly $srcfile2 false]
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 gdb_test_no_output "set debug symtab-create 1"
@@ -108,7 +108,7 @@ gdb_test_multiple "ptype bar" "" {
 set asm_file [create_dwarf_assembly $srcfile3 true]
 if {[prepare_for_testing "failed to prepare" ${testfile}-one-diridx \
 	 [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 gdb_test "ptype bar" ".*" "do not crash with only one directory table entry"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp b/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp
index 79030d01f95..59a5ff6aaf9 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp
@@ -24,7 +24,7 @@ standard_testfile .S main.c
 
 if { [build_executable "failed to prepare" ${testfile} \
 	  [list $srcfile $srcfile2] {nodebug}] } {
-    return -1
+    return
 }
 
 # We are trying to verify that the partial symtab to symtab expansion
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp
index 048ab99f205..7efeec9b489 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp
@@ -59,11 +59,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto func]} {
-    return -1
+    return
 }
 
 gdb_test "p/x param" " = 0xdeadf00d"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inheritance.exp b/gdb/testsuite/gdb.dwarf2/dw2-inheritance.exp
index a0325cfb71d..a65a0e702bb 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inheritance.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inheritance.exp
@@ -24,7 +24,7 @@ standard_testfile .S
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \
 	   object {nodebug}] != "" } {
-    return -1
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp
index 7e7223cfcaf..114252335de 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp
@@ -29,7 +29,7 @@ set basename "inline-break"
 standard_testfile .S
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}] } {
-    return -1
+    return
 }
 
 #
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp
index 3b712fb1ab3..d8e8c059147 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp
@@ -142,11 +142,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] $build_options] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp
index 831ed521fd5..c1faccb883a 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp
@@ -131,11 +131,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] $build_options] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-many-frames.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-many-frames.exp
index 2854e866618..7709fec14fc 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-many-frames.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-many-frames.exp
@@ -286,11 +286,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # First we step through all of the functions until we get the 'kkk'.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
index 8e218a9f8d0..7f9f9464aaf 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
@@ -23,7 +23,7 @@ set binfile_stripped ${binfile}-stripped
 
 if { [prepare_for_testing "failed to prepare" "${testfile}" \
 	  [list $srcfile2 $srcfile] {nodebug nopie}] } {
-    return -1
+    return
 }
 
 set break_at ""
@@ -52,7 +52,7 @@ if {$result != 0} {
 gdb_load ${binfile_stripped}
 
 if {![runto "*${break_at}"]} {
-    return -1
+    return
 }
 
 set index [have_index $binfile_stripped]
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp
index c6086e39d00..bf372fcd563 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp
@@ -120,11 +120,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug optimize=-O1}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Delete all breakpoints, watchpoints, tracepoints, and catchpoints so that
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-stepping.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-stepping.exp
index 320d7188fe2..07e9ef45be0 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-stepping.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-stepping.exp
@@ -123,11 +123,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set patterns [list "main call foo" \
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-with-lexical-scope.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-with-lexical-scope.exp
index 8bdd6128eed..1454b1e14c4 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-with-lexical-scope.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-with-lexical-scope.exp
@@ -132,7 +132,7 @@ Dwarf::assemble $asm_file {
 
 if {[prepare_for_testing "failed to prepare" ${testfile} \
 	 [list $srcfile $asm_file] {nodebug}]} {
-    return -1
+    return
 }
 
 runto breakpoint_label
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-error-2.exp b/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-error-2.exp
index 14bcda616e9..b783bf7434e 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-error-2.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-error-2.exp
@@ -45,7 +45,7 @@ Dwarf::assemble $asm_file {
 
 if {[build_executable "failed to prepare" $testfile \
 	 [list $asm_file $srcfile] {nodebug}]} {
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-error.exp b/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-error.exp
index 0919177f313..2e892350db5 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-error.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-error.exp
@@ -47,7 +47,7 @@ Dwarf::assemble $asm_file {
 
 if {[build_executable "failed to prepare" $testfile \
 	 [list $asm_file $srcfile] {nodebug}]} {
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-forth-and-back.exp b/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-forth-and-back.exp
index 577b387d126..a1aee9b2f47 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-forth-and-back.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-forth-and-back.exp
@@ -57,7 +57,7 @@ Dwarf::assemble $asm_file {
 
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 [list $asm_file $srcfile] {nodebug}]} {
-    return -1
+    return
 }
 
 # Regression test for PR32081.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-symbol.exp b/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-symbol.exp
index 8f70def01a7..964868f8d3e 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-symbol.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inter-cu-symbol.exp
@@ -74,11 +74,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto main]} {
-    return -1
+    return
 }
 
 gdb_test "p var1" " = 1"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp
index 7f927f11f6e..99c7cf8c111 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp
@@ -24,7 +24,7 @@ set dwarf_srcfile "file1.txt"
 
 if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile debug main.c debug $srcfile nodebug]]} {
-    return -1
+    return
 }
 
 set remote_dwarf_srcfile [gdb_remote_download host \
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp
index 66dcdb8f9f9..c94a49f466b 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp
@@ -24,7 +24,7 @@ set dwarf_srcfile "file1.txt"
 
 if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile debug main.c debug $srcfile nodebug]]} {
-    return -1
+    return
 }
 
 gdb_remote_download host \
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-is-stmt-2.exp b/gdb/testsuite/gdb.dwarf2/dw2-is-stmt-2.exp
index 6791a46386c..df29523bcaa 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-is-stmt-2.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-is-stmt-2.exp
@@ -145,11 +145,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Check stepping through the out of order lines gives the experience
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp b/gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp
index e20949ffee3..6d0c3795ea3 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp
@@ -96,11 +96,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # First, break by address at a location we know is marked as not a
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp b/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp
index feb6245c8c1..eb119d062c0 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp
@@ -56,7 +56,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 			  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 runto_main
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp b/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp
index 804bc07d640..edc479134b1 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp
@@ -110,11 +110,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "$srcfile:27"
@@ -130,7 +130,7 @@ gdb_test "n" "foo \\(2\\);" "bar2, 1st next"
 gdb_test "n" "foo \\(4\\);" "bar2, 2nd next"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "bar1_label_3"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp b/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp
index a243b6ad01a..e45ca986c15 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp
@@ -29,11 +29,11 @@ set executable ${testfile}
 if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile c++ $testfile-main.cc {c++ nodebug} \
 	      $srcfile {}]]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # main is not provided by DWARF.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-main-no-line-number.exp b/gdb/testsuite/gdb.dwarf2/dw2-main-no-line-number.exp
index aaef7478f41..b2f7a42c730 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-main-no-line-number.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-main-no-line-number.exp
@@ -46,11 +46,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set breakpoint_at_missing_lineno_set [gdb_breakpoint "1" no-message]
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp b/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp
index fe700ccee8d..8f582f6e752 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp
@@ -26,7 +26,7 @@ standard_testfile .S
 
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 	 ${additional_flags}]} {
-    return -1
+    return
 }
 
 # The "info func" code tries to expand the corresponding symtab when a
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp b/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp
index 2819895b55a..74a5ea90b13 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp
@@ -41,7 +41,7 @@ Dwarf::assemble $asm_file {
 # file command (so we can check its output).
 if {[build_executable "failed to build executable" $testfile \
 	 [list $srcfile $asm_file] {nodebug quiet}]} {
-    return -1
+    return
 }
 
 set host_binfile [gdb_remote_download host $binfile]
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.exp
index 6624ce4cdfa..28d16d535a9 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.exp
@@ -21,7 +21,7 @@ standard_testfile .S
 
 # First try referencing DW_AT_frame_base which is not defined.
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "" } {
-    return -1
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-multiple-debug-info.exp b/gdb/testsuite/gdb.dwarf2/dw2-multiple-debug-info.exp
index ada547a0440..d8892be95d0 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-multiple-debug-info.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-multiple-debug-info.exp
@@ -28,7 +28,7 @@ lappend opts additional_flags=-fdebug-types-section
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" object \
 	  $opts] != "" } {
-    return -1
+    return
 }
 
 clean_restart $::testfile
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-namespaceless-anonymous.exp b/gdb/testsuite/gdb.dwarf2/dw2-namespaceless-anonymous.exp
index 8722be6bf09..34f911eca12 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-namespaceless-anonymous.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-namespaceless-anonymous.exp
@@ -55,7 +55,7 @@ Dwarf::assemble $asm_file {
 
 if {[prepare_for_testing ${testfile}.exp ${testfile} \
 	 [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 gdb_test "ptype '(anonymous namespace)::v'" "type = myint"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-no-code-cu.exp b/gdb/testsuite/gdb.dwarf2/dw2-no-code-cu.exp
index 53ef496ea4a..b3b9ea034fe 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-no-code-cu.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-no-code-cu.exp
@@ -16,7 +16,7 @@
 standard_testfile .c main.c
 
 if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2"]} {
-    return -1
+    return
 }
 
 set cmd "p var"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp
index 230d39a7ed5..962e6ba2a51 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp
@@ -211,7 +211,7 @@ Dwarf::assemble $asm_file {
 }
 
 if { [prepare_for_testing "failed to prepare" ${testfile} [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 # Symbols have the form: {file,main}_loc{addr,empty,no}_{,un}resolvable
@@ -273,7 +273,7 @@ proc file_symbols {type} {
 file_symbols no-run
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 file_symbols in-main
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp b/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp
index 3cb4cb4107f..a7d32a63d8b 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp
@@ -29,7 +29,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile_outer}" "${binfile_outer}" \
       object {}] != ""
      || [gdb_compile "${srcdir}/${subdir}/${srcfile_inner}" "${binfile_inner}" \
       object {}] != "" } {
-    return -1
+    return
 }
 
 clean_restart $executable_outer
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp b/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp
index eb5b67222bb..852eb5b5e04 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp
@@ -23,7 +23,7 @@ standard_testfile .S main.c
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $srcfile2] {nodebug}] } {
-    return -1
+    return
 }
 
 # Additional test to verify the referenced CU is not aged out.
@@ -35,7 +35,7 @@ gdb_test "p array3" " = 3" "array3 using DW_OP_call4"
 
 # Location lists need PC.
 if {![runto_main]} {
-    return -1
+    return
 }
 gdb_test "p arraynoloc" " = <optimized out>"
 gdb_test "p arraycallnoloc" {Asked for position 0 of stack, stack only has 0 elements on it\.}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp b/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp
index fa10f6b6c3c..92fd7f71fb9 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp
@@ -24,11 +24,11 @@ require dwarf2_support
 require is_x86_64_m64_target
 
 if { [prepare_for_testing "failed to prepare" "${test}" ${test}.S {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "breakpt"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-op-stack-value.exp b/gdb/testsuite/gdb.dwarf2/dw2-op-stack-value.exp
index 196dd822cc8..0aa06852ac3 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-op-stack-value.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-op-stack-value.exp
@@ -24,7 +24,7 @@ standard_testfile .S
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \
 	   object {nodebug}] != "" } {
-    return -1
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp b/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp
index ef5e79dd68f..7951d251444 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp
@@ -243,7 +243,7 @@ proc do_mi_test {} {
 }
 
 if { [build_test_program] == -1 } {
-    return -1
+    return
 }
 
 do_console_test
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp b/gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp
index 63fe8bfaba7..3d790f1d4af 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-out-of-range-end-of-seq.exp
@@ -76,11 +76,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set test "END with address 1 eliminated"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp b/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp
index 9e4ea48c247..cdd3923cb2c 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp
@@ -21,11 +21,11 @@ standard_testfile .S -main.c
 
 if { [prepare_for_testing "failed to prepare" "${testfile}" \
 	  [list $srcfile2 $srcfile] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto f]} {
-    return -1
+    return
 }
 
 # FAIL was printing:
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp
index 23d233331bf..8f50ab7b9c2 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp
@@ -22,7 +22,7 @@ set dwarf_srcfile "file1.txt"
 
 if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile debug main.c debug $srcfile nodebug]]} {
-    return -1
+    return
 }
 
 gdb_remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-prologue-end-2.exp b/gdb/testsuite/gdb.dwarf2/dw2-prologue-end-2.exp
index 0bd6c039863..acb9f3bb600 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-prologue-end-2.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-prologue-end-2.exp
@@ -73,7 +73,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 # Don't runto main here, otherwise the following doesn't
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp b/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp
index 76cf6f3309f..294e7c8bf45 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp
@@ -80,11 +80,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 set prologue_end_line [gdb_get_line_number "main assign o"]
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp
index f2271b54b49..0b792f8e4cf 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp
@@ -118,11 +118,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Make use of the line numbers we faked in the .debug_line table above.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-overlap.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-overlap.exp
index cbab1a8ede5..924752ccd65 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-overlap.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-overlap.exp
@@ -67,11 +67,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto foo]} {
-    return -1
+    return
 }
 
 gdb_test "show language" \
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym-warning.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym-warning.exp
index b6486247620..ea5ef93c014 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym-warning.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym-warning.exp
@@ -31,7 +31,7 @@ standard_testfile -main.c .c -dw.S
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list ${srcfile} ${srcfile2}]] } {
-    return -1
+    return
 }
 
 set asm_file [standard_output_file $srcfile3]
@@ -102,7 +102,7 @@ Dwarf::assemble $asm_file {
 
 if { [build_executable "failed to prepare" ${testfile} \
 	  [list $srcfile $srcfile2 $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 clean_restart
@@ -110,7 +110,7 @@ clean_restart
 gdb_load_no_complaints $binfile
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Generate backtrace from baz, that visits the hole in the addrmap.  If
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym.exp
index fa8a0e7d421..eb4187f151c 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-psym.exp
@@ -33,7 +33,7 @@ standard_testfile main.c .c -dw.S
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list ${srcfile} ${srcfile2}]] } {
-    return -1
+    return
 }
 
 set asm_file [standard_output_file $srcfile3]
@@ -113,14 +113,14 @@ Dwarf::assemble $asm_file {
 
 if { [build_executable "failed to prepare" ${testfile} \
 	  [list $srcfile $srcfile2 $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 clean_restart
 gdb_load_no_complaints $binfile
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # "someothername" should be put into the partial symbol table, but
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp b/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp
index 3ef8589f7ba..0ff1865da71 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp
@@ -44,7 +44,7 @@ if { [prepare_for_testing_full "failed to prepare" \
 	       $srcfile [concat $flags {nodebug}]  \
 	       $srcfile2 {nodebug} \
 	       $srcfile3 {debug}]] == -1 } {
-    return -1
+    return
 }
 
 # First try referencing DW_AT_frame_base which is not defined.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp b/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
index 10a801b2b63..b9a8cbbdb31 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
@@ -23,12 +23,12 @@ require is_x86_64_m64_target
 standard_testfile .S
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug nopie}] } {
-    return -1
+    return
 }
 
 if {![runto stop_frame]} {
     perror "Failed to stop in stop_frame"
-    return -1
+    return
 }
 
 gdb_test "bt" "#0  (${::hex} in )?stop_frame \[^\r\n\]*\r\n#1  \[^\r\n\]*first_frame \[^\r\n\]*\r\n#2  \[^\r\n\]*main\[^\r\n\]*" \
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp b/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp
index 29693c0c037..c4aac0b4818 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp
@@ -56,7 +56,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 			  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 runto_main
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-restore.exp b/gdb/testsuite/gdb.dwarf2/dw2-restore.exp
index 98d80e7d637..e0c334f80cc 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-restore.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-restore.exp
@@ -28,11 +28,11 @@ if { [test_compiler_info clang*] } {
 
 if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile] \
 	 $opts]} {
-    return -1
+    return
 }
 
 if {![runto foo]} {
-    return 0
+    return
 }
 gdb_test "continue" "$hex in foo \\(\\)"
 gdb_test "where" "#0 +$hex in foo \\(\\)\r\n#1 +$hex in _start \\(\\)"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp b/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp
index 15b53dc1a1d..be138b89693 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp
@@ -25,7 +25,7 @@ standard_testfile .S
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 	 {nodebug nopie}]} {
-    return -1
+    return
 }
 
 gdb_test "ptype f" "int \\(char \\\* restrict\\)"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-simple-locdesc.exp b/gdb/testsuite/gdb.dwarf2/dw2-simple-locdesc.exp
index a2864b1b0ce..541e087c23f 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-simple-locdesc.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-simple-locdesc.exp
@@ -20,7 +20,7 @@ require dwarf2_support
 standard_testfile .S
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "" } {
-    return -1
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
index c7ffd9224e9..6812d5b06b8 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
@@ -28,7 +28,7 @@ standard_testfile .S
 set csrcfile ${testfile}.c
 
 if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile {nodebug nopie}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-skip-prologue.exp b/gdb/testsuite/gdb.dwarf2/dw2-skip-prologue.exp
index 582c343ad83..276793325d6 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-skip-prologue.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-skip-prologue.exp
@@ -47,7 +47,7 @@ if { [build_executable ${testfile}.exp ${executable} \
 	  "${testfile}.c ${testfile}.S" \
 	  [list additional_flags=-DINLINED \
 		additional_flags=-DPTRBITS=$ptrbits]] == -1 } {
-    return -1
+    return
 }
 
 # We need those symbols global to access them from the .S file.
@@ -68,7 +68,7 @@ pass $test
 clean_restart $executable
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "func"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-skipped-line-entries.exp b/gdb/testsuite/gdb.dwarf2/dw2-skipped-line-entries.exp
index 2ab89b132f3..d3bafd4abf1 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-skipped-line-entries.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-skipped-line-entries.exp
@@ -152,11 +152,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if { ![runto_main] } {
-    return -1
+    return
 }
 
 # Check the END markers using 'maint info line-table'.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp
index d76dea6f080..a3bde43c62b 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp
@@ -20,7 +20,7 @@ require dwarf2_support
 standard_testfile .S
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "" } {
-    return -1
+    return
 }
 
 clean_restart
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-step-between-different-inline-functions.exp b/gdb/testsuite/gdb.dwarf2/dw2-step-between-different-inline-functions.exp
index 76ca8ddc7f1..9ab8e1c953a 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-step-between-different-inline-functions.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-step-between-different-inline-functions.exp
@@ -180,11 +180,11 @@ Dwarf::assemble $asm_file {
 
 if {[prepare_for_testing "failed to prepare" "${::testfile}" \
 	 [list $srcfile $asm_file] {nodebug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint bar
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-step-between-inline-func-blocks.exp b/gdb/testsuite/gdb.dwarf2/dw2-step-between-inline-func-blocks.exp
index 506057df732..33697ae9e4a 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-step-between-inline-func-blocks.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-step-between-inline-func-blocks.exp
@@ -163,11 +163,11 @@ Dwarf::assemble $asm_file {
 
 if {[prepare_for_testing "failed to prepare" "${::testfile}" \
 	 [list $srcfile $asm_file] {nodebug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint bar
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-step-out-of-function-no-stmt.exp b/gdb/testsuite/gdb.dwarf2/dw2-step-out-of-function-no-stmt.exp
index c381229397b..285cd00bfc5 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-step-out-of-function-no-stmt.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-step-out-of-function-no-stmt.exp
@@ -99,11 +99,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Step into bar.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-strp.exp b/gdb/testsuite/gdb.dwarf2/dw2-strp.exp
index 6f3a867aaf6..7dbc94f57ca 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-strp.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-strp.exp
@@ -24,7 +24,7 @@ standard_testfile .S
 
 if {[prepare_for_testing_full "failed to prepare" \
 	 [list $testfile debug main.c debug $srcfile nodebug]]} {
-    return -1
+    return
 }
 
 gdb_test "p a_string" " = \"hello world!\\\\n\""
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes-lookup.exp b/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes-lookup.exp
index 9b1ccea00f6..0b2d7f64f75 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes-lookup.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes-lookup.exp
@@ -91,7 +91,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" $testfile \
 	  "${asm_file} ${srcfile}" {}] } {
-    return -1
+    return
 }
 
 # Check that no symtabs are expanded.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp b/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp
index 7a1e4fb35b2..7c7c2a20432 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp
@@ -63,14 +63,14 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" $testfile \
 	  "${asm_file} ${srcfile}" {}] } {
-    return -1
+    return
 }
 
 # Check that no symtabs are expanded.
 set test "no symtabs expanded"
 if { [readnow] } {
     unsupported $test
-    return -1
+    return
 }
 gdb_test_no_output "maint info symtabs" $test
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-tu-dwarf-4-5.exp b/gdb/testsuite/gdb.dwarf2/dw2-tu-dwarf-4-5.exp
index 7493b2cbc55..359c8e12833 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-tu-dwarf-4-5.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-tu-dwarf-4-5.exp
@@ -43,7 +43,7 @@ if { [prepare_for_testing_full "failed to prepare" \
 	 [list $testfile $lopts \
 	      $srcfile $opts \
 	      $srcfile2 $opts2]] } {
-    return -1
+    return
 }
 
 gdb_test_no_output \
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp b/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp
index 88765d4f513..8dac3949c5f 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp
@@ -23,11 +23,11 @@ require dwarf2_support
 require is_x86_64_m64_target
 
 if {[prepare_for_testing "failed to prepare" "$testfile" $srcfile {nodebug nopie}]} {
-    return -1
+    return
 }
 
 if {![runto "stop_frame"]} {
-    return -1
+    return
 }
 
 # If test is compiled with clang, GDB would display absolute path.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp b/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp
index 06ce7a76478..1034ab5faf4 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp
@@ -23,11 +23,11 @@ set additional_flags [gdb_target_symbol_prefix_flags_asm]
 if { [prepare_for_testing "failed to prepare" "dw2-unresolved" \
 	{dw2-unresolved-main.c dw2-unresolved.S} \
 	[list nodebug $additional_flags]] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # This testcase tests LOC_UNRESOLVED works right.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.exp
index 7acfb714f3d..fe0974fd8f4 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.exp
@@ -93,11 +93,11 @@ Dwarf::assemble $asm_file {
 
 if {[prepare_for_testing "failed to prepare" $testfile \
 	 "${asm_file} ${srcfile} ${srcfile2}" {}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 foreach f {foo bar foo2} {
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unusual-field-names.exp b/gdb/testsuite/gdb.dwarf2/dw2-unusual-field-names.exp
index 43cdfccb1ae..b3bb1ed0f8c 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-unusual-field-names.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-unusual-field-names.exp
@@ -42,7 +42,7 @@ set asm_file [standard_output_file $srcfile2]
 # would do, but since we already have one specifically for this
 # testcase, might as well use that.
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
-    return -1
+    return
 }
 set int_size [get_sizeof "int" -1]
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp b/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp
index 04ea209ddd7..68d25f70375 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp
@@ -25,7 +25,7 @@ require dwarf2_support
 standard_testfile .c -dw.S
 
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
+    return
 }
 
 set asm_file [standard_output_file $srcfile2]
@@ -86,11 +86,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Print the type of global_var.  This type information is entirely
@@ -122,7 +122,7 @@ set result [remote_exec host "[gdb_find_objcopy] $args"]
 set status [lindex $result 0]
 set output [lindex $result 1]
 if { $status == 0 && ![string equal $output ""] } {
-    return -1
+    return
 }
 
 # Now copy the executable, and remove the .debug_str section.  This
@@ -133,7 +133,7 @@ set binfile_no_debug_str "${host_binfile}-no-debug-str"
 set args "--remove-section .debug_str $host_binfile ${binfile_no_debug_str}"
 if {[run_on_host "objcopy" [gdb_find_objcopy] "$args"]} {
     perror "failed to run objcopy"
-    return -1
+    return
 }
 
 # Restart GDB, but don't load an executable.  When we do load the
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp b/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp
index bbe74955e44..04a2aa06ea9 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp
@@ -21,7 +21,7 @@ standard_testfile .S main.c
 
 if {[prepare_for_testing "failed to prepare" ${testfile} \
 	 [list $srcfile $srcfile2] {nodebug}]} {
-    return -1
+    return
 }
 
 proc test { } {
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp b/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp
index d12b6831107..f02d82c3f22 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp
@@ -64,11 +64,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "$srcfile:27" message
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-weird-type-len.exp b/gdb/testsuite/gdb.dwarf2/dw2-weird-type-len.exp
index acc5c115d8e..5d31a05b06b 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-weird-type-len.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-weird-type-len.exp
@@ -88,11 +88,11 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" ${testfile} \
 	  [list $srcfile $asm_file] {nodebug}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # At one point this would trigger a divide by zero inside GDB.  Now we
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-wrong-mangled-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-wrong-mangled-name.exp
index 26e8ffaba75..bec85887e03 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-wrong-mangled-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-wrong-mangled-name.exp
@@ -54,11 +54,11 @@ Dwarf::assemble $asm_file {
 
 if {[prepare_for_testing "failed to prepare" ${testfile} \
 	 [list $srcfile $asm_file] {nodebug}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint "func_demangled_test"
diff --git a/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.exp b/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.exp
index 15a01b616f3..b02f71422c0 100644
--- a/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.exp
@@ -21,7 +21,7 @@ standard_testfile .S
 set executable ${testfile}
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "" } {
-    return -1
+    return
 }
 
 save_vars { GDBFLAGS } {
diff --git a/gdb/testsuite/gdb.dwarf2/dw4-sig-types.exp b/gdb/testsuite/gdb.dwarf2/dw4-sig-types.exp
index cf731e3d110..bb0769050bc 100644
--- a/gdb/testsuite/gdb.dwarf2/dw4-sig-types.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw4-sig-types.exp
@@ -26,14 +26,14 @@ include_file dw4-sig-types.h
 if { [prepare_for_testing "failed to prepare" "${testfile}" \
 	  [list $srcfile $srcfile2] \
 	  {debug c++ additional_flags=-gdwarf-4 additional_flags=-fdebug-types-section}] } {
-    return -1
+    return
 }
 
 # Stress test gdb's handling of cached comp units, disable the cache.
 gdb_test_no_output "maint set dwarf max-cache-age 0"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 # Bring symtab for myset into gdb.
diff --git a/gdb/testsuite/gdb.dwarf2/dw4-toplevel-types.exp b/gdb/testsuite/gdb.dwarf2/dw4-toplevel-types.exp
index 8429af8574d..0f9b8385bed 100644
--- a/gdb/testsuite/gdb.dwarf2/dw4-toplevel-types.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw4-toplevel-types.exp
@@ -24,11 +24,11 @@ standard_testfile .cc
 if { [prepare_for_testing "failed to prepare" "${testfile}" \
 	  $srcfile {debug c++ additional_flags=-gdwarf-4 \
 			additional_flags=-fdebug-types-section}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "ptype X" "type = struct X {.*"
diff --git a/gdb/testsuite/gdb.dwarf2/dw5-rnglist-test.exp b/gdb/testsuite/gdb.dwarf2/dw5-rnglist-test.exp
index 9e47cdac5fc..02f1777bdd5 100644
--- a/gdb/testsuite/gdb.dwarf2/dw5-rnglist-test.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw5-rnglist-test.exp
@@ -25,11 +25,11 @@ standard_testfile .cc
 
 if { [prepare_for_testing "failed to prepare" "${testfile}" \
 	  $srcfile {debug c++ dwarf5 additional_flags=-O0}] } {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break-here"]
diff --git a/gdb/testsuite/gdb.dwarf2/dwp-sepdebug.exp b/gdb/testsuite/gdb.dwarf2/dwp-sepdebug.exp
index 4ca793059ba..9e203809e84 100644
--- a/gdb/testsuite/gdb.dwarf2/dwp-sepdebug.exp
+++ b/gdb/testsuite/gdb.dwarf2/dwp-sepdebug.exp
@@ -16,11 +16,11 @@
 standard_testfile
 
 if { [build_executable ${testfile}.exp ${testfile} ${srcfile}] == -1 } {
-    return -1
+    return
 }
 if {![remote_file host exists [standard_output_file ${testfile}.dwp]]} {
     unsupported "testsuite run does not produce dwp files"
-    return 0
+    return
 }
 
 # Note: the procedure gdb_gnu_strip_debug will produce an executable called
@@ -32,7 +32,7 @@ if {![remote_file host exists [standard_output_file ${testfile}.dwp]]} {
 if {[gdb_gnu_strip_debug $binfile$EXEEXT]} {
     # check that you have a recent version of strip and objcopy installed
     unsupported "cannot produce separate debug info files"
-    return -1
+    return
 }
 
 clean_restart "$testfile"
diff --git a/gdb/testsuite/gdb.dwarf2/dwp-symlink.exp b/gdb/testsuite/gdb.dwarf2/dwp-symlink.exp
index fa1ed877d7e..fb1202afae9 100644
--- a/gdb/testsuite/gdb.dwarf2/dwp-symlink.exp
+++ b/gdb/testsuite/gdb.dwarf2/dwp-symlink.exp
@@ -18,14 +18,14 @@ standard_testfile
 remote_file host delete [standard_output_file ${testfile}.dwp]
 if {[remote_file host exists [standard_output_file ${testfile}.dwp]]} {
     unsupported "dwp file cannot be deleted"
-    return 0
+    return
 }
 if { [build_executable ${testfile}.exp ${testfile} ${srcfile}] == -1 } {
-    return -1
+    return
 }
 if {![remote_file host exists [standard_output_file ${testfile}.dwp]]} {
     unsupported "testsuite run does not produce dwp files"
-    return 0
+    return
 }
 
 set thelink "${testfile}-thelink"
@@ -36,11 +36,11 @@ remote_file host delete [standard_output_file ${thelink}.dwp]
 remote_exec host "ln -sf ${testfile} [standard_output_file $thelink]"
 if {![remote_file host exists [standard_output_file $thelink]]} {
     unsupported "host does not support symbolic links (binary symlink is missing)"
-    return 0
+    return
 }
 if {[remote_file host exists [standard_output_file $thelink.dwp]]} {
     unsupported "host does not support symbolic links (we tried to delete a file and it is still there)"
-    return 0
+    return
 }
 
 clean_restart "$testfile"
@@ -57,11 +57,11 @@ gdb_exit
 remote_exec host "mv -f [standard_output_file ${testfile}.dwp] [standard_output_file ${thelink}.dwp]"
 if {[remote_file host exists [standard_output_file ${testfile}.dwp]]} {
     unsupported "host does not support symbolic links (binary symlink exists)"
-    return 0
+    return
 }
 if {![remote_file host exists [standard_output_file ${thelink}.dwp]]} {
     unsupported "host does not support symbolic links (dwp symlink is missing)"
-    return 0
+    return
 }
 
 clean_restart "$testfile"
@@ -126,7 +126,7 @@ remote_exec host "ln -sf ${dwp_dwp_dir}/${dwp_real_dwp} ${dwp_symlink_dir}/${dwp
 clean_restart "${dwp_symlink_dir}/${dwp_symlink_binary}"
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test {print argv[0]} "/${dwp_symlink_binary}\"" \
diff --git a/gdb/testsuite/gdb.dwarf2/dwz-many.exp b/gdb/testsuite/gdb.dwarf2/dwz-many.exp
index 551dd070958..f11fd54c590 100644
--- a/gdb/testsuite/gdb.dwarf2/dwz-many.exp
+++ b/gdb/testsuite/gdb.dwarf2/dwz-many.exp
@@ -42,7 +42,7 @@ if {[prepare_for_testing_full "failed to prepare" \
 	      $srcfile {nodebug} \
 	      $asm_file {nodebug} \
 	      $srcfile3 {debug}]]} {
-    return -1
+    return
 }
 
 set linenr [gdb_get_line_number "return 0" $srcfile3]
diff --git a/gdb/testsuite/gdb.dwarf2/dwz-unused-pu.exp b/gdb/testsuite/gdb.dwarf2/dwz-unused-pu.exp
index 4d074fb7464..db497636d64 100644
--- a/gdb/testsuite/gdb.dwarf2/dwz-unused-pu.exp
+++ b/gdb/testsuite/gdb.dwarf2/dwz-unused-pu.exp
@@ -56,7 +56,7 @@ Dwarf::assemble $asm_file {
 
 if { [prepare_for_testing "failed to prepare" $testfile \
 	  [list $asm_file $srcfile] {nodebug}] } {
-    return -1
+    return
 }
 
 set cmd "p the_int"
diff --git a/gdb/testsuite/gdb.dwarf2/dwz.exp b/gdb/testsuite/gdb.dwarf2/dwz.exp
index c907a64f53f..96dab6cf930 100644
--- a/gdb/testsuite/gdb.dwarf2/dwz.exp
+++ b/gdb/testsuite/gdb.dwarf2/dwz.exp
@@ -81,11 +81,11 @@ Dwarf::assemble $asm_file {
 }
 
 if {[prepare_for_testing "failed to prepare" $testfile "${asm_file} ${srcfile}" {}]} {
-    return -1
+    return
 }
 
 if {![runto_main]} {
-    return -1
+    return
 }
 
 gdb_test "p other_int" " = 99"
diff --git a/gdb/testsuite/gdb.dwarf2/dwznolink.exp b/gdb/testsuite/gdb.dwarf2/dwznolink.exp
index e6c6ce6005d..898ae1637f5 100644
--- a/gdb/testsuite/gdb.dwarf2/dwznolink.exp
+++ b/gdb/testsuite/gdb.dwarf2/dwznolink.exp
@@ -46,7 +46,7 @@ Dwarf::assemble $asm_file {
 # 'file' command's output.
 if {[build_executable $testfile.exp $testfile \
 	 [list $srcfile $asm_file] {nodebug quiet}]} {
-    return -1
+    return
 }
 
 clean_restar[...]

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