public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] gdb/testsuite: fix "continue outside of loop" TCL errors
@ 2022-05-16 13:08 Bruno Larsen
  0 siblings, 0 replies; only message in thread
From: Bruno Larsen @ 2022-05-16 13:08 UTC (permalink / raw)
  To: gdb-cvs

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cdd4206647d0ef8d54d0fa66b3dfa57a4ec07db9

commit cdd4206647d0ef8d54d0fa66b3dfa57a4ec07db9
Author: Bruno Larsen <blarsen@redhat.com>
Date:   Fri May 13 13:23:57 2022 -0300

    gdb/testsuite: fix "continue outside of loop" TCL errors
    
    Many test cases had a few lines in the beginning that look like:
    
    if { condition } {
      continue
    }
    
    Where conditions varied, but were mostly in the form of ![runto_main] or
    [skip_*_tests], making it quite clear that this code block was supposed
    to finish the test if it entered the code block. This generates TCL
    errors, as most of these tests are not inside loops.  All cases on which
    this was an obvious mistake are changed in this patch.

Diff:
---
 gdb/testsuite/gdb.ada/mi_ex_cond.exp                         |  2 +-
 gdb/testsuite/gdb.ada/mi_task_arg.exp                        |  2 +-
 gdb/testsuite/gdb.ada/mi_task_info.exp                       |  2 +-
 gdb/testsuite/gdb.base/all-bin.exp                           |  2 +-
 gdb/testsuite/gdb.base/arithmet.exp                          |  2 +-
 gdb/testsuite/gdb.base/arrayidx.exp                          |  2 +-
 gdb/testsuite/gdb.base/assign.exp                            |  2 +-
 gdb/testsuite/gdb.base/async.exp                             |  2 +-
 gdb/testsuite/gdb.base/attach-pie-misread.exp                |  2 +-
 gdb/testsuite/gdb.base/bfp-test.exp                          |  2 +-
 gdb/testsuite/gdb.base/bitshift.exp                          |  2 +-
 gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp           |  2 +-
 gdb/testsuite/gdb.base/branch-to-self.exp                    |  2 +-
 gdb/testsuite/gdb.base/break-interp.exp                      |  2 +-
 gdb/testsuite/gdb.base/call-ar-st.exp                        |  4 ++--
 gdb/testsuite/gdb.base/call-rt-st.exp                        |  4 ++--
 gdb/testsuite/gdb.base/call-sc.exp                           |  2 +-
 gdb/testsuite/gdb.base/call-signal-resume.exp                |  4 ++--
 gdb/testsuite/gdb.base/call-strs.exp                         |  4 ++--
 gdb/testsuite/gdb.base/callexit.exp                          |  2 +-
 gdb/testsuite/gdb.base/callfuncs.exp                         |  2 +-
 gdb/testsuite/gdb.base/cast-call.exp                         |  2 +-
 gdb/testsuite/gdb.base/catch-fork-static.exp                 |  2 +-
 gdb/testsuite/gdb.base/catch-signal-fork.exp                 |  2 +-
 gdb/testsuite/gdb.base/catch-signal.exp                      |  2 +-
 gdb/testsuite/gdb.base/checkpoint.exp                        |  4 ++--
 gdb/testsuite/gdb.base/cond-expr.exp                         |  2 +-
 gdb/testsuite/gdb.base/consecutive.exp                       |  2 +-
 gdb/testsuite/gdb.base/constvars.exp                         |  2 +-
 gdb/testsuite/gdb.base/ctf-constvars.exp                     |  2 +-
 gdb/testsuite/gdb.base/ctf-ptype.exp                         |  2 +-
 gdb/testsuite/gdb.base/dfp-test.exp                          |  2 +-
 gdb/testsuite/gdb.base/disasm-optim.exp                      |  2 +-
 gdb/testsuite/gdb.base/enum_cond.exp                         |  2 +-
 gdb/testsuite/gdb.base/eval-skip.exp                         |  2 +-
 gdb/testsuite/gdb.base/exe-lock.exp                          |  2 +-
 gdb/testsuite/gdb.base/exitsignal.exp                        |  2 +-
 gdb/testsuite/gdb.base/exprs.exp                             |  2 +-
 gdb/testsuite/gdb.base/fileio.exp                            |  4 ++--
 gdb/testsuite/gdb.base/float.exp                             |  2 +-
 gdb/testsuite/gdb.base/float128.exp                          |  2 +-
 gdb/testsuite/gdb.base/floatn.exp                            |  2 +-
 gdb/testsuite/gdb.base/foll-exec-mode.exp                    |  4 ++--
 gdb/testsuite/gdb.base/foll-exec.exp                         |  2 +-
 gdb/testsuite/gdb.base/gdb1250.exp                           |  2 +-
 gdb/testsuite/gdb.base/gdb1821.exp                           |  2 +-
 gdb/testsuite/gdb.base/infcall-input.exp                     |  2 +-
 gdb/testsuite/gdb.base/inferior-died.exp                     |  2 +-
 gdb/testsuite/gdb.base/interrupt-daemon-attach.exp           |  2 +-
 gdb/testsuite/gdb.base/interrupt.exp                         |  2 +-
 gdb/testsuite/gdb.base/kill-after-signal.exp                 |  2 +-
 gdb/testsuite/gdb.base/logical.exp                           |  2 +-
 gdb/testsuite/gdb.base/miscexprs.exp                         |  2 +-
 gdb/testsuite/gdb.base/multi-forks.exp                       |  2 +-
 gdb/testsuite/gdb.base/nested-subp1.exp                      |  2 +-
 gdb/testsuite/gdb.base/nested-subp2.exp                      |  2 +-
 gdb/testsuite/gdb.base/nested-subp3.exp                      |  2 +-
 gdb/testsuite/gdb.base/pc-fp.exp                             |  2 +-
 gdb/testsuite/gdb.base/permissions.exp                       |  2 +-
 gdb/testsuite/gdb.base/pie-execl.exp                         |  4 ++--
 gdb/testsuite/gdb.base/pointers.exp                          |  2 +-
 gdb/testsuite/gdb.base/prologue.exp                          |  4 ++--
 gdb/testsuite/gdb.base/ptype.exp                             |  2 +-
 gdb/testsuite/gdb.base/random-signal.exp                     |  2 +-
 gdb/testsuite/gdb.base/readnever.exp                         |  2 +-
 gdb/testsuite/gdb.base/relational.exp                        |  2 +-
 gdb/testsuite/gdb.base/relativedebug.exp                     |  2 +-
 gdb/testsuite/gdb.base/savedregs.exp                         |  2 +-
 gdb/testsuite/gdb.base/setvar.exp                            |  2 +-
 gdb/testsuite/gdb.base/sigall.exp                            |  2 +-
 gdb/testsuite/gdb.base/sigaltstack.exp                       |  2 +-
 gdb/testsuite/gdb.base/sigbpt.exp                            |  2 +-
 gdb/testsuite/gdb.base/sigchld.exp                           |  2 +-
 gdb/testsuite/gdb.base/siginfo-addr.exp                      |  2 +-
 gdb/testsuite/gdb.base/siginfo-infcall.exp                   |  2 +-
 gdb/testsuite/gdb.base/siginfo-obj.exp                       |  2 +-
 gdb/testsuite/gdb.base/siginfo-thread.exp                    |  2 +-
 gdb/testsuite/gdb.base/siginfo.exp                           |  2 +-
 gdb/testsuite/gdb.base/signals.exp                           |  2 +-
 gdb/testsuite/gdb.base/signull.exp                           |  2 +-
 gdb/testsuite/gdb.base/sigrepeat.exp                         |  2 +-
 gdb/testsuite/gdb.base/sigstep.exp                           |  2 +-
 gdb/testsuite/gdb.base/sigwinch-notty.exp                    |  4 ++--
 gdb/testsuite/gdb.base/sizeof.exp                            |  2 +-
 gdb/testsuite/gdb.base/skip-solib.exp                        |  2 +-
 gdb/testsuite/gdb.base/store.exp                             |  2 +-
 gdb/testsuite/gdb.base/structs.exp                           |  2 +-
 gdb/testsuite/gdb.base/symbol-alias.exp                      |  2 +-
 gdb/testsuite/gdb.base/unwindonsignal.exp                    |  4 ++--
 gdb/testsuite/gdb.base/varargs.exp                           |  2 +-
 gdb/testsuite/gdb.base/volatile.exp                          |  2 +-
 gdb/testsuite/gdb.base/whatis-exp.exp                        |  2 +-
 gdb/testsuite/gdb.cp/ambiguous.exp                           |  4 ++--
 gdb/testsuite/gdb.cp/anon-ns.exp                             |  4 ++--
 gdb/testsuite/gdb.cp/bs15503.exp                             |  4 ++--
 gdb/testsuite/gdb.cp/casts.exp                               |  6 +++---
 gdb/testsuite/gdb.cp/class2.exp                              |  4 ++--
 gdb/testsuite/gdb.cp/constexpr-field.exp                     |  4 ++--
 gdb/testsuite/gdb.cp/converts.exp                            |  2 +-
 gdb/testsuite/gdb.cp/cpsizeof.exp                            |  4 ++--
 gdb/testsuite/gdb.cp/ctti.exp                                |  6 +++---
 gdb/testsuite/gdb.cp/derivation.exp                          |  6 +++---
 gdb/testsuite/gdb.cp/disasm-func-name.exp                    |  4 ++--
 gdb/testsuite/gdb.cp/dispcxx.exp                             |  4 ++--
 gdb/testsuite/gdb.cp/exception.exp                           |  4 ++--
 gdb/testsuite/gdb.cp/filename.exp                            |  4 ++--
 gdb/testsuite/gdb.cp/fpointer.exp                            |  2 +-
 gdb/testsuite/gdb.cp/gdb1355.exp                             |  4 ++--
 gdb/testsuite/gdb.cp/gdb2495.exp                             | 10 +++++-----
 gdb/testsuite/gdb.cp/impl-this.exp                           |  4 ++--
 gdb/testsuite/gdb.cp/iostream.exp                            |  4 ++--
 gdb/testsuite/gdb.cp/koenig.exp                              |  2 +-
 gdb/testsuite/gdb.cp/local.exp                               |  6 +++---
 gdb/testsuite/gdb.cp/m-data.exp                              |  4 ++--
 gdb/testsuite/gdb.cp/m-static.exp                            |  4 ++--
 gdb/testsuite/gdb.cp/many-args.exp                           |  4 ++--
 gdb/testsuite/gdb.cp/mb-ctor.exp                             |  4 ++--
 gdb/testsuite/gdb.cp/member-ptr.exp                          |  4 ++--
 gdb/testsuite/gdb.cp/meth-typedefs.exp                       |  4 ++--
 gdb/testsuite/gdb.cp/method.exp                              |  4 ++--
 gdb/testsuite/gdb.cp/method2.exp                             |  4 ++--
 gdb/testsuite/gdb.cp/namelessclass.exp                       |  2 +-
 gdb/testsuite/gdb.cp/namespace-nested-import.exp             |  2 +-
 gdb/testsuite/gdb.cp/namespace.exp                           |  8 ++++----
 gdb/testsuite/gdb.cp/nextoverthrow.exp                       |  4 ++--
 gdb/testsuite/gdb.cp/nsalias.exp                             |  2 +-
 gdb/testsuite/gdb.cp/nsdecl.exp                              |  2 +-
 gdb/testsuite/gdb.cp/nsimport.exp                            |  2 +-
 gdb/testsuite/gdb.cp/nsnested.exp                            |  2 +-
 gdb/testsuite/gdb.cp/nsnoimports.exp                         |  2 +-
 gdb/testsuite/gdb.cp/nsrecurs.exp                            |  2 +-
 gdb/testsuite/gdb.cp/operator.exp                            |  2 +-
 gdb/testsuite/gdb.cp/oranking.exp                            |  2 +-
 gdb/testsuite/gdb.cp/ovldbreak.exp                           |  4 ++--
 gdb/testsuite/gdb.cp/ovsrch.exp                              |  4 ++--
 gdb/testsuite/gdb.cp/pass-by-ref-2.exp                       |  2 +-
 gdb/testsuite/gdb.cp/pass-by-ref.exp                         |  2 +-
 gdb/testsuite/gdb.cp/pr-1023.exp                             |  4 ++--
 gdb/testsuite/gdb.cp/pr-1210.exp                             |  4 ++--
 gdb/testsuite/gdb.cp/pr-574.exp                              |  4 ++--
 gdb/testsuite/gdb.cp/pr10728.exp                             |  4 ++--
 gdb/testsuite/gdb.cp/pr9067.exp                              |  4 ++--
 gdb/testsuite/gdb.cp/pr9631.exp                              |  4 ++--
 gdb/testsuite/gdb.cp/printmethod.exp                         |  4 ++--
 gdb/testsuite/gdb.cp/ref-types.exp                           | 12 ++++++------
 gdb/testsuite/gdb.cp/rtti.exp                                |  4 ++--
 gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp                   |  4 ++--
 gdb/testsuite/gdb.cp/rvalue-ref-types.exp                    |  4 ++--
 gdb/testsuite/gdb.cp/scope-err.exp                           |  2 +-
 gdb/testsuite/gdb.cp/shadow.exp                              |  2 +-
 gdb/testsuite/gdb.cp/smartp.exp                              |  2 +-
 gdb/testsuite/gdb.cp/static-method.exp                       |  4 ++--
 gdb/testsuite/gdb.cp/temargs.exp                             |  2 +-
 gdb/testsuite/gdb.cp/try_catch.exp                           |  4 ++--
 gdb/testsuite/gdb.cp/userdef.exp                             |  4 ++--
 gdb/testsuite/gdb.cp/var-tag.exp                             |  4 ++--
 gdb/testsuite/gdb.cp/virtbase.exp                            |  4 ++--
 gdb/testsuite/gdb.cp/virtbase2.exp                           |  4 ++--
 gdb/testsuite/gdb.cp/virtfunc2.exp                           |  4 ++--
 gdb/testsuite/gdb.cp/watch-cp.exp                            |  4 ++--
 gdb/testsuite/gdb.dwarf2/dw2-common-block.exp                |  2 +-
 gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp  |  2 +-
 gdb/testsuite/gdb.dwarf2/implref-array.exp                   |  2 +-
 gdb/testsuite/gdb.dwarf2/implref-const.exp                   |  2 +-
 gdb/testsuite/gdb.dwarf2/implref-global.exp                  |  2 +-
 gdb/testsuite/gdb.dwarf2/implref-struct.exp                  |  2 +-
 gdb/testsuite/gdb.dwarf2/imported-unit.exp                   |  2 +-
 gdb/testsuite/gdb.dwarf2/watch-notconst.exp                  |  2 +-
 gdb/testsuite/gdb.fortran/array-bounds-high.exp              |  2 +-
 gdb/testsuite/gdb.fortran/array-bounds.exp                   |  2 +-
 gdb/testsuite/gdb.fortran/array-element.exp                  |  2 +-
 gdb/testsuite/gdb.fortran/array-indices.exp                  |  2 +-
 gdb/testsuite/gdb.fortran/array-no-bounds.exp                |  2 +-
 gdb/testsuite/gdb.fortran/array-repeat.exp                   |  2 +-
 gdb/testsuite/gdb.fortran/charset.exp                        |  2 +-
 gdb/testsuite/gdb.fortran/common-block.exp                   |  2 +-
 gdb/testsuite/gdb.fortran/complex.exp                        |  2 +-
 gdb/testsuite/gdb.fortran/derived-type-function.exp          |  2 +-
 gdb/testsuite/gdb.fortran/derived-type-striding.exp          |  2 +-
 gdb/testsuite/gdb.fortran/derived-type.exp                   |  2 +-
 gdb/testsuite/gdb.fortran/function-calls.exp                 |  2 +-
 gdb/testsuite/gdb.fortran/info-modules.exp                   |  4 ++--
 gdb/testsuite/gdb.fortran/info-types.exp                     |  4 ++--
 gdb/testsuite/gdb.fortran/intrinsics.exp                     |  4 ++--
 gdb/testsuite/gdb.fortran/library-module.exp                 |  2 +-
 gdb/testsuite/gdb.fortran/logical.exp                        |  2 +-
 gdb/testsuite/gdb.fortran/max-depth.exp                      |  4 ++--
 gdb/testsuite/gdb.fortran/module.exp                         |  2 +-
 gdb/testsuite/gdb.fortran/multi-dim.exp                      |  2 +-
 gdb/testsuite/gdb.fortran/namelist.exp                       |  2 +-
 gdb/testsuite/gdb.fortran/nested-funcs-2.exp                 |  2 +-
 gdb/testsuite/gdb.fortran/print-formatted.exp                |  2 +-
 gdb/testsuite/gdb.fortran/ptype-on-functions.exp             |  2 +-
 gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp    |  2 +-
 gdb/testsuite/gdb.fortran/subarray.exp                       |  2 +-
 gdb/testsuite/gdb.fortran/vla-value.exp                      |  2 +-
 gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp               |  4 ++--
 gdb/testsuite/gdb.mi/gdb680.exp                              |  2 +-
 gdb/testsuite/gdb.mi/list-thread-groups-available.exp        |  4 ++--
 gdb/testsuite/gdb.mi/list-thread-groups-no-inferior.exp      |  2 +-
 gdb/testsuite/gdb.mi/mi-async-run.exp                        |  2 +-
 gdb/testsuite/gdb.mi/mi-async.exp                            |  2 +-
 gdb/testsuite/gdb.mi/mi-basics.exp                           |  2 +-
 gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp               |  2 +-
 gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp             |  4 ++--
 gdb/testsuite/gdb.mi/mi-cmd-error.exp                        |  2 +-
 gdb/testsuite/gdb.mi/mi-condbreak-call-thr-state.exp         |  2 +-
 gdb/testsuite/gdb.mi/mi-console.exp                          |  2 +-
 gdb/testsuite/gdb.mi/mi-editing.exp                          |  2 +-
 gdb/testsuite/gdb.mi/mi-eval.exp                             |  2 +-
 gdb/testsuite/gdb.mi/mi-file-transfer.exp                    |  2 +-
 gdb/testsuite/gdb.mi/mi-file.exp                             |  2 +-
 gdb/testsuite/gdb.mi/mi-fullname-deleted.exp                 |  2 +-
 gdb/testsuite/gdb.mi/mi-hack-cli.exp                         |  2 +-
 gdb/testsuite/gdb.mi/mi-i-cmd.exp                            |  2 +-
 gdb/testsuite/gdb.mi/mi-info-os.exp                          |  2 +-
 gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp         |  4 ++--
 gdb/testsuite/gdb.mi/mi-language.exp                         |  2 +-
 gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp                  |  2 +-
 gdb/testsuite/gdb.mi/mi-multi-commands.exp                   |  2 +-
 gdb/testsuite/gdb.mi/mi-nonstop.exp                          |  2 +-
 gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp                |  2 +-
 gdb/testsuite/gdb.mi/mi-nsintrall.exp                        |  2 +-
 gdb/testsuite/gdb.mi/mi-nsmoribund.exp                       |  2 +-
 gdb/testsuite/gdb.mi/mi-nsthrexec.exp                        |  2 +-
 gdb/testsuite/gdb.mi/mi-pthreads.exp                         |  2 +-
 gdb/testsuite/gdb.mi/mi-reg-undefined.exp                    |  2 +-
 gdb/testsuite/gdb.mi/mi-return.exp                           |  2 +-
 gdb/testsuite/gdb.mi/mi-simplerun.exp                        |  2 +-
 gdb/testsuite/gdb.mi/mi-solib.exp                            |  2 +-
 gdb/testsuite/gdb.mi/mi-stack.exp                            |  2 +-
 gdb/testsuite/gdb.mi/mi-syn-frame.exp                        |  2 +-
 gdb/testsuite/gdb.mi/mi-threads-interrupt.exp                |  4 ++--
 gdb/testsuite/gdb.mi/mi-undefined-cmd.exp                    |  2 +-
 gdb/testsuite/gdb.mi/mi-until.exp                            |  2 +-
 gdb/testsuite/gdb.mi/mi-var-block.exp                        |  2 +-
 gdb/testsuite/gdb.mi/mi-var-child-f.exp                      |  2 +-
 gdb/testsuite/gdb.mi/mi-var-child.exp                        |  2 +-
 gdb/testsuite/gdb.mi/mi-var-cmd.exp                          |  2 +-
 gdb/testsuite/gdb.mi/mi-var-cp.exp                           |  4 ++--
 gdb/testsuite/gdb.mi/mi-var-display.exp                      |  2 +-
 gdb/testsuite/gdb.mi/mi-var-invalidate.exp                   |  2 +-
 .../gdb.mi/mi-var-list-children-invalid-grandchild.exp       |  2 +-
 gdb/testsuite/gdb.mi/mi-var-rtti.exp                         |  4 ++--
 gdb/testsuite/gdb.mi/mi-vla-c99.exp                          |  2 +-
 gdb/testsuite/gdb.mi/mi-vla-fortran.exp                      |  2 +-
 gdb/testsuite/gdb.mi/mi-watch-nonstop.exp                    |  2 +-
 gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp               |  2 +-
 gdb/testsuite/gdb.mi/mi2-cli-display.exp                     |  2 +-
 gdb/testsuite/gdb.mi/mi2-prompt.exp                          |  2 +-
 gdb/testsuite/gdb.mi/mi2-var-child.exp                       |  2 +-
 gdb/testsuite/gdb.modula2/multidim.exp                       |  2 +-
 gdb/testsuite/gdb.modula2/unbounded-array.exp                |  2 +-
 gdb/testsuite/gdb.multi/bkpt-multi-exec.exp                  |  4 ++--
 gdb/testsuite/gdb.opt/fortran-string.exp                     |  2 +-
 gdb/testsuite/gdb.opt/inline-cmds.exp                        |  2 +-
 gdb/testsuite/gdb.python/py-framefilter-mi.exp               |  2 +-
 gdb/testsuite/gdb.python/py-inferior-leak.exp                |  4 ++--
 gdb/testsuite/gdb.python/py-mi-cmd.exp                       |  2 +-
 gdb/testsuite/gdb.python/py-mi-events.exp                    |  4 ++--
 gdb/testsuite/gdb.python/py-mi-objfile.exp                   |  4 ++--
 gdb/testsuite/gdb.python/py-mi.exp                           |  4 ++--
 gdb/testsuite/gdb.reverse/ppc_record_test_isa_2_06.exp       |  2 +-
 gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp        |  2 +-
 gdb/testsuite/gdb.rust/dwindex.exp                           |  2 +-
 gdb/testsuite/gdb.rust/expr.exp                              |  4 ++--
 gdb/testsuite/gdb.rust/fnfield.exp                           |  2 +-
 gdb/testsuite/gdb.rust/generics.exp                          |  2 +-
 gdb/testsuite/gdb.rust/methods.exp                           |  2 +-
 gdb/testsuite/gdb.rust/modules.exp                           |  2 +-
 gdb/testsuite/gdb.rust/pp.exp                                |  4 ++--
 gdb/testsuite/gdb.rust/rawids.exp                            |  2 +-
 gdb/testsuite/gdb.rust/rust-style.exp                        |  2 +-
 gdb/testsuite/gdb.rust/simple.exp                            |  4 ++--
 gdb/testsuite/gdb.rust/traits.exp                            |  2 +-
 gdb/testsuite/gdb.rust/unicode.exp                           |  2 +-
 gdb/testsuite/gdb.rust/union.exp                             |  2 +-
 gdb/testsuite/gdb.rust/unsized.exp                           |  2 +-
 gdb/testsuite/gdb.rust/watch.exp                             |  2 +-
 gdb/testsuite/gdb.server/extended-remote-restart.exp         |  4 ++--
 gdb/testsuite/gdb.server/reconnect-ctrl-c.exp                |  2 +-
 gdb/testsuite/gdb.stabs/exclfwd.exp                          |  2 +-
 gdb/testsuite/gdb.threads/attach-into-signal.exp             |  2 +-
 gdb/testsuite/gdb.threads/attach-slow-waitpid.exp            |  2 +-
 gdb/testsuite/gdb.threads/attach-stopped.exp                 |  2 +-
 gdb/testsuite/gdb.threads/check-libthread-db.exp             |  2 +-
 gdb/testsuite/gdb.threads/fork-plus-threads.exp              |  2 +-
 gdb/testsuite/gdb.threads/hand-call-in-threads.exp           |  2 +-
 gdb/testsuite/gdb.threads/hand-call-new-thread.exp           |  2 +-
 gdb/testsuite/gdb.threads/interrupted-hand-call.exp          |  2 +-
 gdb/testsuite/gdb.threads/names.exp                          |  4 ++--
 .../signal-while-stepping-over-bp-other-thread.exp           |  2 +-
 gdb/testsuite/gdb.threads/step-bg-decr-pc-switch-thread.exp  |  2 +-
 gdb/testsuite/gdb.threads/step-over-lands-on-breakpoint.exp  |  2 +-
 gdb/testsuite/gdb.threads/thread-unwindonsignal.exp          |  2 +-
 gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp            |  2 +-
 gdb/testsuite/gdb.trace/mi-tsv-changed.exp                   |  2 +-
 gdb/testsuite/gdb.trace/stap-trace.exp                       |  6 +++---
 298 files changed, 394 insertions(+), 394 deletions(-)

diff --git a/gdb/testsuite/gdb.ada/mi_ex_cond.exp b/gdb/testsuite/gdb.ada/mi_ex_cond.exp
index 5d6785e2eb0..4de08dc6592 100644
--- a/gdb/testsuite/gdb.ada/mi_ex_cond.exp
+++ b/gdb/testsuite/gdb.ada/mi_ex_cond.exp
@@ -59,7 +59,7 @@ set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
-    continue
+    return
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.ada/mi_task_arg.exp b/gdb/testsuite/gdb.ada/mi_task_arg.exp
index 79ce41d3332..4713fda62fd 100644
--- a/gdb/testsuite/gdb.ada/mi_task_arg.exp
+++ b/gdb/testsuite/gdb.ada/mi_task_arg.exp
@@ -28,7 +28,7 @@ set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
-    continue
+    return
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.ada/mi_task_info.exp b/gdb/testsuite/gdb.ada/mi_task_info.exp
index f44a8b5af3f..2a2a91d537e 100644
--- a/gdb/testsuite/gdb.ada/mi_task_info.exp
+++ b/gdb/testsuite/gdb.ada/mi_task_info.exp
@@ -28,7 +28,7 @@ set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
-    continue
+    return
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.base/all-bin.exp b/gdb/testsuite/gdb.base/all-bin.exp
index fe6f76b1bed..5d493e6d6fc 100644
--- a/gdb/testsuite/gdb.base/all-bin.exp
+++ b/gdb/testsuite/gdb.base/all-bin.exp
@@ -43,7 +43,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test "next" "return 0;" "continuing after dummy()"
diff --git a/gdb/testsuite/gdb.base/arithmet.exp b/gdb/testsuite/gdb.base/arithmet.exp
index 5feea05810b..b6009a36235 100644
--- a/gdb/testsuite/gdb.base/arithmet.exp
+++ b/gdb/testsuite/gdb.base/arithmet.exp
@@ -39,7 +39,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarning
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/arrayidx.exp b/gdb/testsuite/gdb.base/arrayidx.exp
index c904a777f8a..7df03346045 100644
--- a/gdb/testsuite/gdb.base/arrayidx.exp
+++ b/gdb/testsuite/gdb.base/arrayidx.exp
@@ -28,7 +28,7 @@ clean_restart ${binfile}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # First, print the array without the indexes
diff --git a/gdb/testsuite/gdb.base/assign.exp b/gdb/testsuite/gdb.base/assign.exp
index c78868ac8ef..a0dd46d7bb2 100644
--- a/gdb/testsuite/gdb.base/assign.exp
+++ b/gdb/testsuite/gdb.base/assign.exp
@@ -42,7 +42,7 @@ clean_restart ${binfile}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test "next" "return 0;" "continuing after dummy()"
diff --git a/gdb/testsuite/gdb.base/async.exp b/gdb/testsuite/gdb.base/async.exp
index bdf1a263212..83e56e71580 100644
--- a/gdb/testsuite/gdb.base/async.exp
+++ b/gdb/testsuite/gdb.base/async.exp
@@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 #
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test "break baz" ".*" ""
diff --git a/gdb/testsuite/gdb.base/attach-pie-misread.exp b/gdb/testsuite/gdb.base/attach-pie-misread.exp
index 3bbbbf826a5..a97a69c0a0b 100644
--- a/gdb/testsuite/gdb.base/attach-pie-misread.exp
+++ b/gdb/testsuite/gdb.base/attach-pie-misread.exp
@@ -16,7 +16,7 @@
 # This test only works on GNU/Linux.
 if { ![isnative] || [is_remote host] || [use_gdb_stub]
      || ![istarget *-linux*] || [skip_shlib_tests]} {
-    continue
+    return
 }
 
 load_lib prelink-support.exp
diff --git a/gdb/testsuite/gdb.base/bfp-test.exp b/gdb/testsuite/gdb.base/bfp-test.exp
index 40ace16258b..07282595b44 100644
--- a/gdb/testsuite/gdb.base/bfp-test.exp
+++ b/gdb/testsuite/gdb.base/bfp-test.exp
@@ -27,7 +27,7 @@ clean_restart ${binfile}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # Run to the breakpoint at return.
diff --git a/gdb/testsuite/gdb.base/bitshift.exp b/gdb/testsuite/gdb.base/bitshift.exp
index 03f18b9ebe5..118a36e968e 100644
--- a/gdb/testsuite/gdb.base/bitshift.exp
+++ b/gdb/testsuite/gdb.base/bitshift.exp
@@ -180,7 +180,7 @@ proc test_shifts {} {
 	    "unknown" "ada" "modula-2" "pascal" "fortran"
 	}
 	if {[lsearch -exact $skip_langs $lang] >= 0} {
-	    continue
+	    return
 	}
 
 	gdb_test_no_output "set language $lang"
diff --git a/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp b/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp
index 0dd2686b2ef..33f8cc1786f 100644
--- a/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp
+++ b/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp
@@ -21,7 +21,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping because of nosignals."
-    continue
+    return
 }
 
 # This test requires sending ^C to interrupt the running target.
diff --git a/gdb/testsuite/gdb.base/branch-to-self.exp b/gdb/testsuite/gdb.base/branch-to-self.exp
index a0521e38e79..25934784f17 100644
--- a/gdb/testsuite/gdb.base/branch-to-self.exp
+++ b/gdb/testsuite/gdb.base/branch-to-self.exp
@@ -17,7 +17,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping branch-to-self.exp because of nosignals."
-    continue
+    return
 }
 
 standard_testfile
diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp
index be1a212ec72..f6533e99ac8 100644
--- a/gdb/testsuite/gdb.base/break-interp.exp
+++ b/gdb/testsuite/gdb.base/break-interp.exp
@@ -16,7 +16,7 @@
 # This test only works on GNU/Linux.
 if { ![isnative] || [is_remote host] || [use_gdb_stub]
      || ![istarget *-linux*] || [skip_shlib_tests]} {
-    continue
+    return
 }
 
 load_lib prelink-support.exp
diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp
index d1fb3ac9ec1..239cfa4c518 100644
--- a/gdb/testsuite/gdb.base/call-ar-st.exp
+++ b/gdb/testsuite/gdb.base/call-ar-st.exp
@@ -23,7 +23,7 @@ standard_testfile
 # test.
 if [target_info exists gdb,cannot_call_functions] {
     unsupported "this target can not call functions"
-    continue
+    return
 }
 
 # Create and source the file that provides information about the compiler
@@ -50,7 +50,7 @@ gdb_test_no_output "set width 0"
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 get_debug_format
diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base/call-rt-st.exp
index 5d380db4a8f..fee192d7d02 100644
--- a/gdb/testsuite/gdb.base/call-rt-st.exp
+++ b/gdb/testsuite/gdb.base/call-rt-st.exp
@@ -41,7 +41,7 @@ if [get_compiler_info] {
 # test.
 if [target_info exists gdb,cannot_call_functions] {
     unsupported "this target can not call functions"
-    continue
+    return
 }
 
 set skip_float_test [gdb_skip_float_test]
@@ -56,7 +56,7 @@ gdb_test_no_output "set width 0"
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp
index 701056e7a1e..af9495fe94f 100644
--- a/gdb/testsuite/gdb.base/call-sc.exp
+++ b/gdb/testsuite/gdb.base/call-sc.exp
@@ -24,7 +24,7 @@
 
 if [target_info exists gdb,cannot_call_functions] {
     unsupported "this target can not call functions"
-    continue
+    return
 }
 
 standard_testfile .c
diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp
index 5b3f10504a2..31e675c960c 100644
--- a/gdb/testsuite/gdb.base/call-signal-resume.exp
+++ b/gdb/testsuite/gdb.base/call-signal-resume.exp
@@ -22,7 +22,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping call-signal-resume.exp because of nosignals."
-    continue
+    return
 }
 
 
@@ -37,7 +37,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # test.
 if [target_info exists gdb,cannot_call_functions] {
     unsupported "this target can not call functions"
-    continue
+    return
 }
 
 proc get_dummy_frame_number { } {
diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp
index 61ff7ab3619..58cb3cda38d 100644
--- a/gdb/testsuite/gdb.base/call-strs.exp
+++ b/gdb/testsuite/gdb.base/call-strs.exp
@@ -29,7 +29,7 @@ standard_testfile
 # test.
 if [target_info exists gdb,cannot_call_functions] {
     unsupported "this target can not call functions"
-    continue
+    return
 }
 
 
@@ -44,7 +44,7 @@ gdb_test_no_output "set width 0"
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 set prev_timeout $timeout
diff --git a/gdb/testsuite/gdb.base/callexit.exp b/gdb/testsuite/gdb.base/callexit.exp
index 9d1a0839ba1..b9b0498a1bb 100644
--- a/gdb/testsuite/gdb.base/callexit.exp
+++ b/gdb/testsuite/gdb.base/callexit.exp
@@ -25,7 +25,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # test.
 if [target_info exists gdb,cannot_call_functions] {
     unsupported "this target can not call functions"
-    continue
+    return
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp
index 2752cdb5a8e..4448cc127ba 100644
--- a/gdb/testsuite/gdb.base/callfuncs.exp
+++ b/gdb/testsuite/gdb.base/callfuncs.exp
@@ -27,7 +27,7 @@ if [support_complex_tests] {
 # test.
 if [target_info exists gdb,cannot_call_functions] {
     unsupported "this target can not call functions"
-    continue
+    return
 }
 
 set skip_float_test [gdb_skip_float_test]
diff --git a/gdb/testsuite/gdb.base/cast-call.exp b/gdb/testsuite/gdb.base/cast-call.exp
index d3d99880902..0f878657dcb 100644
--- a/gdb/testsuite/gdb.base/cast-call.exp
+++ b/gdb/testsuite/gdb.base/cast-call.exp
@@ -18,7 +18,7 @@
 
 if {[target_info exists gdb,cannot_call_functions]} {
     unsupported "this target can not call functions"
-    continue
+    return
 }
 
 standard_testfile .c
diff --git a/gdb/testsuite/gdb.base/catch-fork-static.exp b/gdb/testsuite/gdb.base/catch-fork-static.exp
index 82336b64944..51031a84fbd 100644
--- a/gdb/testsuite/gdb.base/catch-fork-static.exp
+++ b/gdb/testsuite/gdb.base/catch-fork-static.exp
@@ -24,7 +24,7 @@
 # Until "catch fork" is implemented on other targets...
 #
 if { ![istarget "*-*-linux*"] && ![istarget "*-*-openbsd*"] } then {
-    continue
+    return
 }
 
 # Reusing foll-fork.c since it's a simple forking program.
diff --git a/gdb/testsuite/gdb.base/catch-signal-fork.exp b/gdb/testsuite/gdb.base/catch-signal-fork.exp
index 9a2da7ad21f..05229377fda 100644
--- a/gdb/testsuite/gdb.base/catch-signal-fork.exp
+++ b/gdb/testsuite/gdb.base/catch-signal-fork.exp
@@ -15,7 +15,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping catch-signal-fork.exp because of nosignals."
-    continue
+    return
 }
 
 standard_testfile
diff --git a/gdb/testsuite/gdb.base/catch-signal.exp b/gdb/testsuite/gdb.base/catch-signal.exp
index 8c73fdbc085..d910c043f36 100644
--- a/gdb/testsuite/gdb.base/catch-signal.exp
+++ b/gdb/testsuite/gdb.base/catch-signal.exp
@@ -15,7 +15,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping catch-signal.exp because of nosignals."
-    continue
+    return
 }
 
 standard_testfile
diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp
index 97d15cf7008..edb1c422c0e 100644
--- a/gdb/testsuite/gdb.base/checkpoint.exp
+++ b/gdb/testsuite/gdb.base/checkpoint.exp
@@ -17,13 +17,13 @@
 # other targets...
 #
 if {![istarget "*-*-linux*"]} then {
-    continue
+    return
 }
 
 # Checkpoint support is currently implemented in the Linux native
 # target, so only works with "target native".
 if { [target_info gdb_protocol] != "" } {
-    continue
+    return
 }
 
 # Must name the source file explicitly, otherwise when driven by
diff --git a/gdb/testsuite/gdb.base/cond-expr.exp b/gdb/testsuite/gdb.base/cond-expr.exp
index d383d3b4458..f0c4c328594 100644
--- a/gdb/testsuite/gdb.base/cond-expr.exp
+++ b/gdb/testsuite/gdb.base/cond-expr.exp
@@ -44,7 +44,7 @@ clean_restart ${binfile}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test "print (2 ? 3 : 4)" "\[0-9\]* = 3" \
diff --git a/gdb/testsuite/gdb.base/consecutive.exp b/gdb/testsuite/gdb.base/consecutive.exp
index 6850c877bcb..cd5c6f321a0 100644
--- a/gdb/testsuite/gdb.base/consecutive.exp
+++ b/gdb/testsuite/gdb.base/consecutive.exp
@@ -32,7 +32,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarning
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 set is_stmt [is_stmt_addresses $srcfile]
diff --git a/gdb/testsuite/gdb.base/constvars.exp b/gdb/testsuite/gdb.base/constvars.exp
index 0a926bc4866..fd15743c521 100644
--- a/gdb/testsuite/gdb.base/constvars.exp
+++ b/gdb/testsuite/gdb.base/constvars.exp
@@ -48,7 +48,7 @@ clean_restart ${binfile}
 #
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 get_debug_format
diff --git a/gdb/testsuite/gdb.base/ctf-constvars.exp b/gdb/testsuite/gdb.base/ctf-constvars.exp
index 66936d284c3..6255e9ed02b 100644
--- a/gdb/testsuite/gdb.base/ctf-constvars.exp
+++ b/gdb/testsuite/gdb.base/ctf-constvars.exp
@@ -43,7 +43,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \
 #
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # test vars and pointers
diff --git a/gdb/testsuite/gdb.base/ctf-ptype.exp b/gdb/testsuite/gdb.base/ctf-ptype.exp
index 6b3afb4fb11..c8d91814f0e 100644
--- a/gdb/testsuite/gdb.base/ctf-ptype.exp
+++ b/gdb/testsuite/gdb.base/ctf-ptype.exp
@@ -281,7 +281,7 @@ if [runto_main] then {
 
   if [target_info exists gdb,cannot_call_functions] {
     unsupported "this target can not call functions"
-    continue
+    return
   }
 
   # We need to up this because this can be really slow on some boards.
diff --git a/gdb/testsuite/gdb.base/dfp-test.exp b/gdb/testsuite/gdb.base/dfp-test.exp
index 6c3de2863ea..30795212291 100644
--- a/gdb/testsuite/gdb.base/dfp-test.exp
+++ b/gdb/testsuite/gdb.base/dfp-test.exp
@@ -32,7 +32,7 @@ clean_restart ${binfile}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 set sizeof_long [get_sizeof "long" 4]
diff --git a/gdb/testsuite/gdb.base/disasm-optim.exp b/gdb/testsuite/gdb.base/disasm-optim.exp
index 48fd3d96202..aa7150815ff 100644
--- a/gdb/testsuite/gdb.base/disasm-optim.exp
+++ b/gdb/testsuite/gdb.base/disasm-optim.exp
@@ -16,7 +16,7 @@
 # This test exercises disassemble /s with optimized and inlined code.
 
 if { ![is_amd64_regs_target] } {
-    continue
+    return
 }
 
 standard_testfile .S
diff --git a/gdb/testsuite/gdb.base/enum_cond.exp b/gdb/testsuite/gdb.base/enum_cond.exp
index 38296ca3526..0f03f0296d9 100644
--- a/gdb/testsuite/gdb.base/enum_cond.exp
+++ b/gdb/testsuite/gdb.base/enum_cond.exp
@@ -29,7 +29,7 @@ clean_restart $testfile
 
 if ![runto_main] then {
     perror "could not run to main"
-    continue
+    return
 }
 
 gdb_test "break call_me if param.e == 1" \
diff --git a/gdb/testsuite/gdb.base/eval-skip.exp b/gdb/testsuite/gdb.base/eval-skip.exp
index 932a76d3893..218aaab476c 100644
--- a/gdb/testsuite/gdb.base/eval-skip.exp
+++ b/gdb/testsuite/gdb.base/eval-skip.exp
@@ -48,7 +48,7 @@ clean_restart ${binfile}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test_no_output "set variable x=14" "set variable x=14"
diff --git a/gdb/testsuite/gdb.base/exe-lock.exp b/gdb/testsuite/gdb.base/exe-lock.exp
index 1700396bfde..19b4e1a8732 100644
--- a/gdb/testsuite/gdb.base/exe-lock.exp
+++ b/gdb/testsuite/gdb.base/exe-lock.exp
@@ -39,7 +39,7 @@ if { ! [file exists $binfile] } {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_continue_to_end
diff --git a/gdb/testsuite/gdb.base/exitsignal.exp b/gdb/testsuite/gdb.base/exitsignal.exp
index fc1267ee745..27eb6c5d263 100644
--- a/gdb/testsuite/gdb.base/exitsignal.exp
+++ b/gdb/testsuite/gdb.base/exitsignal.exp
@@ -23,7 +23,7 @@
 
 if { [target_info exists gdb,nosignals] } {
     verbose "Skipping exitsignal.exp because of nosignals."
-    continue
+    return
 }
 
 standard_testfile segv.c
diff --git a/gdb/testsuite/gdb.base/exprs.exp b/gdb/testsuite/gdb.base/exprs.exp
index c67647a67db..83bc60aa610 100644
--- a/gdb/testsuite/gdb.base/exprs.exp
+++ b/gdb/testsuite/gdb.base/exprs.exp
@@ -38,7 +38,7 @@ clean_restart ${binfile}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 proc test_expr { args } {
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index c1f274701ce..7d0d85fccca 100644
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -17,7 +17,7 @@
 
 if [target_info exists gdb,nofileio] {
     verbose "Skipping fileio.exp because of no fileio capabilities."
-    continue
+    return
 }
 
 
@@ -64,7 +64,7 @@ gdb_test_no_output "set width 0"
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test "break stop" "Breakpoint .*$srcfile.*" 
diff --git a/gdb/testsuite/gdb.base/float.exp b/gdb/testsuite/gdb.base/float.exp
index c50193e5cd3..62e8346928b 100644
--- a/gdb/testsuite/gdb.base/float.exp
+++ b/gdb/testsuite/gdb.base/float.exp
@@ -31,7 +31,7 @@ if { [prepare_for_testing "failed to prepare" float float.c] } {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # Test "info float".
diff --git a/gdb/testsuite/gdb.base/float128.exp b/gdb/testsuite/gdb.base/float128.exp
index 3590f88b187..5e471b39d22 100644
--- a/gdb/testsuite/gdb.base/float128.exp
+++ b/gdb/testsuite/gdb.base/float128.exp
@@ -34,7 +34,7 @@ clean_restart ${binfile}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # Run to the breakpoint at return.
diff --git a/gdb/testsuite/gdb.base/floatn.exp b/gdb/testsuite/gdb.base/floatn.exp
index deb6d40e44d..1e4f94a70e0 100644
--- a/gdb/testsuite/gdb.base/floatn.exp
+++ b/gdb/testsuite/gdb.base/floatn.exp
@@ -34,7 +34,7 @@ clean_restart ${binfile}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # Run to the breakpoint at return.
diff --git a/gdb/testsuite/gdb.base/foll-exec-mode.exp b/gdb/testsuite/gdb.base/foll-exec-mode.exp
index 986e46ecd61..918f3e4fd5f 100644
--- a/gdb/testsuite/gdb.base/foll-exec-mode.exp
+++ b/gdb/testsuite/gdb.base/foll-exec-mode.exp
@@ -30,13 +30,13 @@
 # required for follow-exec-mode testing.
 if { [target_info exists gdb_protocol]
      && [target_info gdb_protocol] == "remote" } {
-    continue
+    return
 }
 
 # Until "catch exec" is implemented on other targets...
 #
 if {![istarget "*-linux*"]} then {
-     continue
+     return
 }
 
 standard_testfile foll-exec-mode.c
diff --git a/gdb/testsuite/gdb.base/foll-exec.exp b/gdb/testsuite/gdb.base/foll-exec.exp
index 90fb64bf2a8..8cddfa52c3b 100644
--- a/gdb/testsuite/gdb.base/foll-exec.exp
+++ b/gdb/testsuite/gdb.base/foll-exec.exp
@@ -19,7 +19,7 @@
 # Until "catch exec" is implemented on other targets...
 #
 if { ![istarget "*-linux*"] } then {
-    continue
+    return
 }
 
 standard_testfile foll-exec.c
diff --git a/gdb/testsuite/gdb.base/gdb1250.exp b/gdb/testsuite/gdb.base/gdb1250.exp
index bc6083f8fcb..06390b1002b 100644
--- a/gdb/testsuite/gdb.base/gdb1250.exp
+++ b/gdb/testsuite/gdb.base/gdb1250.exp
@@ -32,7 +32,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 clean_restart ${binfile}
 
 if ![runto abort {allow-pending}] then {
-    continue
+    return
 }
 
 # See http://sources.redhat.com/gdb/bugs/1250
diff --git a/gdb/testsuite/gdb.base/gdb1821.exp b/gdb/testsuite/gdb.base/gdb1821.exp
index 8e5bbedcee0..cfa95aa5c24 100644
--- a/gdb/testsuite/gdb.base/gdb1821.exp
+++ b/gdb/testsuite/gdb.base/gdb1821.exp
@@ -30,7 +30,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 } 
 gdb_test "print /x bar" "{x__0 = 0x0, y__0 = 0x0, z__1 = 0x0}" 
 
diff --git a/gdb/testsuite/gdb.base/infcall-input.exp b/gdb/testsuite/gdb.base/infcall-input.exp
index 9a9d93ab93d..a09a28a6904 100644
--- a/gdb/testsuite/gdb.base/infcall-input.exp
+++ b/gdb/testsuite/gdb.base/infcall-input.exp
@@ -20,7 +20,7 @@ standard_testfile
 
 if [target_info exists gdb,cannot_call_functions] {
     unsupported "can not call functions"
-    continue
+    return
 }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
diff --git a/gdb/testsuite/gdb.base/inferior-died.exp b/gdb/testsuite/gdb.base/inferior-died.exp
index 8b0e14b402f..28ea8df1e74 100644
--- a/gdb/testsuite/gdb.base/inferior-died.exp
+++ b/gdb/testsuite/gdb.base/inferior-died.exp
@@ -18,7 +18,7 @@
 #
 if { ![istarget "*-*-linux*"] } then {
     unsupported "inferior-died.exp"
-    continue
+    return
 }
 
 if { ![support_displaced_stepping] } {
diff --git a/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp b/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp
index c3c7916f471..bff19074269 100644
--- a/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp
+++ b/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp
@@ -15,7 +15,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping interrupt-daemon-attach.exp because of nosignals."
-    continue
+    return
 }
 
 # This test requires sending ^C to interrupt the running target.
diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp
index ab3db309ead..04e5b8c6c11 100644
--- a/gdb/testsuite/gdb.base/interrupt.exp
+++ b/gdb/testsuite/gdb.base/interrupt.exp
@@ -15,7 +15,7 @@
 
 if [target_info exists gdb,nointerrupts] {
     verbose "Skipping interrupt.exp because of nointerrupts."
-    continue
+    return
 }
 
 if [target_info exists gdb,noinferiorio] {
diff --git a/gdb/testsuite/gdb.base/kill-after-signal.exp b/gdb/testsuite/gdb.base/kill-after-signal.exp
index fcbec9a1c2e..7450b2ae4b9 100644
--- a/gdb/testsuite/gdb.base/kill-after-signal.exp
+++ b/gdb/testsuite/gdb.base/kill-after-signal.exp
@@ -22,7 +22,7 @@ if { ![can_single_step_to_signal_handler] } {
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping kill-after-signal.exp because of nosignals."
-    continue
+    return
 }
 
 if [prepare_for_testing "failed to prepare" ${testfile}] {
diff --git a/gdb/testsuite/gdb.base/logical.exp b/gdb/testsuite/gdb.base/logical.exp
index 140f4ae85d1..f594c3be110 100644
--- a/gdb/testsuite/gdb.base/logical.exp
+++ b/gdb/testsuite/gdb.base/logical.exp
@@ -45,7 +45,7 @@ clean_restart ${binfile}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 proc evaluate { vars ops } {
diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp
index 68d8cab656c..cac8cf2ce87 100644
--- a/gdb/testsuite/gdb.base/miscexprs.exp
+++ b/gdb/testsuite/gdb.base/miscexprs.exp
@@ -56,7 +56,7 @@ clean_restart ${binfile}
 #
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test "break marker1" ".*" ""
diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp
index 2517602494b..0e35fbbc422 100644
--- a/gdb/testsuite/gdb.base/multi-forks.exp
+++ b/gdb/testsuite/gdb.base/multi-forks.exp
@@ -17,7 +17,7 @@
 # other targets...
 #
 if { ![istarget "*-*-linux*"] } then {
-    continue
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.base/nested-subp1.exp b/gdb/testsuite/gdb.base/nested-subp1.exp
index 007e0ba0bf3..dc96e97d8a3 100644
--- a/gdb/testsuite/gdb.base/nested-subp1.exp
+++ b/gdb/testsuite/gdb.base/nested-subp1.exp
@@ -42,7 +42,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${testcase}.c" \
 clean_restart "${testcase}"
 if ![runto_main] {
     perror "could not run to main"
-    continue
+    return
 }
 
 set bp_location [gdb_get_line_number "STOP" "${testcase}.c"]
diff --git a/gdb/testsuite/gdb.base/nested-subp2.exp b/gdb/testsuite/gdb.base/nested-subp2.exp
index 876b797e49d..efc8dc5c25b 100644
--- a/gdb/testsuite/gdb.base/nested-subp2.exp
+++ b/gdb/testsuite/gdb.base/nested-subp2.exp
@@ -42,7 +42,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${testcase}.c" \
 clean_restart "${testcase}"
 if ![runto_main] {
     perror "could not run to main"
-    continue
+    return
 }
 
 set bp_location [gdb_get_line_number "STOP" "${testcase}.c"]
diff --git a/gdb/testsuite/gdb.base/nested-subp3.exp b/gdb/testsuite/gdb.base/nested-subp3.exp
index dd236f07c8f..fc87631c342 100644
--- a/gdb/testsuite/gdb.base/nested-subp3.exp
+++ b/gdb/testsuite/gdb.base/nested-subp3.exp
@@ -42,7 +42,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${testcase}.c" \
 clean_restart "${testcase}"
 if ![runto_main] {
     perror "could not run to main"
-    continue
+    return
 }
 
 set bp_location [gdb_get_line_number "STOP" "${testcase}.c"]
diff --git a/gdb/testsuite/gdb.base/pc-fp.exp b/gdb/testsuite/gdb.base/pc-fp.exp
index 81221930c83..6b61fc06a98 100644
--- a/gdb/testsuite/gdb.base/pc-fp.exp
+++ b/gdb/testsuite/gdb.base/pc-fp.exp
@@ -36,7 +36,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarning
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.base/permissions.exp b/gdb/testsuite/gdb.base/permissions.exp
index d3482454fc2..233b630f0ea 100644
--- a/gdb/testsuite/gdb.base/permissions.exp
+++ b/gdb/testsuite/gdb.base/permissions.exp
@@ -87,7 +87,7 @@ gdb_load ${binfile}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test "print x = 45" "$decimal = 45" "set a global"
diff --git a/gdb/testsuite/gdb.base/pie-execl.exp b/gdb/testsuite/gdb.base/pie-execl.exp
index 6aea8177bd5..2364c74de96 100644
--- a/gdb/testsuite/gdb.base/pie-execl.exp
+++ b/gdb/testsuite/gdb.base/pie-execl.exp
@@ -20,14 +20,14 @@ global inferior_spawn_id
 global gdb_spawn_id
 
 if ![istarget *-linux*] {
-    continue
+    return
 }
 
 # In remote mode we cannot use the 'set args' command, and this
 # test requires it.
 if { [target_info exists gdb_protocol] } then {
     if { [target_info gdb_protocol] == "remote" } then {
-	continue
+	return
     }
 }
 
diff --git a/gdb/testsuite/gdb.base/pointers.exp b/gdb/testsuite/gdb.base/pointers.exp
index bca8377637b..15f7879a27f 100644
--- a/gdb/testsuite/gdb.base/pointers.exp
+++ b/gdb/testsuite/gdb.base/pointers.exp
@@ -45,7 +45,7 @@ clean_restart ${binfile}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test "next " "more_code.*;" "continuing after dummy()"
diff --git a/gdb/testsuite/gdb.base/prologue.exp b/gdb/testsuite/gdb.base/prologue.exp
index f9f57a185ad..8a3545299c9 100644
--- a/gdb/testsuite/gdb.base/prologue.exp
+++ b/gdb/testsuite/gdb.base/prologue.exp
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } {  return }
 
 standard_testfile .c
 
@@ -27,7 +27,7 @@ clean_restart ${binfile}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 proc find_breakpoint_pc { sym } {
diff --git a/gdb/testsuite/gdb.base/ptype.exp b/gdb/testsuite/gdb.base/ptype.exp
index 83fcc1a777c..854acc9c457 100644
--- a/gdb/testsuite/gdb.base/ptype.exp
+++ b/gdb/testsuite/gdb.base/ptype.exp
@@ -591,7 +591,7 @@ if [runto_main] then {
 
   if [target_info exists gdb,cannot_call_functions] {
     unsupported "this target can not call functions"
-    continue
+    return
   }
 
   # We need to up this because this can be really slow on some boards.
diff --git a/gdb/testsuite/gdb.base/random-signal.exp b/gdb/testsuite/gdb.base/random-signal.exp
index 70fa49c7825..1b07060c4a9 100644
--- a/gdb/testsuite/gdb.base/random-signal.exp
+++ b/gdb/testsuite/gdb.base/random-signal.exp
@@ -15,7 +15,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping catch-signal.exp because of nosignals."
-    continue
+    return
 }
 
 # This test requires sending ^C to interrupt the running target.
diff --git a/gdb/testsuite/gdb.base/readnever.exp b/gdb/testsuite/gdb.base/readnever.exp
index 9ce3c9cf36d..3dfecdd021f 100644
--- a/gdb/testsuite/gdb.base/readnever.exp
+++ b/gdb/testsuite/gdb.base/readnever.exp
@@ -36,7 +36,7 @@ save_vars { GDBFLAGS } {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test "break fun_three" \
diff --git a/gdb/testsuite/gdb.base/relational.exp b/gdb/testsuite/gdb.base/relational.exp
index f55922b0f2c..858398323cd 100644
--- a/gdb/testsuite/gdb.base/relational.exp
+++ b/gdb/testsuite/gdb.base/relational.exp
@@ -39,7 +39,7 @@ if [get_compiler_info] {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/relativedebug.exp b/gdb/testsuite/gdb.base/relativedebug.exp
index 4ab036f54ab..1f9c6ade959 100644
--- a/gdb/testsuite/gdb.base/relativedebug.exp
+++ b/gdb/testsuite/gdb.base/relativedebug.exp
@@ -15,7 +15,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping relativedebug.exp because of nosignals."
-    continue
+    return
 }
 
 standard_testfile .c
diff --git a/gdb/testsuite/gdb.base/savedregs.exp b/gdb/testsuite/gdb.base/savedregs.exp
index de3c6f488ed..8cd71384261 100644
--- a/gdb/testsuite/gdb.base/savedregs.exp
+++ b/gdb/testsuite/gdb.base/savedregs.exp
@@ -26,7 +26,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping savedregs.exp because of nosignals."
-    continue
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.base/setvar.exp b/gdb/testsuite/gdb.base/setvar.exp
index da415d76a7f..a2997be0cb8 100644
--- a/gdb/testsuite/gdb.base/setvar.exp
+++ b/gdb/testsuite/gdb.base/setvar.exp
@@ -43,7 +43,7 @@ gdb_test_no_output "set print sevenbit-strings"
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # Determine expected output for unsigned long variables,
diff --git a/gdb/testsuite/gdb.base/sigall.exp b/gdb/testsuite/gdb.base/sigall.exp
index c9ae62caf42..f2c99c8a2a6 100644
--- a/gdb/testsuite/gdb.base/sigall.exp
+++ b/gdb/testsuite/gdb.base/sigall.exp
@@ -15,7 +15,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping sigall.exp because of nosignals."
-    continue
+    return
 }
 
 standard_testfile
diff --git a/gdb/testsuite/gdb.base/sigaltstack.exp b/gdb/testsuite/gdb.base/sigaltstack.exp
index bb78baba670..6bddc0749a9 100644
--- a/gdb/testsuite/gdb.base/sigaltstack.exp
+++ b/gdb/testsuite/gdb.base/sigaltstack.exp
@@ -24,7 +24,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping sigaltstack.exp because of nosignals."
-    continue
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp
index 72fa7360fb7..eb44533eacd 100644
--- a/gdb/testsuite/gdb.base/sigbpt.exp
+++ b/gdb/testsuite/gdb.base/sigbpt.exp
@@ -30,7 +30,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping sigbpt.exp because of nosignals."
-    continue
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.base/sigchld.exp b/gdb/testsuite/gdb.base/sigchld.exp
index 24a8080af72..03b5100a171 100644
--- a/gdb/testsuite/gdb.base/sigchld.exp
+++ b/gdb/testsuite/gdb.base/sigchld.exp
@@ -18,7 +18,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping sigchld.exp because of nosignals."
-    continue
+    return
 }
 
 standard_testfile .c
diff --git a/gdb/testsuite/gdb.base/siginfo-addr.exp b/gdb/testsuite/gdb.base/siginfo-addr.exp
index 464c70acb06..961bc54bcb1 100644
--- a/gdb/testsuite/gdb.base/siginfo-addr.exp
+++ b/gdb/testsuite/gdb.base/siginfo-addr.exp
@@ -23,7 +23,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping siginfo-addr.exp because of nosignals."
-    continue
+    return
 }
 
 standard_testfile
diff --git a/gdb/testsuite/gdb.base/siginfo-infcall.exp b/gdb/testsuite/gdb.base/siginfo-infcall.exp
index 1c30650e72a..4f7caf354fa 100644
--- a/gdb/testsuite/gdb.base/siginfo-infcall.exp
+++ b/gdb/testsuite/gdb.base/siginfo-infcall.exp
@@ -15,7 +15,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping siginfo-infcall.exp because of nosignals."
-    continue
+    return
 }
 
 standard_testfile .c
diff --git a/gdb/testsuite/gdb.base/siginfo-obj.exp b/gdb/testsuite/gdb.base/siginfo-obj.exp
index 2d2f14c854c..221f0e9a294 100644
--- a/gdb/testsuite/gdb.base/siginfo-obj.exp
+++ b/gdb/testsuite/gdb.base/siginfo-obj.exp
@@ -23,7 +23,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping siginfo-obj.exp because of nosignals."
-    continue
+    return
 }
 
 if { ![supports_get_siginfo_type] } {
diff --git a/gdb/testsuite/gdb.base/siginfo-thread.exp b/gdb/testsuite/gdb.base/siginfo-thread.exp
index 2774e4f20d3..8ced509cd5f 100644
--- a/gdb/testsuite/gdb.base/siginfo-thread.exp
+++ b/gdb/testsuite/gdb.base/siginfo-thread.exp
@@ -18,7 +18,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping siginfo-thread.exp because of nosignals."
-    continue
+    return
 }
 
 if { ![supports_get_siginfo_type] } {
diff --git a/gdb/testsuite/gdb.base/siginfo.exp b/gdb/testsuite/gdb.base/siginfo.exp
index 9f422b7b3a4..2a1ceb89bdc 100644
--- a/gdb/testsuite/gdb.base/siginfo.exp
+++ b/gdb/testsuite/gdb.base/siginfo.exp
@@ -25,7 +25,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping siginfo.exp because of nosignals."
-    continue
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/signals.exp
index 6ec4cfe8de2..11fa9d859d8 100644
--- a/gdb/testsuite/gdb.base/signals.exp
+++ b/gdb/testsuite/gdb.base/signals.exp
@@ -15,7 +15,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping signals.exp because of nosignals."
-    continue
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.base/signull.exp b/gdb/testsuite/gdb.base/signull.exp
index 2e60c8d828f..e7ce39d3669 100644
--- a/gdb/testsuite/gdb.base/signull.exp
+++ b/gdb/testsuite/gdb.base/signull.exp
@@ -29,7 +29,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping signull.exp because of nosignals."
-    continue
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.base/sigrepeat.exp b/gdb/testsuite/gdb.base/sigrepeat.exp
index f36775a5fc8..ab1ce9beb26 100644
--- a/gdb/testsuite/gdb.base/sigrepeat.exp
+++ b/gdb/testsuite/gdb.base/sigrepeat.exp
@@ -21,7 +21,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping sigrepeat.exp because of nosignals."
-    continue
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.base/sigstep.exp b/gdb/testsuite/gdb.base/sigstep.exp
index dd2bcc62447..58ebc46eecb 100644
--- a/gdb/testsuite/gdb.base/sigstep.exp
+++ b/gdb/testsuite/gdb.base/sigstep.exp
@@ -23,7 +23,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping sigstep.exp because of nosignals."
-    continue
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.base/sigwinch-notty.exp b/gdb/testsuite/gdb.base/sigwinch-notty.exp
index 510b90c722d..9e58584c3a4 100644
--- a/gdb/testsuite/gdb.base/sigwinch-notty.exp
+++ b/gdb/testsuite/gdb.base/sigwinch-notty.exp
@@ -19,13 +19,13 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping $subdir/$gdb_test_file_name.exp because of nosignals."
-    continue
+    return
 }
 
 # The testfile relies on "run" from the command line, so only works
 # with "target native".
 if { [target_info gdb_protocol] != "" } {
-    continue
+    return
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/sizeof.exp b/gdb/testsuite/gdb.base/sizeof.exp
index a837b8f68a5..effd398ef05 100644
--- a/gdb/testsuite/gdb.base/sizeof.exp
+++ b/gdb/testsuite/gdb.base/sizeof.exp
@@ -35,7 +35,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/skip-solib.exp b/gdb/testsuite/gdb.base/skip-solib.exp
index ce2b080229e..0f2ce7e1ad8 100644
--- a/gdb/testsuite/gdb.base/skip-solib.exp
+++ b/gdb/testsuite/gdb.base/skip-solib.exp
@@ -22,7 +22,7 @@
 # This only works on GNU/Linux.
 if { ![isnative] || [is_remote host] || ![istarget *-linux*]
      || [skip_shlib_tests]} {
-    continue
+    return
 }
 
 set test "skip-solib"
diff --git a/gdb/testsuite/gdb.base/store.exp b/gdb/testsuite/gdb.base/store.exp
index 7a5dd071617..cb0e3c206a5 100644
--- a/gdb/testsuite/gdb.base/store.exp
+++ b/gdb/testsuite/gdb.base/store.exp
@@ -32,7 +32,7 @@ if [get_compiler_info] {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp
index 09aef0ef391..e9326a6e4a5 100644
--- a/gdb/testsuite/gdb.base/structs.exp
+++ b/gdb/testsuite/gdb.base/structs.exp
@@ -21,7 +21,7 @@
 
 if [target_info exists gdb,cannot_call_functions] {
     unsupported "this target can not call functions"
-    continue
+    return
 }
 
 standard_testfile .c
diff --git a/gdb/testsuite/gdb.base/symbol-alias.exp b/gdb/testsuite/gdb.base/symbol-alias.exp
index 2b53cc31053..289f49bbc3f 100644
--- a/gdb/testsuite/gdb.base/symbol-alias.exp
+++ b/gdb/testsuite/gdb.base/symbol-alias.exp
@@ -21,7 +21,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} [list $srcfile $srcfil
 }
 
 if ![runto_main] then {
-    continue
+    return
 }
 
 # Functions.
diff --git a/gdb/testsuite/gdb.base/unwindonsignal.exp b/gdb/testsuite/gdb.base/unwindonsignal.exp
index 1055f20db04..63b27dd888b 100644
--- a/gdb/testsuite/gdb.base/unwindonsignal.exp
+++ b/gdb/testsuite/gdb.base/unwindonsignal.exp
@@ -15,7 +15,7 @@
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping unwindonsignal.exp because of nosignals."
-    continue
+    return
 }
 
 
@@ -23,7 +23,7 @@ if [target_info exists gdb,nosignals] {
 # test.
 if [target_info exists gdb,cannot_call_functions] {
     unsupported "this target can not call functions"
-    continue
+    return
 }
 
 standard_testfile
diff --git a/gdb/testsuite/gdb.base/varargs.exp b/gdb/testsuite/gdb.base/varargs.exp
index e778af031cf..7d49acc17d3 100644
--- a/gdb/testsuite/gdb.base/varargs.exp
+++ b/gdb/testsuite/gdb.base/varargs.exp
@@ -64,7 +64,7 @@ if [gdb_skip_stdio_test "varargs.exp"] {
 
 if ![runto test] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test_stdio "print find_max1(5,1,2,3,4,5)" \
diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp
index 43e039ed02b..ae5fa3f34c2 100644
--- a/gdb/testsuite/gdb.base/volatile.exp
+++ b/gdb/testsuite/gdb.base/volatile.exp
@@ -50,7 +50,7 @@ if [get_compiler_info] {
 #
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 get_debug_format
diff --git a/gdb/testsuite/gdb.base/whatis-exp.exp b/gdb/testsuite/gdb.base/whatis-exp.exp
index fd24015d1fb..655fbb8e8fa 100644
--- a/gdb/testsuite/gdb.base/whatis-exp.exp
+++ b/gdb/testsuite/gdb.base/whatis-exp.exp
@@ -39,7 +39,7 @@ if { [prepare_for_testing "failed to prepare" whatis-exp int-type.c {debug nowar
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 #
diff --git a/gdb/testsuite/gdb.cp/ambiguous.exp b/gdb/testsuite/gdb.cp/ambiguous.exp
index bacb1b162a9..63871157ce1 100644
--- a/gdb/testsuite/gdb.cp/ambiguous.exp
+++ b/gdb/testsuite/gdb.cp/ambiguous.exp
@@ -19,7 +19,7 @@
 # about the field or baseclass being ambiguous is emitted at the right
 # times.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } {  return }
 
 standard_testfile .cc
 
@@ -43,7 +43,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # Run to a breakpoint after the variables have been initialized so we
diff --git a/gdb/testsuite/gdb.cp/anon-ns.exp b/gdb/testsuite/gdb.cp/anon-ns.exp
index 8c4d5e1bea9..852d9bc2c40 100644
--- a/gdb/testsuite/gdb.cp/anon-ns.exp
+++ b/gdb/testsuite/gdb.cp/anon-ns.exp
@@ -17,7 +17,7 @@
 
 # This file is part of the gdb testsuite.
 
-if {[skip_cplus_tests]} { continue }
+if {[skip_cplus_tests]} { return }
 
 standard_testfile .cc anon-ns2.cc
 
@@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" {c++
 
 if {![runto_main]} {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 set ans {(anonymous namespace)}
diff --git a/gdb/testsuite/gdb.cp/bs15503.exp b/gdb/testsuite/gdb.cp/bs15503.exp
index b82eaa9e4dd..5eb3dc83e69 100644
--- a/gdb/testsuite/gdb.cp/bs15503.exp
+++ b/gdb/testsuite/gdb.cp/bs15503.exp
@@ -17,7 +17,7 @@
 # This file was written by Sue Kimura (sue_kimura@hp.com)
 # Rewritten by Michael Chastain (mec.gnu@mindspring.com)
 
-if { [skip_stl_tests] } { continue }
+if { [skip_stl_tests] } { return }
 
 standard_testfile .cc
 
@@ -31,7 +31,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # Set breakpoint on template function
diff --git a/gdb/testsuite/gdb.cp/casts.exp b/gdb/testsuite/gdb.cp/casts.exp
index 5d0a52401a8..77ff6037fb2 100644
--- a/gdb/testsuite/gdb.cp/casts.exp
+++ b/gdb/testsuite/gdb.cp/casts.exp
@@ -25,7 +25,7 @@
 #
 
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile .cc casts03.cc
 
@@ -39,7 +39,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # Prevent symbol on address 0x0 being printed.
@@ -187,7 +187,7 @@ if {[prepare_for_testing "failed to prepare" ${testfile}03 $srcfile2 \
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+   return
 }
 
 # Prevent symbol on address 0x0 being printed.
diff --git a/gdb/testsuite/gdb.cp/class2.exp b/gdb/testsuite/gdb.cp/class2.exp
index 02f33bea599..04f665b2251 100644
--- a/gdb/testsuite/gdb.cp/class2.exp
+++ b/gdb/testsuite/gdb.cp/class2.exp
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 
 standard_testfile .cc
@@ -35,7 +35,7 @@ gdb_test_no_output "set print symbol off"
 
 if ![runto_main] then {
     perror "couldn't run to main"
-    continue
+    return
 }
 
 get_debug_format
diff --git a/gdb/testsuite/gdb.cp/constexpr-field.exp b/gdb/testsuite/gdb.cp/constexpr-field.exp
index 9282948dc67..b1ecf13918d 100644
--- a/gdb/testsuite/gdb.cp/constexpr-field.exp
+++ b/gdb/testsuite/gdb.cp/constexpr-field.exp
@@ -15,7 +15,7 @@
 
 # This file is part of the gdb testsuite.
 
-if {[skip_cplus_tests]} { continue }
+if {[skip_cplus_tests]} { return }
 
 standard_testfile .cc
 
@@ -26,7 +26,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 
 if {![runto_main]} {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # "x" sometimes isn't available due to
diff --git a/gdb/testsuite/gdb.cp/converts.exp b/gdb/testsuite/gdb.cp/converts.exp
index 74721b0438a..e4357fc924e 100644
--- a/gdb/testsuite/gdb.cp/converts.exp
+++ b/gdb/testsuite/gdb.cp/converts.exp
@@ -23,7 +23,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint main"
-    continue
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "end of main"]
diff --git a/gdb/testsuite/gdb.cp/cpsizeof.exp b/gdb/testsuite/gdb.cp/cpsizeof.exp
index 5163873a6b4..a27dcfcc88e 100644
--- a/gdb/testsuite/gdb.cp/cpsizeof.exp
+++ b/gdb/testsuite/gdb.cp/cpsizeof.exp
@@ -16,7 +16,7 @@
 
 standard_testfile .cc
 
-if {[skip_cplus_tests]} { continue }
+if {[skip_cplus_tests]} { return }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}] } {
      return -1
@@ -24,7 +24,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}] } {
 
 if {![runto_main]} {
     perror "could not run to main"
-    continue
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break here"]
diff --git a/gdb/testsuite/gdb.cp/ctti.exp b/gdb/testsuite/gdb.cp/ctti.exp
index df8e7fb7cc4..1011a1408d9 100644
--- a/gdb/testsuite/gdb.cp/ctti.exp
+++ b/gdb/testsuite/gdb.cp/ctti.exp
@@ -21,7 +21,7 @@
 
 # Call to template instantiations.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile cttiadd.cc cttiadd1.cc cttiadd2.cc cttiadd3.cc
 
@@ -36,7 +36,7 @@ if {[prepare_for_testing "failed to prepare" $testfile \
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "marker add1"]
@@ -49,7 +49,7 @@ gdb_test "print i" "\\$\[0-9\]+ = 4"
 # TODO: this needs more work before actually deploying it.
 # So bail out here.
 
-if { [ test_compiler_info gcc-*] } then { continue }
+if { [ test_compiler_info gcc-*] } then { return }
 
 gdb_test_multiple "print add<int>(2,2)" "print add<int>(2,2)" {
     -re "\\$\[0-9\]+ = 4\r\n$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.cp/derivation.exp b/gdb/testsuite/gdb.cp/derivation.exp
index 729cd7380f7..c95fef004b5 100644
--- a/gdb/testsuite/gdb.cp/derivation.exp
+++ b/gdb/testsuite/gdb.cp/derivation.exp
@@ -28,7 +28,7 @@ set nl "\[\r\n\]+"
 # Start program.
 
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 load_lib "cp-support.exp"
 
@@ -57,7 +57,7 @@ with_test_prefix "before run" {
 
 if ![runto 'marker1'] then {
     perror "couldn't run to marker1"
-    continue
+    return
 }
 
 # Check inheritance of typedefs again, but this time with an active block.
@@ -263,7 +263,7 @@ gdb_test "ptype N::Derived::value_type" "type = int"
 # Now run to N::Derived::doit and get the type of "value_type"
 if {![runto "N::Derived::doit"]} {
     perror "couldn't run to N::Derived::doit"
-    continue
+    return
 }
 
 gdb_test "ptype value_type" "type = int"
diff --git a/gdb/testsuite/gdb.cp/disasm-func-name.exp b/gdb/testsuite/gdb.cp/disasm-func-name.exp
index 06304813cbb..d1a93f7d2e7 100644
--- a/gdb/testsuite/gdb.cp/disasm-func-name.exp
+++ b/gdb/testsuite/gdb.cp/disasm-func-name.exp
@@ -18,7 +18,7 @@
 # Test that the disassembler correctly demangles C++ function names in
 # it's header line.
 
-if {[skip_cplus_tests]} { continue }
+if {[skip_cplus_tests]} { return }
 
 standard_testfile .cc
 
@@ -33,7 +33,7 @@ if {[prepare_for_testing "failed to prepare" $testfile \
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 proc check_disassembly_header { request expected } {
diff --git a/gdb/testsuite/gdb.cp/dispcxx.exp b/gdb/testsuite/gdb.cp/dispcxx.exp
index bf98762b8c6..df931ae1b77 100644
--- a/gdb/testsuite/gdb.cp/dispcxx.exp
+++ b/gdb/testsuite/gdb.cp/dispcxx.exp
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile .cc
 
@@ -28,7 +28,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to main"
-    continue
+    return
 } 
 
 gdb_breakpoint [gdb_get_line_number "Break here"]
diff --git a/gdb/testsuite/gdb.cp/exception.exp b/gdb/testsuite/gdb.cp/exception.exp
index 66201720e3c..7970b8cc115 100644
--- a/gdb/testsuite/gdb.cp/exception.exp
+++ b/gdb/testsuite/gdb.cp/exception.exp
@@ -33,7 +33,7 @@
 set ws	"\[\r\n\t \]+"
 set nl	"\[\r\n\]+"
 
-if { [skip_stl_tests] } { continue }
+if { [skip_stl_tests] } { return }
 
 standard_testfile .cc
  
@@ -86,7 +86,7 @@ gdb_test_multiple "" "run to main" {
 }
 
 if { !$ok } {
-    continue
+    return
 }
 
 set name "info breakpoints (after inferior run)"
diff --git a/gdb/testsuite/gdb.cp/filename.exp b/gdb/testsuite/gdb.cp/filename.exp
index 8a627be90b3..113c84d1905 100644
--- a/gdb/testsuite/gdb.cp/filename.exp
+++ b/gdb/testsuite/gdb.cp/filename.exp
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile .cc
 
@@ -23,7 +23,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to main"
-    continue
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "stop inside C"]
diff --git a/gdb/testsuite/gdb.cp/fpointer.exp b/gdb/testsuite/gdb.cp/fpointer.exp
index fc5a4c8b7fa..f2af2b94aca 100644
--- a/gdb/testsuite/gdb.cp/fpointer.exp
+++ b/gdb/testsuite/gdb.cp/fpointer.exp
@@ -24,7 +24,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint main"
-    continue
+    return
 }
 
 # Test that function calls done through function pointers
diff --git a/gdb/testsuite/gdb.cp/gdb1355.exp b/gdb/testsuite/gdb.cp/gdb1355.exp
index bb8434ffa51..e558f738aea 100644
--- a/gdb/testsuite/gdb.cp/gdb1355.exp
+++ b/gdb/testsuite/gdb.cp/gdb1355.exp
@@ -21,7 +21,7 @@
 set ws "\[\r\n\t \]*"
 set nl "\[\r\n\]+"
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 #
 # test running programs
@@ -39,7 +39,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to main"
-    continue
+    return
 } 
 
 # See http://sources.redhat.com/gdb/bugs/1355
diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb2495.exp
index bfc99bd99c3..c0c9dfd1065 100644
--- a/gdb/testsuite/gdb.cp/gdb2495.exp
+++ b/gdb/testsuite/gdb.cp/gdb2495.exp
@@ -31,11 +31,11 @@
 
 # This test is largely based of gdb.base/callfuncs.exp.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 if [target_info exists gdb,nosignals] {
     verbose "Skipping gdb2495.exp because of nosignals."
-    continue
+    return
 }
 
 standard_testfile .cc
@@ -50,7 +50,7 @@ if [get_compiler_info "c++"] {
 # test.
 if [target_info exists gdb,cannot_call_functions] {
     unsupported "this target can not call functions"
-    continue
+    return
 }
 
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
@@ -59,7 +59,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to main"
-    continue
+    return
 }
 
 # See http://sourceware.org/gdb/bugs/2495
@@ -104,7 +104,7 @@ gdb_test "p exceptions.throw_function()" \
 # Restart the inferior back at main.
 if ![runto_main] then {
     perror "couldn't run to main"
-    continue
+    return
 }
 
 
diff --git a/gdb/testsuite/gdb.cp/impl-this.exp b/gdb/testsuite/gdb.cp/impl-this.exp
index a17af8baec2..2910bf7d79d 100644
--- a/gdb/testsuite/gdb.cp/impl-this.exp
+++ b/gdb/testsuite/gdb.cp/impl-this.exp
@@ -18,7 +18,7 @@
 # Test expressions which assume an implicit "this" with a qualified
 # name.
 
-if {[skip_cplus_tests]} { continue }
+if {[skip_cplus_tests]} { return }
 
 standard_testfile .cc
 
@@ -51,7 +51,7 @@ with_test_prefix "before run" {
 # Run to D::f.
 if {![runto_main]} {
     perror "couldn't run to main"
-    continue
+    return
 }
 
 gdb_breakpoint "D::f"
diff --git a/gdb/testsuite/gdb.cp/iostream.exp b/gdb/testsuite/gdb.cp/iostream.exp
index 247ca478690..5189a0dd3ed 100644
--- a/gdb/testsuite/gdb.cp/iostream.exp
+++ b/gdb/testsuite/gdb.cp/iostream.exp
@@ -16,7 +16,7 @@
 # This file is part of the gdb testsuite.
 # It tests various aspects of iostream that have caused problems for gdb.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile .cc
 
@@ -26,7 +26,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # PR 18417
diff --git a/gdb/testsuite/gdb.cp/koenig.exp b/gdb/testsuite/gdb.cp/koenig.exp
index 125d46c18c4..5a846c0b8c2 100644
--- a/gdb/testsuite/gdb.cp/koenig.exp
+++ b/gdb/testsuite/gdb.cp/koenig.exp
@@ -24,7 +24,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint main"
-    continue
+    return
 }
 
 # Test that koenig lookup finds correct function
diff --git a/gdb/testsuite/gdb.cp/local.exp b/gdb/testsuite/gdb.cp/local.exp
index 7642d827cd3..cc78770d535 100644
--- a/gdb/testsuite/gdb.cp/local.exp
+++ b/gdb/testsuite/gdb.cp/local.exp
@@ -27,7 +27,7 @@ set nl "\[\r\n\]+"
 # test running programs
 #
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile .cc
 
@@ -44,12 +44,12 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 #
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 if ![runto 'marker1'] then {
     perror "couldn't run to marker1"
-    continue
+    return
 }
 
 gdb_test "up" ".*foobar.*" "up from marker1"
diff --git a/gdb/testsuite/gdb.cp/m-data.exp b/gdb/testsuite/gdb.cp/m-data.exp
index bda83ea66dc..7dae01c7ee1 100644
--- a/gdb/testsuite/gdb.cp/m-data.exp
+++ b/gdb/testsuite/gdb.cp/m-data.exp
@@ -18,7 +18,7 @@
 
 # This file is part of the gdb testsuite
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 #
 # test running programs
@@ -36,7 +36,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # First, run to after we've constructed all the gnu_obj_N's:
diff --git a/gdb/testsuite/gdb.cp/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp
index 58aaaee7ef5..6b347e25971 100644
--- a/gdb/testsuite/gdb.cp/m-static.exp
+++ b/gdb/testsuite/gdb.cp/m-static.exp
@@ -19,7 +19,7 @@
 
 # This file is part of the gdb testsuite
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 #
 # test running programs
@@ -44,7 +44,7 @@ if {[prepare_for_testing "failed to prepare" $testfile \
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 get_debug_format
diff --git a/gdb/testsuite/gdb.cp/many-args.exp b/gdb/testsuite/gdb.cp/many-args.exp
index d86f4b9a5ee..aba1e78a561 100644
--- a/gdb/testsuite/gdb.cp/many-args.exp
+++ b/gdb/testsuite/gdb.cp/many-args.exp
@@ -19,7 +19,7 @@
 # passed in registers.  This test passes so many structures it is
 # hoped that some will need to be placed onto the stack.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile .cc
 
@@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break-here"]
diff --git a/gdb/testsuite/gdb.cp/mb-ctor.exp b/gdb/testsuite/gdb.cp/mb-ctor.exp
index 66fa2ae2e23..cf22be9caa8 100644
--- a/gdb/testsuite/gdb.cp/mb-ctor.exp
+++ b/gdb/testsuite/gdb.cp/mb-ctor.exp
@@ -16,7 +16,7 @@
 # Test that breakpoints on C++ constructors work, despite the
 # fact that gcc generates several versions of constructor function.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 
 standard_testfile .cc
@@ -31,7 +31,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # Set a breakpoint with multiple locations
diff --git a/gdb/testsuite/gdb.cp/member-ptr.exp b/gdb/testsuite/gdb.cp/member-ptr.exp
index 54a0efb3520..a01e62284a0 100644
--- a/gdb/testsuite/gdb.cp/member-ptr.exp
+++ b/gdb/testsuite/gdb.cp/member-ptr.exp
@@ -21,7 +21,7 @@
 
 set vhn "\\$\[0-9\]+"
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 
 standard_testfile .cc
@@ -36,7 +36,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "Breakpoint 1 here"]
diff --git a/gdb/testsuite/gdb.cp/meth-typedefs.exp b/gdb/testsuite/gdb.cp/meth-typedefs.exp
index f7c854792c8..c11e9916cb3 100644
--- a/gdb/testsuite/gdb.cp/meth-typedefs.exp
+++ b/gdb/testsuite/gdb.cp/meth-typedefs.exp
@@ -30,7 +30,7 @@ proc add {var name params expected {kind {func}}} {
     lappend result [list "${method_name}($params)" $expect]
 }
 
-if {[skip_cplus_tests]} { continue }
+if {[skip_cplus_tests]} { return }
 
 # Tests for c++/12266 et al
 standard_testfile .cc
@@ -42,7 +42,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
 
 if {![runto_main]} {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 array set typedefs {
diff --git a/gdb/testsuite/gdb.cp/method.exp b/gdb/testsuite/gdb.cp/method.exp
index 40d99a5d75d..615307f1c68 100644
--- a/gdb/testsuite/gdb.cp/method.exp
+++ b/gdb/testsuite/gdb.cp/method.exp
@@ -32,7 +32,7 @@
 # test running programs
 #
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile .cc
 
@@ -49,7 +49,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 #
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test "break A::foo" \
diff --git a/gdb/testsuite/gdb.cp/method2.exp b/gdb/testsuite/gdb.cp/method2.exp
index 5c151ac0973..ad0129cdc19 100644
--- a/gdb/testsuite/gdb.cp/method2.exp
+++ b/gdb/testsuite/gdb.cp/method2.exp
@@ -18,7 +18,7 @@
 # This tests setting a break in an ambiguous c++ method with
 # current_language set to c.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile .cc
 
@@ -28,7 +28,7 @@ if  {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if {![runto_main]} {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 proc test_break { lang } {
diff --git a/gdb/testsuite/gdb.cp/namelessclass.exp b/gdb/testsuite/gdb.cp/namelessclass.exp
index 7684c17d5c1..b9f5822995c 100644
--- a/gdb/testsuite/gdb.cp/namelessclass.exp
+++ b/gdb/testsuite/gdb.cp/namelessclass.exp
@@ -20,7 +20,7 @@ load_lib dwarf.exp
 
 # Do not run in environments which do not support C++.
 if {[skip_cplus_tests]} {
-    continue
+    return
 }
 
 # This test can only be run on x86-like targets which support DWARF.
diff --git a/gdb/testsuite/gdb.cp/namespace-nested-import.exp b/gdb/testsuite/gdb.cp/namespace-nested-import.exp
index 2a97f515d4c..134276849cf 100644
--- a/gdb/testsuite/gdb.cp/namespace-nested-import.exp
+++ b/gdb/testsuite/gdb.cp/namespace-nested-import.exp
@@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint main"
-    continue
+    return
 }
 
 gdb_test "print C::x" "= 5"
diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp
index df5608fda94..a721ecdb0b9 100644
--- a/gdb/testsuite/gdb.cp/namespace.exp
+++ b/gdb/testsuite/gdb.cp/namespace.exp
@@ -25,7 +25,7 @@
 
 
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile .cc namespace1.cc
 
@@ -52,12 +52,12 @@ gdb_test "show lang" "auto; currently c\\+\\+.*"
 #
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 if ![runto 'marker1'] then {
     perror "couldn't run to marker1"
-    continue
+    return
 }
 
 gdb_test "up" ".*main.*" "up from marker1"
@@ -198,7 +198,7 @@ gdb_test_multiple $test $test {
 
 if ![runto "C::D::marker2"] then {
     perror "couldn't run to marker2"
-    continue
+    return
 }
 
 gdb_test "print c" "\\$\[0-9\].* = 1"
diff --git a/gdb/testsuite/gdb.cp/nextoverthrow.exp b/gdb/testsuite/gdb.cp/nextoverthrow.exp
index 685f3e429ff..2e6bf84fcc1 100644
--- a/gdb/testsuite/gdb.cp/nextoverthrow.exp
+++ b/gdb/testsuite/gdb.cp/nextoverthrow.exp
@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile .cc
 
@@ -31,7 +31,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to main"
-    continue
+    return
 } 
 
 if {![skip_unwinder_tests]} {
diff --git a/gdb/testsuite/gdb.cp/nsalias.exp b/gdb/testsuite/gdb.cp/nsalias.exp
index ff39c06b601..4daba1988c9 100644
--- a/gdb/testsuite/gdb.cp/nsalias.exp
+++ b/gdb/testsuite/gdb.cp/nsalias.exp
@@ -23,7 +23,7 @@ if {![dwarf2_support]} {
 }
 
 if {[skip_cplus_tests]} {
-    continue
+    return
 }
 
 standard_testfile .cc nsalias-dw.S
diff --git a/gdb/testsuite/gdb.cp/nsdecl.exp b/gdb/testsuite/gdb.cp/nsdecl.exp
index 07173bb465c..8f612807049 100644
--- a/gdb/testsuite/gdb.cp/nsdecl.exp
+++ b/gdb/testsuite/gdb.cp/nsdecl.exp
@@ -28,7 +28,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint main"
-    continue
+    return
 }
 
 ############################################
diff --git a/gdb/testsuite/gdb.cp/nsimport.exp b/gdb/testsuite/gdb.cp/nsimport.exp
index 2272881ab16..161f5960479 100644
--- a/gdb/testsuite/gdb.cp/nsimport.exp
+++ b/gdb/testsuite/gdb.cp/nsimport.exp
@@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint main"
-    continue
+    return
 }
 
 gdb_test "print x" "\\$\[0-9\].* = 11"
diff --git a/gdb/testsuite/gdb.cp/nsnested.exp b/gdb/testsuite/gdb.cp/nsnested.exp
index aa33956b3e7..0ac325c0f65 100644
--- a/gdb/testsuite/gdb.cp/nsnested.exp
+++ b/gdb/testsuite/gdb.cp/nsnested.exp
@@ -22,7 +22,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}
 ############################################
 if ![runto_main] then {
     perror "couldn't run to breakpoint main"
-    continue
+    return
 }
 
 gdb_test "print ab" "No symbol .* in current context." \
diff --git a/gdb/testsuite/gdb.cp/nsnoimports.exp b/gdb/testsuite/gdb.cp/nsnoimports.exp
index 71434a6d99a..ec8cedbeef4 100644
--- a/gdb/testsuite/gdb.cp/nsnoimports.exp
+++ b/gdb/testsuite/gdb.cp/nsnoimports.exp
@@ -22,7 +22,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}
 ############################################
 if ![runto_main] then {
     perror "couldn't run to breakpoint main"
-    continue
+    return
 }
 
 with_test_prefix "main scope" {
diff --git a/gdb/testsuite/gdb.cp/nsrecurs.exp b/gdb/testsuite/gdb.cp/nsrecurs.exp
index 9dbabbf5cd9..94cb069ee00 100644
--- a/gdb/testsuite/gdb.cp/nsrecurs.exp
+++ b/gdb/testsuite/gdb.cp/nsrecurs.exp
@@ -26,7 +26,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint main"
-    continue
+    return
 }
 
 ############################################
diff --git a/gdb/testsuite/gdb.cp/operator.exp b/gdb/testsuite/gdb.cp/operator.exp
index 4389b8e7047..7ce460f6e04 100644
--- a/gdb/testsuite/gdb.cp/operator.exp
+++ b/gdb/testsuite/gdb.cp/operator.exp
@@ -24,7 +24,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint main"
-    continue
+    return
 }
 
 # Test global operator
diff --git a/gdb/testsuite/gdb.cp/oranking.exp b/gdb/testsuite/gdb.cp/oranking.exp
index 1a0a7e25f19..25ba55def29 100644
--- a/gdb/testsuite/gdb.cp/oranking.exp
+++ b/gdb/testsuite/gdb.cp/oranking.exp
@@ -23,7 +23,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint main"
-    continue
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "end of main"]
diff --git a/gdb/testsuite/gdb.cp/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovldbreak.exp
index 2fc650e215f..681edf204d3 100644
--- a/gdb/testsuite/gdb.cp/ovldbreak.exp
+++ b/gdb/testsuite/gdb.cp/ovldbreak.exp
@@ -28,7 +28,7 @@ set timeout 15
 # test running programs
 #
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile .cc
 
@@ -40,7 +40,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 #
 if {![runto_main]} {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # When I ask gdb to set a breakpoint on an overloaded function,
diff --git a/gdb/testsuite/gdb.cp/ovsrch.exp b/gdb/testsuite/gdb.cp/ovsrch.exp
index 6f8a87939a1..767d12bce1d 100644
--- a/gdb/testsuite/gdb.cp/ovsrch.exp
+++ b/gdb/testsuite/gdb.cp/ovsrch.exp
@@ -52,7 +52,7 @@ proc test_class {class} {
     gdb_test "break ${class}::hibob if (a_param == 3)" "Breakpoint (\[0-9\]).*"
 }
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 # Test for c++/11734
 standard_testfile ovsrch1.cc ovsrch2.cc ovsrch3.cc ovsrch4.cc
@@ -64,7 +64,7 @@ if {[prepare_for_testing "failed to prepare" $testfile \
 
 if {![runto_main]} {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # Break in A::stop_here and run tests.
diff --git a/gdb/testsuite/gdb.cp/pass-by-ref-2.exp b/gdb/testsuite/gdb.cp/pass-by-ref-2.exp
index f722eb7ae0b..97cb44f2f94 100644
--- a/gdb/testsuite/gdb.cp/pass-by-ref-2.exp
+++ b/gdb/testsuite/gdb.cp/pass-by-ref-2.exp
@@ -27,7 +27,7 @@
 
 if {[skip_cplus_tests]} {
     untested "c++ test skipped"
-    continue
+    return
 }
 
 standard_testfile .cc
diff --git a/gdb/testsuite/gdb.cp/pass-by-ref.exp b/gdb/testsuite/gdb.cp/pass-by-ref.exp
index cb3e4fe8ebf..0ea5306ff7c 100644
--- a/gdb/testsuite/gdb.cp/pass-by-ref.exp
+++ b/gdb/testsuite/gdb.cp/pass-by-ref.exp
@@ -70,7 +70,7 @@
 
 if {[skip_cplus_tests]} {
     untested "c++ test skipped"
-    continue
+    return
 }
 
 # The program source is generated in the output directory.
diff --git a/gdb/testsuite/gdb.cp/pr-1023.exp b/gdb/testsuite/gdb.cp/pr-1023.exp
index 57102280be6..f25cdb80ef2 100644
--- a/gdb/testsuite/gdb.cp/pr-1023.exp
+++ b/gdb/testsuite/gdb.cp/pr-1023.exp
@@ -18,7 +18,7 @@
 
 # This file is part of the gdb testsuite.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 #
 # test running programs
@@ -36,7 +36,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test_multiple "break myClass::performBlocking" "break myClass::performBlocking" {
diff --git a/gdb/testsuite/gdb.cp/pr-1210.exp b/gdb/testsuite/gdb.cp/pr-1210.exp
index e9da1ab36b6..b6604575638 100644
--- a/gdb/testsuite/gdb.cp/pr-1210.exp
+++ b/gdb/testsuite/gdb.cp/pr-1210.exp
@@ -17,7 +17,7 @@
 
 # This file is part of the gdb testsuite.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 #
 # test running programs
@@ -35,7 +35,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test "next" ".*return 0;" "step past initialization"
diff --git a/gdb/testsuite/gdb.cp/pr-574.exp b/gdb/testsuite/gdb.cp/pr-574.exp
index 9924c7d358b..e13b6426902 100644
--- a/gdb/testsuite/gdb.cp/pr-574.exp
+++ b/gdb/testsuite/gdb.cp/pr-574.exp
@@ -20,7 +20,7 @@
 
 # This file is part of the gdb testsuite
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 #
 # test running programs
@@ -44,7 +44,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # First, run to after we've constructed the object:
diff --git a/gdb/testsuite/gdb.cp/pr10728.exp b/gdb/testsuite/gdb.cp/pr10728.exp
index a47978845d9..3b0ecac6e8d 100644
--- a/gdb/testsuite/gdb.cp/pr10728.exp
+++ b/gdb/testsuite/gdb.cp/pr10728.exp
@@ -17,7 +17,7 @@
 
 set nl		"\[\r\n\]+"
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 load_lib "cp-support.exp"
 
@@ -44,7 +44,7 @@ clean_restart $binfile
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # set a breakpoint at the return stmt
diff --git a/gdb/testsuite/gdb.cp/pr9067.exp b/gdb/testsuite/gdb.cp/pr9067.exp
index 81e56ced95f..4b601dd8f6b 100644
--- a/gdb/testsuite/gdb.cp/pr9067.exp
+++ b/gdb/testsuite/gdb.cp/pr9067.exp
@@ -15,7 +15,7 @@
 
 set nl		"\[\r\n\]+"
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 load_lib "cp-support.exp"
 
@@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test "print b"  ".*same as static member.*"
diff --git a/gdb/testsuite/gdb.cp/pr9631.exp b/gdb/testsuite/gdb.cp/pr9631.exp
index 84645497145..0bbc49aaf41 100644
--- a/gdb/testsuite/gdb.cp/pr9631.exp
+++ b/gdb/testsuite/gdb.cp/pr9631.exp
@@ -15,7 +15,7 @@
 
 # This file is part of the gdb testsuite.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile .cc
 
@@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "set breakpoint here"]
diff --git a/gdb/testsuite/gdb.cp/printmethod.exp b/gdb/testsuite/gdb.cp/printmethod.exp
index 70349d2b296..be597f51a86 100644
--- a/gdb/testsuite/gdb.cp/printmethod.exp
+++ b/gdb/testsuite/gdb.cp/printmethod.exp
@@ -19,7 +19,7 @@
 
 # This file is part of the gdb testsuite
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 #
 # test running programs
@@ -37,7 +37,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # First, run to after we've constructed the object:
diff --git a/gdb/testsuite/gdb.cp/ref-types.exp b/gdb/testsuite/gdb.cp/ref-types.exp
index 8611d37a234..3ca384ae391 100644
--- a/gdb/testsuite/gdb.cp/ref-types.exp
+++ b/gdb/testsuite/gdb.cp/ref-types.exp
@@ -20,7 +20,7 @@
 # test running programs
 #
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile .cc
 
@@ -33,12 +33,12 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 #
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 if ![runto 'marker1'] then {
     perror "couldn't run to marker1"
-    continue
+    return
 }
 
 gdb_test "up" ".*main.*" "up from marker1 1"
@@ -59,12 +59,12 @@ proc gdb_start_again {} {
     #
     if ![runto_main] then {
 	perror "couldn't run to breakpoint"
-	continue
+	return
     }
 
     if ![runto 'marker1'] then {
 	perror "couldn't run to marker1"
-	continue
+	return
     }
 
     gdb_test "up" ".*main.*" "up from marker1 2"
@@ -130,7 +130,7 @@ gdb_test "print ras\[3\]" ".\[0-9\]* = 3" "print value of ras\[3\]"
 
 if ![runto 'f'] then {
     perror "couldn't run to f"
-    continue
+    return
 }
 
 gdb_test "up" ".main2.*" "up from f"
diff --git a/gdb/testsuite/gdb.cp/rtti.exp b/gdb/testsuite/gdb.cp/rtti.exp
index 9a1e279c594..b71f44bddf2 100644
--- a/gdb/testsuite/gdb.cp/rtti.exp
+++ b/gdb/testsuite/gdb.cp/rtti.exp
@@ -26,7 +26,7 @@
 # (involving templates, in particular) where this problem triggers
 # because GDB and GCC have different ideas what a class is called.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 #
 # test running programs
@@ -45,7 +45,7 @@ if {[prepare_for_testing "failed to prepare" $testfile \
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 # First, run to after we've constructed the object:
diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp b/gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp
index 96a0ca18da2..80aeb078590 100644
--- a/gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp
+++ b/gdb/testsuite/gdb.cp/rvalue-ref-sizeof.exp
@@ -18,7 +18,7 @@
 
 standard_testfile .cc
 
-if {[skip_cplus_tests]} { continue }
+if {[skip_cplus_tests]} { return }
 
 if {[prepare_for_testing ${testfile}.exp $testfile $srcfile \
     {debug c++ additional_flags="-std=gnu++11"}] } {
@@ -27,7 +27,7 @@ if {[prepare_for_testing ${testfile}.exp $testfile $srcfile \
 
 if {![runto_main]} {
     perror "could not run to main"
-    continue
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "break here"]
diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-types.exp b/gdb/testsuite/gdb.cp/rvalue-ref-types.exp
index b4aa08f4eea..a1e107838d1 100644
--- a/gdb/testsuite/gdb.cp/rvalue-ref-types.exp
+++ b/gdb/testsuite/gdb.cp/rvalue-ref-types.exp
@@ -16,7 +16,7 @@
 # Tests for reference types with short type variables in GDB, based on
 # gdb.cp/ref-types.exp.
 
-if { [skip_cplus_tests] } { continue }
+if { [skip_cplus_tests] } { return }
 
 standard_testfile .cc
 
@@ -63,7 +63,7 @@ gdb_test "print rrat\[3\]" ".$decimal = 3" "print value of rrat\[3\]"
 
 if {![runto 'f']} then {
     perror "couldn't run to f"
-    continue
+    return
 }
 
 gdb_test "up" ".main2.*" "up from f"
diff --git a/gdb/testsuite/gdb.cp/scope-err.exp b/gdb/testsuite/gdb.cp/scope-err.exp
index 2bfb6ffc08a..4234f3f1a8a 100644
--- a/gdb/testsuite/gdb.cp/scope-err.exp
+++ b/gdb/testsuite/gdb.cp/scope-err.exp
@@ -17,7 +17,7 @@
 # Derived from gdb.linespec/ls-errs.exp.
 
 if {[skip_cplus_tests]} {
-    continue
+    return
 }
 
 standard_testfile .cc
diff --git a/gdb/testsuite/gdb.cp/shadow.exp b/gdb/testsuite/gdb.cp/shadow.exp
index fc054b451ef..613aac30129 100644
--- a/gdb/testsuite/gdb.cp/shadow.exp
+++ b/gdb/testsuite/gdb.cp/shadow.exp
@@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint main"
-    continue
+    return
 }
 
 ############################################
diff --git a/gdb/testsuite/gdb.cp/smartp.exp b/gdb/testsuite/gdb.cp/smartp.exp
index 58a9b966228..a40d54fa135 100644
--- a/gdb/testsuite/gdb.cp/smartp.exp
+++ b/gdb/testsuite/gdb.cp/smartp.exp
@@ -23,7 +23,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint main"
-    continue
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "end of main"]
diff --git a/gdb/testsuite/gdb.cp/static-method.exp b/gdb/testsuite/gdb.cp/static-method.exp
index fc1e19e764d..cd3171e0d53 100644
--- a/gdb/testsuite/gdb.cp/static-method.exp
+++ b/gdb/testsuite/gdb.cp/static-method.exp
@@ -38,7 +38,7 @@ proc test_breakpoint {func result} {
     }
 }
 
-if {[skip_cplus_tests]} { continue }
+if {[skip_cplus_tests]} { return }
 
 # Tests for c++/12750
 standard_testfile .cc
@@ -67,7 +67,7 @@ gdb_test_multiple $test $test {
 
 if {![runto_main]} {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 set ans {(anonymous namespace)}
diff --git a/gdb/testsuite/gdb.cp/temargs.exp b/gdb/testsuite/gdb.cp/temargs.exp
index 6fdea112cb2..507068d5a68 100644
--- a/gdb/testsuite/gdb.cp/temargs.exp
+++ b/gdb/testsuite/gdb.cp/temargs.exp
@@ -18,7 +18,7 @@
 # This file is part of the gdb testsuite.
 
 if {[skip_cplus_tests]} {
-    continue
+    return
 }
 
 standard_testfile .cc
diff --git a/gdb/testsuite/gdb.cp/try_catch.exp b/gdb/testsuite/gdb.cp/try_catch.exp
index 2fbdb510e9c..8e74c91760e 100644
--- a/gdb/testsuite/gdb.cp/try_catch.exp
+++ b/gdb/testsuite/gdb.cp/try_catch.exp
@@ -18,7 +18,7 @@
 
 # This file is part of the gdb testsuite
 
-if { [skip_stl_tests] } { continue }
+if { [skip_stl_tests] } { return }
 
 #
 # test running programs
@@ -36,7 +36,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_breakpoint [gdb_get_line_number "marker 1-throw"]
diff --git a/gdb/testsuite/gdb.cp/userdef.exp b/gdb/testsuite/gdb.cp/userdef.exp
index afc4ac894a5..d67e42803fb 100644
--- a/gdb/testsuite/gdb.cp/userdef.exp
+++ b/gdb/testsuite/gdb.cp/userdef.exp
@@ -19,7 +19,7 @@
 # source file "userdef.cc"
 #
 
-if { [skip_stl_tests] } { continue }
+if { [skip_stl_tests] } { return }
 
 standard_testfile .cc
 
@@ -29,7 +29,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
-    continue
+    return
 }
 
 gdb_test "break marker1" \
diff --git a/gdb/testsuite/gdb.cp/var-tag.exp b/gdb/testsuite/gdb.cp/var-tag.exp
index 54e90539e27..e69f7c9df53 100644
--- a/gdb/testsuite/gdb.cp/var-tag.exp
+++ b/gdb/testsuite/gdb.cp/var-tag.exp
@@ -17,7 +17,7 @@
 
 # Test expressions in which variable names shadow tag names.
 
-if {[skip_cplus_tests]} { continue }
+if {[skip_cplus_tests]} { return }
 
 standard_testfile var-tag.cc var-tag-2.cc var-tag-3.cc var-tag-4.cc
 
@@ -83,7 +83,7 @@ with_test_prefix "before start" {
 # Run to main and test again.
 if {![runto_main]} {
     perror "couldn't run to main"
-    continue
+    return
 }
 
 with_test_prefix "in main" {
diff --git a/gdb/testsuite/gdb.cp/virtbase.exp b/gdb/testsuite/gdb.cp/virtbase.exp
index 812e8ba73b7..828f8f576da 100644
--- a/gdb/testsuite/gdb.cp/virtbase.exp
+++ b/gdb/testsuite/gdb.cp/virtbase.exp
@@ -15,7 +15,7 @@
 
[...]

[diff truncated at 100000 bytes]


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-05-16 13:08 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-16 13:08 [binutils-gdb] gdb/testsuite: fix "continue outside of loop" TCL errors Bruno Larsen

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