diff options
746 files changed, 1597 insertions, 942 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e79226a93cf..3b99fd3cb2c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,753 @@ +2016-12-23 Luis Machado <lgustavo@codesourcery.com> + + Fix test names for the following files: + + * gdb.ada/exec_changed.exp + * gdb.ada/info_types.exp + * gdb.arch/aarch64-atomic-inst.exp + * gdb.arch/aarch64-fp.exp + * gdb.arch/altivec-abi.exp + * gdb.arch/altivec-regs.exp + * gdb.arch/amd64-byte.exp + * gdb.arch/amd64-disp-step.exp + * gdb.arch/amd64-dword.exp + * gdb.arch/amd64-entry-value-inline.exp + * gdb.arch/amd64-entry-value-param.exp + * gdb.arch/amd64-entry-value-paramref.exp + * gdb.arch/amd64-entry-value.exp + * gdb.arch/amd64-i386-address.exp + * gdb.arch/amd64-invalid-stack-middle.exp + * gdb.arch/amd64-invalid-stack-top.exp + * gdb.arch/amd64-optimout-repeat.exp + * gdb.arch/amd64-prologue-skip.exp + * gdb.arch/amd64-prologue-xmm.exp + * gdb.arch/amd64-stap-special-operands.exp + * gdb.arch/amd64-stap-wrong-subexp.exp + * gdb.arch/amd64-tailcall-cxx.exp + * gdb.arch/amd64-tailcall-noret.exp + * gdb.arch/amd64-tailcall-ret.exp + * gdb.arch/amd64-tailcall-self.exp + * gdb.arch/amd64-word.exp + * gdb.arch/arm-bl-branch-dest.exp + * gdb.arch/arm-disp-step.exp + * gdb.arch/arm-neon.exp + * gdb.arch/arm-single-step-kernel-helper.exp + * gdb.arch/avr-flash-qualifier.exp + * gdb.arch/disp-step-insn-reloc.exp + * gdb.arch/e500-abi.exp + * gdb.arch/e500-regs.exp + * gdb.arch/ftrace-insn-reloc.exp + * gdb.arch/i386-avx512.exp + * gdb.arch/i386-bp_permanent.exp + * gdb.arch/i386-byte.exp + * gdb.arch/i386-cfi-notcurrent.exp + * gdb.arch/i386-disp-step.exp + * gdb.arch/i386-dr3-watch.exp + * gdb.arch/i386-float.exp + * gdb.arch/i386-gnu-cfi.exp + * gdb.arch/i386-mpx-map.exp + * gdb.arch/i386-mpx-sigsegv.exp + * gdb.arch/i386-mpx-simple_segv.exp + * gdb.arch/i386-mpx.exp + * gdb.arch/i386-permbkpt.exp + * gdb.arch/i386-prologue.exp + * gdb.arch/i386-signal.exp + * gdb.arch/i386-size-overlap.exp + * gdb.arch/i386-unwind.exp + * gdb.arch/i386-word.exp + * gdb.arch/mips-fcr.exp + * gdb.arch/powerpc-d128-regs.exp + * gdb.arch/powerpc-stackless.exp + * gdb.arch/ppc64-atomic-inst.exp + * gdb.arch/s390-stackless.exp + * gdb.arch/s390-tdbregs.exp + * gdb.arch/s390-vregs.exp + * gdb.arch/sparc-sysstep.exp + * gdb.arch/thumb-bx-pc.exp + * gdb.arch/thumb-singlestep.exp + * gdb.arch/thumb2-it.exp + * gdb.arch/vsx-regs.exp + * gdb.asm/asm-source.exp + * gdb.base/a2-run.exp + * gdb.base/advance.exp + * gdb.base/all-bin.exp + * gdb.base/anon.exp + * gdb.base/args.exp + * gdb.base/arithmet.exp + * gdb.base/async-shell.exp + * gdb.base/async.exp + * gdb.base/attach-pie-noexec.exp + * gdb.base/attach-twice.exp + * gdb.base/auto-load.exp + * gdb.base/bang.exp + * gdb.base/bitfields.exp + * gdb.base/break-always.exp + * gdb.base/break-caller-line.exp + * gdb.base/break-entry.exp + * gdb.base/break-inline.exp + * gdb.base/break-on-linker-gcd-function.exp + * gdb.base/break-probes.exp + * gdb.base/break.exp + * gdb.base/breakpoint-shadow.exp + * gdb.base/call-ar-st.exp + * gdb.base/call-sc.exp + * gdb.base/call-signal-resume.exp + * gdb.base/call-strs.exp + * gdb.base/callfuncs.exp + * gdb.base/catch-fork-static.exp + * gdb.base/catch-gdb-caused-signals.exp + * gdb.base/catch-load.exp + * gdb.base/catch-signal-fork.exp + * gdb.base/catch-signal.exp + * gdb.base/catch-syscall.exp + * gdb.base/charset.exp + * gdb.base/checkpoint.exp + * gdb.base/chng-syms.exp + * gdb.base/code-expr.exp + * gdb.base/code_elim.exp + * gdb.base/commands.exp + * gdb.base/completion.exp + * gdb.base/complex.exp + * gdb.base/cond-expr.exp + * gdb.base/condbreak.exp + * gdb.base/consecutive.exp + * gdb.base/continue-all-already-running.exp + * gdb.base/coredump-filter.exp + * gdb.base/corefile.exp + * gdb.base/dbx.exp + * gdb.base/debug-expr.exp + * gdb.base/define.exp + * gdb.base/del.exp + * gdb.base/disabled-location.exp + * gdb.base/disasm-end-cu.exp + * gdb.base/disasm-optim.exp + * gdb.base/display.exp + * gdb.base/duplicate-bp.exp + * gdb.base/ena-dis-br.exp + * gdb.base/ending-run.exp + * gdb.base/enumval.exp + * gdb.base/environ.exp + * gdb.base/eu-strip-infcall.exp + * gdb.base/eval-avoid-side-effects.exp + * gdb.base/eval-skip.exp + * gdb.base/exitsignal.exp + * gdb.base/expand-psymtabs.exp + * gdb.base/filesym.exp + * gdb.base/find-unmapped.exp + * gdb.base/finish.exp + * gdb.base/float.exp + * gdb.base/foll-exec-mode.exp + * gdb.base/foll-exec.exp + * gdb.base/foll-fork.exp + * gdb.base/fortran-sym-case.exp + * gdb.base/freebpcmd.exp + * gdb.base/func-ptr.exp + * gdb.base/func-ptrs.exp + * gdb.base/funcargs.exp + * gdb.base/gcore-buffer-overflow.exp + * gdb.base/gcore-relro-pie.exp + * gdb.base/gcore-relro.exp + * gdb.base/gcore.exp + * gdb.base/gdb1090.exp + * gdb.base/gdb11530.exp + * gdb.base/gdb11531.exp + * gdb.base/gdb1821.exp + * gdb.base/gdbindex-stabs.exp + * gdb.base/gdbvars.exp + * gdb.base/hbreak.exp + * gdb.base/hbreak2.exp + * gdb.base/included.exp + * gdb.base/infcall-input.exp + * gdb.base/inferior-died.exp + * gdb.base/infnan.exp + * gdb.base/info-macros.exp + * gdb.base/info-os.exp + * gdb.base/info-proc.exp + * gdb.base/info-shared.exp + * gdb.base/info-target.exp + * gdb.base/infoline.exp + * gdb.base/interp.exp + * gdb.base/interrupt.exp + * gdb.base/jit-reader.exp + * gdb.base/jit-simple.exp + * gdb.base/kill-after-signal.exp + * gdb.base/kill-detach-inferiors-cmd.exp + * gdb.base/label.exp + * gdb.base/langs.exp + * gdb.base/ldbl_e308.exp + * gdb.base/line-symtabs.exp + * gdb.base/linespecs.exp + * gdb.base/list.exp + * gdb.base/long_long.exp + * gdb.base/longest-types.exp + * gdb.base/maint.exp + * gdb.base/max-value-size.exp + * gdb.base/memattr.exp + * gdb.base/mips_pro.exp + * gdb.base/morestack.exp + * gdb.base/moribund-step.exp + * gdb.base/multi-forks.exp + * gdb.base/nested-addr.exp + * gdb.base/nextoverexit.exp + * gdb.base/noreturn-finish.exp + * gdb.base/noreturn-return.exp + * gdb.base/nostdlib.exp + * gdb.base/offsets.exp + * gdb.base/opaque.exp + * gdb.base/pc-fp.exp + * gdb.base/permissions.exp + * gdb.base/print-symbol-loading.exp + * gdb.base/prologue-include.exp + * gdb.base/psymtab.exp + * gdb.base/ptype.exp + * gdb.base/random-signal.exp + * gdb.base/randomize.exp + * gdb.base/range-stepping.exp + * gdb.base/readline-ask.exp + * gdb.base/recpar.exp + * gdb.base/recurse.exp + * gdb.base/relational.exp + * gdb.base/restore.exp + * gdb.base/return-nodebug.exp + * gdb.base/return.exp + * gdb.base/run-after-attach.exp + * gdb.base/save-bp.exp + * gdb.base/scope.exp + * gdb.base/sect-cmd.exp + * gdb.base/set-lang-auto.exp + * gdb.base/set-noassign.exp + * gdb.base/setvar.exp + * gdb.base/sigall.exp + * gdb.base/sigbpt.exp + * gdb.base/siginfo-addr.exp + * gdb.base/siginfo-infcall.exp + * gdb.base/siginfo-obj.exp + * gdb.base/siginfo.exp + * gdb.base/signals-state-child.exp + * gdb.base/signest.exp + * gdb.base/sigstep.exp + * gdb.base/sizeof.exp + * gdb.base/skip.exp + * gdb.base/solib-corrupted.exp + * gdb.base/solib-nodir.exp + * gdb.base/solib-search.exp + * gdb.base/stack-checking.exp + * gdb.base/stale-infcall.exp + * gdb.base/stap-probe.exp + * gdb.base/start.exp + * gdb.base/step-break.exp + * gdb.base/step-bt.exp + * gdb.base/step-line.exp + * gdb.base/step-over-exit.exp + * gdb.base/step-over-syscall.exp + * gdb.base/step-resume-infcall.exp + * gdb.base/step-test.exp + * gdb.base/store.exp + * gdb.base/structs3.exp + * gdb.base/sym-file.exp + * gdb.base/symbol-without-target_section.exp + * gdb.base/term.exp + * gdb.base/testenv.exp + * gdb.base/ui-redirect.exp + * gdb.base/until.exp + * gdb.base/unwindonsignal.exp + * gdb.base/value-double-free.exp + * gdb.base/vla-datatypes.exp + * gdb.base/vla-ptr.exp + * gdb.base/vla-sideeffect.exp + * gdb.base/volatile.exp + * gdb.base/watch-cond-infcall.exp + * gdb.base/watch-cond.exp + * gdb.base/watch-non-mem.exp + * gdb.base/watch-read.exp + * gdb.base/watch-vfork.exp + * gdb.base/watchpoint-cond-gone.exp + * gdb.base/watchpoint-delete.exp + * gdb.base/watchpoint-hw-hit-once.exp + * gdb.base/watchpoint-hw.exp + * gdb.base/watchpoint-stops-at-right-insn.exp + * gdb.base/watchpoints.exp + * gdb.base/wchar.exp + * gdb.base/whatis-exp.exp + * gdb.btrace/buffer-size.exp + * gdb.btrace/data.exp + * gdb.btrace/delta.exp + * gdb.btrace/dlopen.exp + * gdb.btrace/enable.exp + * gdb.btrace/exception.exp + * gdb.btrace/function_call_history.exp + * gdb.btrace/gcore.exp + * gdb.btrace/instruction_history.exp + * gdb.btrace/nohist.exp + * gdb.btrace/reconnect.exp + * gdb.btrace/record_goto-step.exp + * gdb.btrace/record_goto.exp + * gdb.btrace/rn-dl-bind.exp + * gdb.btrace/segv.exp + * gdb.btrace/step.exp + * gdb.btrace/stepi.exp + * gdb.btrace/tailcall-only.exp + * gdb.btrace/tailcall.exp + * gdb.btrace/tsx.exp + * gdb.btrace/unknown_functions.exp + * gdb.btrace/vdso.exp + * gdb.compile/compile-ifunc.exp + * gdb.compile/compile-ops.exp + * gdb.compile/compile-print.exp + * gdb.compile/compile-setjmp.exp + * gdb.cp/abstract-origin.exp + * gdb.cp/ambiguous.exp + * gdb.cp/annota2.exp + * gdb.cp/annota3.exp + * gdb.cp/anon-ns.exp + * gdb.cp/anon-struct.exp + * gdb.cp/anon-union.exp + * gdb.cp/arg-reference.exp + * gdb.cp/baseenum.exp + * gdb.cp/bool.exp + * gdb.cp/breakpoint.exp + * gdb.cp/bs15503.exp + * gdb.cp/call-c.exp + * gdb.cp/casts.exp + * gdb.cp/chained-calls.exp + * gdb.cp/class2.exp + * gdb.cp/classes.exp + * gdb.cp/cmpd-minsyms.exp + * gdb.cp/converts.exp + * gdb.cp/cp-relocate.exp + * gdb.cp/cpcompletion.exp + * gdb.cp/cpexprs.exp + * gdb.cp/cplabel.exp + * gdb.cp/cplusfuncs.exp + * gdb.cp/cpsizeof.exp + * gdb.cp/ctti.exp + * gdb.cp/derivation.exp + * gdb.cp/destrprint.exp + * gdb.cp/dispcxx.exp + * gdb.cp/enum-class.exp + * gdb.cp/exception.exp + * gdb.cp/exceptprint.exp + * gdb.cp/expand-psymtabs-cxx.exp + * gdb.cp/expand-sals.exp + * gdb.cp/extern-c.exp + * gdb.cp/filename.exp + * gdb.cp/formatted-ref.exp + * gdb.cp/fpointer.exp + * gdb.cp/gdb1355.exp + * gdb.cp/gdb2495.exp + * gdb.cp/hang.exp + * gdb.cp/impl-this.exp + * gdb.cp/infcall-dlopen.exp + * gdb.cp/inherit.exp + * gdb.cp/iostream.exp + * gdb.cp/koenig.exp + * gdb.cp/local.exp + * gdb.cp/m-data.exp + * gdb.cp/m-static.exp + * gdb.cp/mb-ctor.exp + * gdb.cp/mb-inline.exp + * gdb.cp/mb-templates.exp + * gdb.cp/member-name.exp + * gdb.cp/member-ptr.exp + * gdb.cp/meth-typedefs.exp + * gdb.cp/method.exp + * gdb.cp/method2.exp + * gdb.cp/minsym-fallback.exp + * gdb.cp/misc.exp + * gdb.cp/namelessclass.exp + * gdb.cp/namespace-enum.exp + * gdb.cp/namespace-nested-import.exp + * gdb.cp/namespace.exp + * gdb.cp/nextoverthrow.exp + * gdb.cp/no-dmgl-verbose.exp + * gdb.cp/non-trivial-retval.exp + * gdb.cp/noparam.exp + * gdb.cp/nsdecl.exp + * gdb.cp/nsimport.exp + * gdb.cp/nsnested.exp + * gdb.cp/nsnoimports.exp + * gdb.cp/nsrecurs.exp + * gdb.cp/nsstress.exp + * gdb.cp/nsusing.exp + * gdb.cp/operator.exp + * gdb.cp/oranking.exp + * gdb.cp/overload-const.exp + * gdb.cp/overload.exp + * gdb.cp/ovldbreak.exp + * gdb.cp/ovsrch.exp + * gdb.cp/paren-type.exp + * gdb.cp/parse-lang.exp + * gdb.cp/pass-by-ref.exp + * gdb.cp/pr-1023.exp + * gdb.cp/pr-1210.exp + * gdb.cp/pr-574.exp + * gdb.cp/pr10687.exp + * gdb.cp/pr12028.exp + * gdb.cp/pr17132.exp + * gdb.cp/pr17494.exp + * gdb.cp/pr9067.exp + * gdb.cp/pr9167.exp + * gdb.cp/pr9631.exp + * gdb.cp/printmethod.exp + * gdb.cp/psmang.exp + * gdb.cp/psymtab-parameter.exp + * gdb.cp/ptype-cv-cp.exp + * gdb.cp/ptype-flags.exp + * gdb.cp/re-set-overloaded.exp + * gdb.cp/ref-types.exp + * gdb.cp/rtti.exp + * gdb.cp/scope-err.exp + * gdb.cp/shadow.exp + * gdb.cp/smartp.exp + * gdb.cp/static-method.exp + * gdb.cp/static-print-quit.exp + * gdb.cp/temargs.exp + * gdb.cp/templates.exp + * gdb.cp/try_catch.exp + * gdb.cp/typedef-operator.exp + * gdb.cp/typeid.exp + * gdb.cp/userdef.exp + * gdb.cp/using-crash.exp + * gdb.cp/var-tag.exp + * gdb.cp/virtbase.exp + * gdb.cp/virtfunc.exp + * gdb.cp/virtfunc2.exp + * gdb.cp/vla-cxx.exp + * gdb.disasm/t01_mov.exp + * gdb.disasm/t02_mova.exp + * gdb.disasm/t03_add.exp + * gdb.disasm/t04_sub.exp + * gdb.disasm/t05_cmp.exp + * gdb.disasm/t06_ari2.exp + * gdb.disasm/t07_ari3.exp + * gdb.disasm/t08_or.exp + * gdb.disasm/t09_xor.exp + * gdb.disasm/t10_and.exp + * gdb.disasm/t11_logs.exp + * gdb.disasm/t12_bit.exp + * gdb.disasm/t13_otr.exp + * gdb.dlang/circular.exp + * gdb.dwarf2/arr-stride.exp + * gdb.dwarf2/arr-subrange.exp + * gdb.dwarf2/atomic-type.exp + * gdb.dwarf2/bad-regnum.exp + * gdb.dwarf2/bitfield-parent-optimized-out.exp + * gdb.dwarf2/callframecfa.exp + * gdb.dwarf2/clztest.exp + * gdb.dwarf2/corrupt.exp + * gdb.dwarf2/data-loc.exp + * gdb.dwarf2/dup-psym.exp + * gdb.dwarf2/dw2-anon-mptr.exp + * gdb.dwarf2/dw2-anonymous-func.exp + * gdb.dwarf2/dw2-bad-mips-linkage-name.exp + * gdb.dwarf2/dw2-bad-unresolved.exp + * gdb.dwarf2/dw2-basic.exp + * gdb.dwarf2/dw2-canonicalize-type.exp + * gdb.dwarf2/dw2-case-insensitive.exp + * gdb.dwarf2/dw2-common-block.exp + * gdb.dwarf2/dw2-compdir-oldgcc.exp + * gdb.dwarf2/dw2-compressed.exp + * gdb.dwarf2/dw2-const.exp + * gdb.dwarf2/dw2-cp-infcall-ref-static.exp + * gdb.dwarf2/dw2-cu-size.exp + * gdb.dwarf2/dw2-dup-frame.exp + * gdb.dwarf2/dw2-entry-value.exp + * gdb.dwarf2/dw2-icycle.exp + * gdb.dwarf2/dw2-ifort-parameter.exp + * gdb.dwarf2/dw2-inline-break.exp + * gdb.dwarf2/dw2-inline-param.exp + * gdb.dwarf2/dw2-intercu.exp + * gdb.dwarf2/dw2-intermix.exp + * gdb.dwarf2/dw2-lexical-block-bare.exp + * gdb.dwarf2/dw2-linkage-name-trust.exp + * gdb.dwarf2/dw2-minsym-in-cu.exp + * gdb.dwarf2/dw2-noloc.exp + * gdb.dwarf2/dw2-op-call.exp + * gdb.dwarf2/dw2-op-out-param.exp + * gdb.dwarf2/dw2-opt-structptr.exp + * gdb.dwarf2/dw2-param-error.exp + * gdb.dwarf2/dw2-producer.exp + * gdb.dwarf2/dw2-ranges-base.exp + * gdb.dwarf2/dw2-ref-missing-frame.exp + * gdb.dwarf2/dw2-reg-undefined.exp + * gdb.dwarf2/dw2-regno-invalid.exp + * gdb.dwarf2/dw2-restore.exp + * gdb.dwarf2/dw2-restrict.exp + * gdb.dwarf2/dw2-single-line-discriminators.exp + * gdb.dwarf2/dw2-strp.exp + * gdb.dwarf2/dw2-undefined-ret-addr.exp + * gdb.dwarf2/dw2-unresolved.exp + * gdb.dwarf2/dw2-var-zero-addr.exp + * gdb.dwarf2/dw4-sig-types.exp + * gdb.dwarf2/dwz.exp + * gdb.dwarf2/dynarr-ptr.exp + * gdb.dwarf2/enum-type.exp + * gdb.dwarf2/gdb-index.exp + * gdb.dwarf2/implptr-64bit.exp + * gdb.dwarf2/implptr-optimized-out.exp + * gdb.dwarf2/implptr.exp + * gdb.dwarf2/implref-array.exp + * gdb.dwarf2/implref-const.exp + * gdb.dwarf2/implref-global.exp + * gdb.dwarf2/implref-struct.exp + * gdb.dwarf2/mac-fileno.exp + * gdb.dwarf2/main-subprogram.exp + * gdb.dwarf2/member-ptr-forwardref.exp + * gdb.dwarf2/method-ptr.exp + * gdb.dwarf2/missing-sig-type.exp + * gdb.dwarf2/nonvar-access.exp + * gdb.dwarf2/opaque-type-lookup.exp + * gdb.dwarf2/pieces-optimized-out.exp + * gdb.dwarf2/pieces.exp + * gdb.dwarf2/pr10770.exp + * gdb.dwarf2/pr13961.exp + * gdb.dwarf2/staticvirtual.exp + * gdb.dwarf2/subrange.exp + * gdb.dwarf2/symtab-producer.exp + * gdb.dwarf2/trace-crash.exp + * gdb.dwarf2/typeddwarf.exp + * gdb.dwarf2/valop.exp + * gdb.dwarf2/watch-notconst.exp + * gdb.fortran/array-element.exp + * gdb.fortran/charset.exp + * gdb.fortran/common-block.exp + * gdb.fortran/complex.exp + * gdb.fortran/derived-type-function.exp + * gdb.fortran/derived-type.exp + * gdb.fortran/logical.exp + * gdb.fortran/module.exp + * gdb.fortran/multi-dim.exp + * gdb.fortran/nested-funcs.exp + * gdb.fortran/print-formatted.exp + * gdb.fortran/subarray.exp + * gdb.fortran/vla-alloc-assoc.exp + * gdb.fortran/vla-datatypes.exp + * gdb.fortran/vla-history.exp + * gdb.fortran/vla-ptr-info.exp + * gdb.fortran/vla-ptype-sub.exp + * gdb.fortran/vla-ptype.exp + * gdb.fortran/vla-sizeof.exp + * gdb.fortran/vla-type.exp + * gdb.fortran/vla-value-sub-arbitrary.exp + * gdb.fortran/vla-value-sub-finish.exp + * gdb.fortran/vla-value-sub.exp + * gdb.fortran/vla-value.exp + * gdb.fortran/whatis_type.exp + * gdb.go/chan.exp + * gdb.go/handcall.exp + * gdb.go/hello.exp + * gdb.go/integers.exp + * gdb.go/methods.exp + * gdb.go/package.exp + * gdb.go/strings.exp + * gdb.go/types.exp + * gdb.go/unsafe.exp + * gdb.guile/scm-arch.exp + * gdb.guile/scm-block.exp + * gdb.guile/scm-breakpoint.exp + * gdb.guile/scm-cmd.exp + * gdb.guile/scm-disasm.exp + * gdb.guile/scm-equal.exp + * gdb.guile/scm-frame-args.exp + * gdb.guile/scm-frame-inline.exp + * gdb.guile/scm-frame.exp + * gdb.guile/scm-iterator.exp + * gdb.guile/scm-math.exp + * gdb.guile/scm-objfile.exp + * gdb.guile/scm-ports.exp + * gdb.guile/scm-symbol.exp + * gdb.guile/scm-symtab.exp + * gdb.guile/scm-value-cc.exp + * gdb.guile/types-module.exp + * gdb.linespec/break-ask.exp + * gdb.linespec/cpexplicit.exp + * gdb.linespec/explicit.exp + * gdb.linespec/keywords.exp + * gdb.linespec/linespec.exp + * gdb.linespec/ls-dollar.exp + * gdb.linespec/ls-errs.exp + * gdb.linespec/skip-two.exp + * gdb.linespec/thread.exp + * gdb.mi/mi-async.exp + * gdb.mi/mi-basics.exp + * gdb.mi/mi-break.exp + * gdb.mi/mi-catch-load.exp + * gdb.mi/mi-cli.exp + * gdb.mi/mi-cmd-param-changed.exp + * gdb.mi/mi-console.exp + * gdb.mi/mi-detach.exp + * gdb.mi/mi-disassemble.exp + * gdb.mi/mi-eval.exp + * gdb.mi/mi-file-transfer.exp + * gdb.mi/mi-file.exp + * gdb.mi/mi-fill-memory.exp + * gdb.mi/mi-inheritance-syntax-error.exp + * gdb.mi/mi-linespec-err-cp.exp + * gdb.mi/mi-logging.exp + * gdb.mi/mi-memory-changed.exp + * gdb.mi/mi-read-memory.exp + * gdb.mi/mi-record-changed.exp + * gdb.mi/mi-reg-undefined.exp + * gdb.mi/mi-regs.exp + * gdb.mi/mi-return.exp + * gdb.mi/mi-reverse.exp + * gdb.mi/mi-simplerun.exp + * gdb.mi/mi-solib.exp + * gdb.mi/mi-stack.exp + * gdb.mi/mi-stepi.exp + * gdb.mi/mi-syn-frame.exp + * gdb.mi/mi-until.exp + * gdb.mi/mi-var-block.exp + * gdb.mi/mi-var-child.exp + * gdb.mi/mi-var-cmd.exp + * gdb.mi/mi-var-cp.exp + * gdb.mi/mi-var-display.exp + * gdb.mi/mi-var-invalidate.exp + * gdb.mi/mi-var-list-children-invalid-grandchild.exp + * gdb.mi/mi-vla-fortran.exp + * gdb.mi/mi-watch.exp + * gdb.mi/mi2-var-child.exp + * gdb.mi/user-selected-context-sync.exp + * gdb.modula2/unbounded-array.exp + * gdb.multi/dummy-frame-restore.exp + * gdb.multi/multi-arch-exec.exp + * gdb.multi/multi-arch.exp + * gdb.multi/tids.exp + * gdb.multi/watchpoint-multi.exp + * gdb.opencl/callfuncs.exp + * gdb.opencl/convs_casts.exp + * gdb.opencl/datatypes.exp + * gdb.opencl/operators.exp + * gdb.opencl/vec_comps.exp + * gdb.opt/clobbered-registers-O2.exp + * gdb.opt/inline-break.exp + * gdb.opt/inline-bt.exp + * gdb.opt/inline-cmds.exp + * gdb.opt/inline-locals.exp + * gdb.pascal/case-insensitive-symbols.exp + * gdb.pascal/floats.exp + * gdb.pascal/gdb11492.exp + * gdb.python/lib-types.exp + * gdb.python/py-arch.exp + * gdb.python/py-as-string.exp + * gdb.python/py-bad-printers.exp + * gdb.python/py-block.exp + * gdb.python/py-breakpoint-create-fail.exp + * gdb.python/py-breakpoint.exp + * gdb.python/py-caller-is.exp + * gdb.python/py-cmd.exp + * gdb.python/py-explore-cc.exp + * gdb.python/py-explore.exp + * gdb.python/py-finish-breakpoint.exp + * gdb.python/py-finish-breakpoint2.exp + * gdb.python/py-frame-args.exp + * gdb.python/py-frame-inline.exp + * gdb.python/py-frame.exp + * gdb.python/py-framefilter-mi.exp + * gdb.python/py-infthread.exp + * gdb.python/py-lazy-string.exp + * gdb.python/py-linetable.exp + * gdb.python/py-mi-events.exp + * gdb.python/py-mi-objfile.exp + * gdb.python/py-mi.exp + * gdb.python/py-objfile.exp + * gdb.python/py-pp-integral.exp + * gdb.python/py-pp-maint.exp + * gdb.python/py-pp-re-notag.exp + * gdb.python/py-pp-registration.exp + * gdb.python/py-recurse-unwind.exp + * gdb.python/py-strfns.exp + * gdb.python/py-symbol.exp + * gdb.python/py-symtab.exp + * gdb.python/py-sync-interp.exp + * gdb.python/py-typeprint.exp + * gdb.python/py-unwind-maint.exp + * gdb.python/py-unwind.exp + * gdb.python/py-value-cc.exp + * gdb.python/py-xmethods.exp + * gdb.reverse/amd64-tailcall-reverse.exp + * gdb.reverse/break-precsave.exp + * gdb.reverse/break-reverse.exp + * gdb.reverse/consecutive-precsave.exp + * gdb.reverse/consecutive-reverse.exp + * gdb.reverse/finish-precsave.exp + * gdb.reverse/finish-reverse-bkpt.exp + * gdb.reverse/finish-reverse.exp + * gdb.reverse/fstatat-reverse.exp + * gdb.reverse/getresuid-reverse.exp + * gdb.reverse/i386-precsave.exp + * gdb.reverse/i386-reverse.exp + * gdb.reverse/i386-sse-reverse.exp + * gdb.reverse/i387-env-reverse.exp + * gdb.reverse/i387-stack-reverse.exp + * gdb.reverse/insn-reverse.exp + * gdb.reverse/machinestate-precsave.exp + * gdb.reverse/machinestate.exp + * gdb.reverse/next-reverse-bkpt-over-sr.exp + * gdb.reverse/pipe-reverse.exp + * gdb.reverse/readv-reverse.exp + * gdb.reverse/recvmsg-reverse.exp + * gdb.reverse/rerun-prec.exp + * gdb.reverse/s390-mvcle.exp + * gdb.reverse/step-precsave.exp + * gdb.reverse/step-reverse.exp + * gdb.reverse/time-reverse.exp + * gdb.reverse/until-precsave.exp + * gdb.reverse/until-reverse.exp + * gdb.reverse/waitpid-reverse.exp + * gdb.reverse/watch-precsave.exp + * gdb.reverse/watch-reverse.exp + * gdb.rust/generics.exp + * gdb.rust/methods.exp + * gdb.rust/modules.exp + * gdb.rust/simple.exp + * gdb.server/connect-with-no-symbol-file.exp + * gdb.server/ext-attach.exp + * gdb.server/ext-restart.exp + * gdb.server/ext-wrapper.exp + * gdb.server/file-transfer.exp + * gdb.server/server-exec-info.exp + * gdb.server/server-kill.exp + * gdb.server/server-mon.exp + * gdb.server/wrapper.exp + * gdb.stabs/exclfwd.exp + * gdb.stabs/gdb11479.exp + * gdb.threads/clone-new-thread-event.exp + * gdb.threads/corethreads.exp + * gdb.threads/current-lwp-dead.exp + * gdb.threads/dlopen-libpthread.exp + * gdb.threads/gcore-thread.exp + * gdb.threads/sigstep-threads.exp + * gdb.threads/watchpoint-fork.exp + * gdb.trace/actions-changed.exp + * gdb.trace/backtrace.exp + * gdb.trace/change-loc.exp + * gdb.trace/circ.exp + * gdb.trace/collection.exp + * gdb.trace/disconnected-tracing.exp + * gdb.trace/ftrace.exp + * gdb.trace/mi-trace-frame-collected.exp + * gdb.trace/mi-trace-unavailable.exp + * gdb.trace/mi-traceframe-changed.exp + * gdb.trace/mi-tsv-changed.exp + * gdb.trace/no-attach-trace.exp + * gdb.trace/passc-dyn.exp + * gdb.trace/qtro.exp + * gdb.trace/range-stepping.exp + * gdb.trace/read-memory.exp + * gdb.trace/save-trace.exp + * gdb.trace/signal.exp + * gdb.trace/status-stop.exp + * gdb.trace/tfile.exp + * gdb.trace/trace-break.exp + * gdb.trace/trace-buffer-size.exp + * gdb.trace/trace-condition.exp + * gdb.trace/tracefile-pseudo-reg.exp + * gdb.trace/tstatus.exp + * gdb.trace/unavailable.exp + * gdb.trace/while-dyn.exp + * gdb.trace/while-stepping.exp + 2016-12-22 Doug Evans <xdje42@gmail.com> * gdb.base/maint.exp: Update tests for maint print symbols, psymbols diff --git a/gdb/testsuite/gdb.ada/exec_changed.exp b/gdb/testsuite/gdb.ada/exec_changed.exp index a574cd5fb70..aceb89f13ba 100644 --- a/gdb/testsuite/gdb.ada/exec_changed.exp +++ b/gdb/testsuite/gdb.ada/exec_changed.exp @@ -20,7 +20,7 @@ if { [skip_ada_tests] } { return -1 } # This testcase verifies the behavior of the `start' command, which # does not work when we use the gdb stub... if [target_info exists use_gdb_stub] { - untested exec_changed.exp + untested "skipping tests due to use_gdb_stub" return } diff --git a/gdb/testsuite/gdb.ada/info_types.exp b/gdb/testsuite/gdb.ada/info_types.exp index 8895f78140b..10b4201c996 100644 --- a/gdb/testsuite/gdb.ada/info_types.exp +++ b/gdb/testsuite/gdb.ada/info_types.exp @@ -15,7 +15,7 @@ standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp b/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp index 8c31658d236..1b4e9a8fb42 100644 --- a/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp +++ b/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp @@ -25,7 +25,7 @@ if {![is_aarch64_target]} { } standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/aarch64-fp.exp b/gdb/testsuite/gdb.arch/aarch64-fp.exp index 7e237154029..77e8524e9e2 100644 --- a/gdb/testsuite/gdb.arch/aarch64-fp.exp +++ b/gdb/testsuite/gdb.arch/aarch64-fp.exp @@ -25,7 +25,7 @@ if {![is_aarch64_target]} { } standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/altivec-abi.exp b/gdb/testsuite/gdb.arch/altivec-abi.exp index 3070fab72f7..415eb7f10ea 100644 --- a/gdb/testsuite/gdb.arch/altivec-abi.exp +++ b/gdb/testsuite/gdb.arch/altivec-abi.exp @@ -40,7 +40,7 @@ proc altivec_abi_tests { extra_flags force_abi } { set compile_flags "debug nowarnings $extra_flags" if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $compile_flags] != "" } { - untested altivec-abi.exp + untested "failed to compile" return -1 } @@ -62,7 +62,7 @@ proc altivec_abi_tests { extra_flags force_abi } { # Run to `main' where we begin our tests. if ![runto_main] then { - untested altivec-abi.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.arch/altivec-regs.exp b/gdb/testsuite/gdb.arch/altivec-regs.exp index 51e5e7a54fe..c57ae63f787 100644 --- a/gdb/testsuite/gdb.arch/altivec-regs.exp +++ b/gdb/testsuite/gdb.arch/altivec-regs.exp @@ -45,7 +45,7 @@ if [test_compiler_info gcc*] { } if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $compile_flags] != "" } { - untested altivec-regs.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-byte.exp b/gdb/testsuite/gdb.arch/amd64-byte.exp index 127051d0e92..57f3c0be4b7 100644 --- a/gdb/testsuite/gdb.arch/amd64-byte.exp +++ b/gdb/testsuite/gdb.arch/amd64-byte.exp @@ -31,7 +31,7 @@ if [get_compiler_info] { } if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug]] != "" } { - untested ${testfile} + untested "failed to compile" return } diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step.exp b/gdb/testsuite/gdb.arch/amd64-disp-step.exp index ba75b465a75..3e3cfca1a14 100644 --- a/gdb/testsuite/gdb.arch/amd64-disp-step.exp +++ b/gdb/testsuite/gdb.arch/amd64-disp-step.exp @@ -30,7 +30,7 @@ standard_testfile .S set additional_flags "-Wa,-g" if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } { - untested amd64-disp-step.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-dword.exp b/gdb/testsuite/gdb.arch/amd64-dword.exp index 496a3263b43..ffa517f9e9b 100644 --- a/gdb/testsuite/gdb.arch/amd64-dword.exp +++ b/gdb/testsuite/gdb.arch/amd64-dword.exp @@ -31,7 +31,7 @@ if [get_compiler_info] { } if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug]] != "" } { - untested ${testfile} + untested "failed to compile" return } diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value-inline.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-inline.exp index a56f5cf71d8..a77628dea1e 100644 --- a/gdb/testsuite/gdb.arch/amd64-entry-value-inline.exp +++ b/gdb/testsuite/gdb.arch/amd64-entry-value-inline.exp @@ -25,7 +25,7 @@ if [info exists COMPILE] { return } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp index f16daee226e..3a6481f56ef 100644 --- a/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp +++ b/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp @@ -25,7 +25,7 @@ if [info exists COMPILE] { return } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value-paramref.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-paramref.exp index 1dae031787d..bb0ca2a36dc 100644 --- a/gdb/testsuite/gdb.arch/amd64-entry-value-paramref.exp +++ b/gdb/testsuite/gdb.arch/amd64-entry-value-paramref.exp @@ -20,7 +20,7 @@ if { ![istarget x86_64-*-* ] || ![is_lp64_target] } { return } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} "c++"] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} "c++"] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value.exp b/gdb/testsuite/gdb.arch/amd64-entry-value.exp index 6dadb532ca7..84d182d82ec 100644 --- a/gdb/testsuite/gdb.arch/amd64-entry-value.exp +++ b/gdb/testsuite/gdb.arch/amd64-entry-value.exp @@ -25,7 +25,7 @@ if [info exists COMPILE] { return } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-i386-address.exp b/gdb/testsuite/gdb.arch/amd64-i386-address.exp index 6739f768bfc..176a0a6ac26 100644 --- a/gdb/testsuite/gdb.arch/amd64-i386-address.exp +++ b/gdb/testsuite/gdb.arch/amd64-i386-address.exp @@ -24,7 +24,7 @@ if { (![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"]) || ![is_lp64_target] return } -if [prepare_for_testing amd64-i386-address.exp amd64-i386-address amd64-i386-address.S [list debug "additional_flags=-m32 -nostdlib"]] { +if [prepare_for_testing "failed to prepare" amd64-i386-address amd64-i386-address.S [list debug "additional_flags=-m32 -nostdlib"]] { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-invalid-stack-middle.exp b/gdb/testsuite/gdb.arch/amd64-invalid-stack-middle.exp index e069476ddb4..513c8bd5935 100644 --- a/gdb/testsuite/gdb.arch/amd64-invalid-stack-middle.exp +++ b/gdb/testsuite/gdb.arch/amd64-invalid-stack-middle.exp @@ -35,7 +35,7 @@ if { ![istarget x86_64-*-* ] || ![is_lp64_target] } { return } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp b/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp index b6193f733d3..b9e66b3feb1 100644 --- a/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp +++ b/gdb/testsuite/gdb.arch/amd64-invalid-stack-top.exp @@ -34,7 +34,7 @@ if { ![istarget x86_64-*-* ] || ![is_lp64_target] } { verbose "Skipping ${testfile}." return } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-optimout-repeat.exp b/gdb/testsuite/gdb.arch/amd64-optimout-repeat.exp index f7f632b77fb..3f92a36b60d 100644 --- a/gdb/testsuite/gdb.arch/amd64-optimout-repeat.exp +++ b/gdb/testsuite/gdb.arch/amd64-optimout-repeat.exp @@ -25,7 +25,7 @@ if [info exists COMPILE] { return } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-prologue-skip.exp b/gdb/testsuite/gdb.arch/amd64-prologue-skip.exp index 93f66dac7bd..1997e837b48 100644 --- a/gdb/testsuite/gdb.arch/amd64-prologue-skip.exp +++ b/gdb/testsuite/gdb.arch/amd64-prologue-skip.exp @@ -22,7 +22,7 @@ if { ![istarget x86_64-*-* ] || ![is_lp64_target] } { } if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug}] != "" } { - untested ${testfile} + untested "failed to compile" return } diff --git a/gdb/testsuite/gdb.arch/amd64-prologue-xmm.exp b/gdb/testsuite/gdb.arch/amd64-prologue-xmm.exp index d8693b526ee..4ac5bd43715 100644 --- a/gdb/testsuite/gdb.arch/amd64-prologue-xmm.exp +++ b/gdb/testsuite/gdb.arch/amd64-prologue-xmm.exp @@ -29,7 +29,7 @@ if [info exists COMPILE] { return 0 } -if {[prepare_for_testing ${testfile}.exp ${binfile} $srcfile $opts]} { +if {[prepare_for_testing "failed to prepare" ${binfile} $srcfile $opts]} { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp b/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp index 8b85bd03143..6e6b49b3116 100644 --- a/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp +++ b/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp @@ -30,8 +30,7 @@ proc test_probe { probe_name } { standard_testfile amd64-stap-triplet.S -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { - untested amd64-stap-special-operands.exp +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } @@ -39,8 +38,7 @@ test_probe "triplet" standard_testfile amd64-stap-three-arg-disp.S -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { - untested amd64-stap-special-operands.exp +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp b/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp index cd2247aa477..af01df909db 100644 --- a/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp +++ b/gdb/testsuite/gdb.arch/amd64-stap-wrong-subexp.exp @@ -20,8 +20,7 @@ if { ![istarget "x86_64-*-*"] || ![is_lp64_target] } { standard_testfile amd64-stap-wrong-subexp.S -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { - untested amd64-stap-wrong-subexp.exp +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp b/gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp index 52ea9f688e2..6ecbd18507e 100644 --- a/gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp +++ b/gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp @@ -25,7 +25,7 @@ if [info exists COMPILE] { return } -if { [prepare_for_testing ${testfile}.exp ${testfile} "${srcfile} ${srcfile2}" $opts] } { +if { [prepare_for_testing "failed to prepare" ${testfile} "${srcfile} ${srcfile2}" $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-tailcall-noret.exp b/gdb/testsuite/gdb.arch/amd64-tailcall-noret.exp index de79bededd4..ebf99cf68a0 100644 --- a/gdb/testsuite/gdb.arch/amd64-tailcall-noret.exp +++ b/gdb/testsuite/gdb.arch/amd64-tailcall-noret.exp @@ -25,7 +25,7 @@ if [info exists COMPILE] { return } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp b/gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp index 2642cddbc51..356d35f6d0e 100644 --- a/gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp +++ b/gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp @@ -25,7 +25,7 @@ if [info exists COMPILE] { return } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-tailcall-self.exp b/gdb/testsuite/gdb.arch/amd64-tailcall-self.exp index 72ecb667d32..9818517f04e 100644 --- a/gdb/testsuite/gdb.arch/amd64-tailcall-self.exp +++ b/gdb/testsuite/gdb.arch/amd64-tailcall-self.exp @@ -20,7 +20,7 @@ if { ![istarget x86_64-*-* ] || ![is_lp64_target] } { return } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {}] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/amd64-word.exp b/gdb/testsuite/gdb.arch/amd64-word.exp index 0ce0c121aee..5cad41f4a29 100644 --- a/gdb/testsuite/gdb.arch/amd64-word.exp +++ b/gdb/testsuite/gdb.arch/amd64-word.exp @@ -31,7 +31,7 @@ if [get_compiler_info] { } if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug]] != "" } { - untested ${testfile} + untested "failed to compile" return } diff --git a/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp b/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp index 4bf77c60298..f2dd7f621b4 100644 --- a/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp +++ b/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp @@ -25,7 +25,7 @@ standard_testfile # on ARM, causing the PC to acquire a wrong value. That's why we use # the "-Wl,-Ttext-segment" option compile the binary. -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ [list debug ldflags=-Wl,-Ttext-segment=0xb0000000]] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/arm-disp-step.exp b/gdb/testsuite/gdb.arch/arm-disp-step.exp index c038551d144..cb69c7df89c 100644 --- a/gdb/testsuite/gdb.arch/arm-disp-step.exp +++ b/gdb/testsuite/gdb.arch/arm-disp-step.exp @@ -26,7 +26,7 @@ standard_testfile .S set additional_flags "-Wa,-g" -if { [prepare_for_testing $testfile.exp $testfile $srcfile [list debug $additional_flags]] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile [list debug $additional_flags]] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/arm-neon.exp b/gdb/testsuite/gdb.arch/arm-neon.exp index e4612f9159d..4814fcffd65 100644 --- a/gdb/testsuite/gdb.arch/arm-neon.exp +++ b/gdb/testsuite/gdb.arch/arm-neon.exp @@ -26,7 +26,7 @@ if { [gdb_skip_float_test] } { } standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug quiet}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug quiet}] } { unsupported "ARM NEON is not supported" return -1 } diff --git a/gdb/testsuite/gdb.arch/arm-single-step-kernel-helper.exp b/gdb/testsuite/gdb.arch/arm-single-step-kernel-helper.exp index 1e7e5d4306b..deb31469e2e 100644 --- a/gdb/testsuite/gdb.arch/arm-single-step-kernel-helper.exp +++ b/gdb/testsuite/gdb.arch/arm-single-step-kernel-helper.exp @@ -20,7 +20,7 @@ if { ![is_aarch32_target] } { standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ [list debug]] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/avr-flash-qualifier.exp b/gdb/testsuite/gdb.arch/avr-flash-qualifier.exp index 89e3541f486..2725a14ad88 100644 --- a/gdb/testsuite/gdb.arch/avr-flash-qualifier.exp +++ b/gdb/testsuite/gdb.arch/avr-flash-qualifier.exp @@ -30,7 +30,7 @@ if {[test_compiler_info {gcc-[0-4]-[0-6]}]} { } standard_testfile -if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}]} { +if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} { return -1 } diff --git a/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp b/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp index d99567657cc..234191f60d6 100644 --- a/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp +++ b/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp @@ -24,9 +24,8 @@ if { ![support_displaced_stepping] } { # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] -if [prepare_for_testing $expfile $executable $srcfile \ +if [prepare_for_testing "failed to prepare" $executable $srcfile \ [list debug $additional_flags]] { - untested "failed to prepare for tests" return -1 } diff --git a/gdb/testsuite/gdb.arch/e500-abi.exp b/gdb/testsuite/gdb.arch/e500-abi.exp index c3b4bc98802..1992d5e297e 100644 --- a/gdb/testsuite/gdb.arch/e500-abi.exp +++ b/gdb/testsuite/gdb.arch/e500-abi.exp @@ -33,7 +33,7 @@ set binfile ${objdir}/${subdir}/${testfile} set src1 ${srcdir}/${subdir}/${testfile}.c if { [gdb_compile ${src1} ${binfile} executable {debug nowarnings}] != "" } { - untested e500-abi.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.arch/e500-regs.exp b/gdb/testsuite/gdb.arch/e500-regs.exp index 6d535aa600e..30d3256eeda 100644 --- a/gdb/testsuite/gdb.arch/e500-regs.exp +++ b/gdb/testsuite/gdb.arch/e500-regs.exp @@ -32,7 +32,7 @@ set binfile ${objdir}/${subdir}/${testfile} set src1 ${srcdir}/${subdir}/${testfile}.c if { [gdb_compile ${src1} ${binfile} executable {debug nowarnings}] != "" } { - untested e500-regs.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp index 106261a6a88..3292ab59ea2 100644 --- a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp +++ b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp @@ -21,9 +21,8 @@ set expfile $testfile.exp # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] -if [prepare_for_testing $expfile $executable $srcfile \ +if [prepare_for_testing "failed to prepare" $executable $srcfile \ [list debug $additional_flags]] { - untested "failed to prepare for trace tests" return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-avx512.exp b/gdb/testsuite/gdb.arch/i386-avx512.exp index aba50cf8b31..0af31e12650 100644 --- a/gdb/testsuite/gdb.arch/i386-avx512.exp +++ b/gdb/testsuite/gdb.arch/i386-avx512.exp @@ -28,7 +28,7 @@ standard_testfile set comp_flags "-mavx512f -I${srcdir}/../nat" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ [list debug nowarnings additional_flags=${comp_flags}]] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp index cb2fedbe8a0..65c8029bfb2 100644 --- a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp +++ b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp @@ -31,7 +31,7 @@ set additional_flags [gdb_target_symbol_prefix_flags] # Don't use "debug", so that we don't have line information for the assembly # fragments. if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list $additional_flags]] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-byte.exp b/gdb/testsuite/gdb.arch/i386-byte.exp index cd4251b412d..fd01b77a04d 100644 --- a/gdb/testsuite/gdb.arch/i386-byte.exp +++ b/gdb/testsuite/gdb.arch/i386-byte.exp @@ -31,7 +31,7 @@ if [get_compiler_info] { } if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug]] != "" } { - untested ${testfile} + untested "failed to compile" return } diff --git a/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp b/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp index 5841abeca42..11c0803cdcd 100644 --- a/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp +++ b/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp @@ -23,7 +23,7 @@ if { ![is_x86_like_target] } { set testfile "i386-cfi-notcurrent" set srcfile ${testfile}.S -if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {nodebug}] { +if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {nodebug}] { return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-disp-step.exp b/gdb/testsuite/gdb.arch/i386-disp-step.exp index 7be606a5302..7478dc9a0bb 100644 --- a/gdb/testsuite/gdb.arch/i386-disp-step.exp +++ b/gdb/testsuite/gdb.arch/i386-disp-step.exp @@ -28,7 +28,7 @@ standard_testfile .S set additional_flags "-Wa,-g" if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } { - untested i386-disp-step.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp index bdab7bf320e..5d960a7d2e1 100644 --- a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp +++ b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp @@ -25,8 +25,7 @@ if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } then { standard_testfile -if [prepare_for_testing ${testfile}.exp ${binfile} ${srcfile} {debug $additional_flags}] { - untested "failed to compile" +if [prepare_for_testing "failed to prepare" ${binfile} ${srcfile} {debug $additional_flags}] { return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-float.exp b/gdb/testsuite/gdb.arch/i386-float.exp index 2a869e8a089..8284ff11568 100644 --- a/gdb/testsuite/gdb.arch/i386-float.exp +++ b/gdb/testsuite/gdb.arch/i386-float.exp @@ -28,7 +28,7 @@ standard_testfile .S # some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags_asm] -if { [prepare_for_testing break.exp $testfile $srcfile [list debug $additional_flags]] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile [list debug $additional_flags]] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp index 83e18848b7a..bca4c5efa1c 100644 --- a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp +++ b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp @@ -37,7 +37,7 @@ set binfile [standard_output_file ${testfile}] set additional_flags [gdb_target_symbol_prefix_flags] if { [gdb_compile "${srcdir}/${subdir}/${srcfilec} ${srcdir}/${subdir}/${srcfileasm}" "${binfile}" executable [list debug $additional_flags]] != "" } { - untested i386-gnu-cfi.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-mpx-map.exp b/gdb/testsuite/gdb.arch/i386-mpx-map.exp index 02214bdfac4..078adae1763 100644 --- a/gdb/testsuite/gdb.arch/i386-mpx-map.exp +++ b/gdb/testsuite/gdb.arch/i386-mpx-map.exp @@ -25,7 +25,7 @@ standard_testfile set comp_flags "-mmpx -fcheck-pointer-bounds -I${srcdir}/../nat/" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ [list debug nowarnings additional_flags=${comp_flags}]] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-mpx-sigsegv.exp b/gdb/testsuite/gdb.arch/i386-mpx-sigsegv.exp index 164b2d01ea7..fb17162ea0b 100644 --- a/gdb/testsuite/gdb.arch/i386-mpx-sigsegv.exp +++ b/gdb/testsuite/gdb.arch/i386-mpx-sigsegv.exp @@ -25,7 +25,7 @@ standard_testfile set comp_flags "-mmpx -fcheck-pointer-bounds -I${srcdir}/../nat/" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ [list debug nowarnings additional_flags=${comp_flags}]] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp b/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp index 7729f6bf380..fd56380e96b 100644 --- a/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp +++ b/gdb/testsuite/gdb.arch/i386-mpx-simple_segv.exp @@ -31,7 +31,7 @@ standard_testfile set comp_flags "-mmpx -fcheck-pointer-bounds -I${srcdir}/../nat/" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ [list debug nowarnings additional_flags=${comp_flags}]] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-mpx.exp b/gdb/testsuite/gdb.arch/i386-mpx.exp index dc1ad566159..128f6b883ba 100644 --- a/gdb/testsuite/gdb.arch/i386-mpx.exp +++ b/gdb/testsuite/gdb.arch/i386-mpx.exp @@ -29,7 +29,7 @@ if { ![istarget i?86-*-*] && ![istarget x86_64-*-* ] } { set comp_flags "-mmpx -fcheck-pointer-bounds -I${srcdir}/../nat/" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ [list debug nowarnings additional_flags=${comp_flags}]] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-permbkpt.exp b/gdb/testsuite/gdb.arch/i386-permbkpt.exp index c2dc6204864..b8a8918050c 100644 --- a/gdb/testsuite/gdb.arch/i386-permbkpt.exp +++ b/gdb/testsuite/gdb.arch/i386-permbkpt.exp @@ -29,7 +29,7 @@ standard_testfile .S set additional_flags [gdb_target_symbol_prefix_flags_asm] if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } { - untested i386-permbkpt.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp index 399c628bc46..197876bb5af 100644 --- a/gdb/testsuite/gdb.arch/i386-prologue.exp +++ b/gdb/testsuite/gdb.arch/i386-prologue.exp @@ -36,7 +36,7 @@ set additional_flags [gdb_target_symbol_prefix_flags] # Don't use "debug", so that we don't have line information for the assembly # fragments. if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list $additional_flags]] != "" } { - untested i386-prologue.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-signal.exp b/gdb/testsuite/gdb.arch/i386-signal.exp index 51a3a25f4e5..780ad7e1599 100644 --- a/gdb/testsuite/gdb.arch/i386-signal.exp +++ b/gdb/testsuite/gdb.arch/i386-signal.exp @@ -24,7 +24,7 @@ standard_testfile if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ executable { debug }] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-size-overlap.exp b/gdb/testsuite/gdb.arch/i386-size-overlap.exp index 448a10ff9dc..8342ba36571 100644 --- a/gdb/testsuite/gdb.arch/i386-size-overlap.exp +++ b/gdb/testsuite/gdb.arch/i386-size-overlap.exp @@ -29,7 +29,7 @@ set additional_flags [gdb_target_symbol_prefix_flags] if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ executable [list debug $additional_flags]] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-unwind.exp b/gdb/testsuite/gdb.arch/i386-unwind.exp index 6a20ce6bf2c..d1b78b751f3 100644 --- a/gdb/testsuite/gdb.arch/i386-unwind.exp +++ b/gdb/testsuite/gdb.arch/i386-unwind.exp @@ -32,7 +32,7 @@ standard_testfile set additional_flags [gdb_target_symbol_prefix_flags] if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } { - untested i386-unwind.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.arch/i386-word.exp b/gdb/testsuite/gdb.arch/i386-word.exp index 491849816df..1f5723bb960 100644 --- a/gdb/testsuite/gdb.arch/i386-word.exp +++ b/gdb/testsuite/gdb.arch/i386-word.exp @@ -31,7 +31,7 @@ if [get_compiler_info] { } if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug]] != "" } { - untested ${testfile} + untested "failed to compile" return } diff --git a/gdb/testsuite/gdb.arch/mips-fcr.exp b/gdb/testsuite/gdb.arch/mips-fcr.exp index 0e779a53e3b..024cda639fe 100644 --- a/gdb/testsuite/gdb.arch/mips-fcr.exp +++ b/gdb/testsuite/gdb.arch/mips-fcr.exp @@ -24,7 +24,7 @@ if { ![istarget "mips*-*-*"] } then { standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return } diff --git a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp index 758c2949996..db2250f8770 100644 --- a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp +++ b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp @@ -28,7 +28,7 @@ if ![istarget "powerpc64*-*"] then { standard_testfile if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {quiet debug}] != "" } { - untested powerpc-d128-regs.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.arch/powerpc-stackless.exp b/gdb/testsuite/gdb.arch/powerpc-stackless.exp index 06141db89dd..0e53551f97b 100644 --- a/gdb/testsuite/gdb.arch/powerpc-stackless.exp +++ b/gdb/testsuite/gdb.arch/powerpc-stackless.exp @@ -22,8 +22,7 @@ if {![istarget "powerpc*-*-*"]} then { standard_testfile .S -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { - untested powerpc-stackless.exp +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp b/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp index 7cfcc69aa09..c815d752b3f 100644 --- a/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp +++ b/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp @@ -28,7 +28,7 @@ if {![istarget "powerpc*"] || ![is_lp64_target]} { standard_testfile .S -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug quiet}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/s390-stackless.exp b/gdb/testsuite/gdb.arch/s390-stackless.exp index b4aedb5568c..e66477cdcb8 100644 --- a/gdb/testsuite/gdb.arch/s390-stackless.exp +++ b/gdb/testsuite/gdb.arch/s390-stackless.exp @@ -20,7 +20,7 @@ if {![istarget "s390*-*-*"]} then { standard_testfile .S -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/s390-tdbregs.exp b/gdb/testsuite/gdb.arch/s390-tdbregs.exp index ba2dd724002..f0cb825f1e2 100644 --- a/gdb/testsuite/gdb.arch/s390-tdbregs.exp +++ b/gdb/testsuite/gdb.arch/s390-tdbregs.exp @@ -26,7 +26,7 @@ if { ![istarget s390-*-*] && ![istarget s390x-*-* ] } { standard_testfile .c -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/s390-vregs.exp b/gdb/testsuite/gdb.arch/s390-vregs.exp index c1e85b4c914..55a3659d23a 100644 --- a/gdb/testsuite/gdb.arch/s390-vregs.exp +++ b/gdb/testsuite/gdb.arch/s390-vregs.exp @@ -29,7 +29,7 @@ if [isnative] { remote_exec build "mkdir $coredir" } -if { [prepare_for_testing ${testfile}.exp $testfile $srcfile \ +if { [prepare_for_testing "failed to prepare" $testfile $srcfile \ [list "additional_flags=-mzarch"]] } { return -1 } diff --git a/gdb/testsuite/gdb.arch/sparc-sysstep.exp b/gdb/testsuite/gdb.arch/sparc-sysstep.exp index 9fc44436c97..e0cf31f1ed6 100644 --- a/gdb/testsuite/gdb.arch/sparc-sysstep.exp +++ b/gdb/testsuite/gdb.arch/sparc-sysstep.exp @@ -30,7 +30,7 @@ set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} set opts {} -if {[prepare_for_testing ${testfile}.exp ${binfile} $srcfile {additional_flags=-g}]} { +if {[prepare_for_testing "failed to prepare" ${binfile} $srcfile {additional_flags=-g}]} { return -1 } diff --git a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp index 0e80a903467..17b936e9554 100644 --- a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp +++ b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp @@ -24,8 +24,7 @@ set testfile "thumb-bx-pc" set srcfile ${testfile}.S set opts {} -if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] { - untested "failed to compile" +if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] { return -1 } diff --git a/gdb/testsuite/gdb.arch/thumb-singlestep.exp b/gdb/testsuite/gdb.arch/thumb-singlestep.exp index 31e46e829c3..1ef6684b2e2 100644 --- a/gdb/testsuite/gdb.arch/thumb-singlestep.exp +++ b/gdb/testsuite/gdb.arch/thumb-singlestep.exp @@ -24,13 +24,12 @@ set testfile "thumb-singlestep" set srcfile ${testfile}.S set additional_flags "additional_flags=-mthumb" -if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} [list debug $additional_flags]] { - untested ${testfile}.exp +if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} [list debug $additional_flags]] { return -1 } if ![runto_main] then { - untested ${testfile}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.arch/thumb2-it.exp b/gdb/testsuite/gdb.arch/thumb2-it.exp index 5fb5dc32dbb..b4f94af0e45 100644 --- a/gdb/testsuite/gdb.arch/thumb2-it.exp +++ b/gdb/testsuite/gdb.arch/thumb2-it.exp @@ -23,7 +23,7 @@ if {![istarget arm*-*eabi*]} then { standard_testfile .S if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } { - untested thumb2-it.exp + untested "failed to compile" return -1 } @@ -33,7 +33,7 @@ gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} if ![runto_main] then { - untested thumb2-it.exp + untested "could not run to main" return -1 } @@ -41,7 +41,7 @@ if ![runto_main] then { gdb_test_multiple "list" "list main" { -re ".*@ No Thumb-2.*$gdb_prompt $" { pass "list main" - untested thumb2-it.exp + untested "skipping tests due to lack of Thumb-2" return -1 } -re ".*@ Thumb-2 OK.*$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.arch/vsx-regs.exp b/gdb/testsuite/gdb.arch/vsx-regs.exp index 6c708e18059..884f6ead2db 100644 --- a/gdb/testsuite/gdb.arch/vsx-regs.exp +++ b/gdb/testsuite/gdb.arch/vsx-regs.exp @@ -42,7 +42,7 @@ if [test_compiler_info gcc*] { } if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $compile_flags] != "" } { - untested vsx-regs.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp index 6d9aef81bbc..1baca2aa64b 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -166,7 +166,7 @@ switch -glob -- [istarget] { } if { "${asm-arch}" == "" } { - untested asm-source.exp + untested "skipping tests due to no asm architecture" return -1 } @@ -196,7 +196,7 @@ set dest [target_info name] if [board_info $dest exists multilib_flags] { set multilib_flags [board_info $dest multilib_flags] if { "${multilib_flags}" != "" } { - untested asm-source.exp + untested "failed to compile" return -1 return } @@ -249,11 +249,11 @@ set asm1obj [standard_output_file asmrc1.o] set asm2obj [standard_output_file asmrc2.o] if {[target_assemble ${srcdir}/${subdir}/${srcfile} $asm1obj "${asm-flags} ${debug-flags}"] != ""} then { - untested asm-source.exp + untested "failed to assemble" return -1 } if {[target_assemble ${srcdir}/${subdir}/${srcfile2} $asm2obj "${asm-flags} ${debug-flags}"] != ""} then { - untested asm-source.exp + untested "failed to assemble" return -1 } @@ -264,7 +264,7 @@ if {[target_assemble ${srcdir}/${subdir}/${srcfile2} $asm2obj "${asm-flags} ${de # also avoids a lot of problems on many systems, most notably on # *-*-*bsd* and *-*-solaris2*. if {[target_link [list $asm1obj $asm2obj] "${binfile}" ${link-flags}] != "" } then { - untested asm-source.exp + untested "failed to link" return -1 } diff --git a/gdb/testsuite/gdb.base/a2-run.exp b/gdb/testsuite/gdb.base/a2-run.exp index 49add80cba6..6ef0900c8f2 100644 --- a/gdb/testsuite/gdb.base/a2-run.exp +++ b/gdb/testsuite/gdb.base/a2-run.exp @@ -26,7 +26,7 @@ if [gdb_skip_stdio_test "a2run.exp"] { standard_testfile run.c -if { [prepare_for_testing ${testfile}.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/advance.exp b/gdb/testsuite/gdb.base/advance.exp index ce8a98c2970..1ed48fabaf5 100644 --- a/gdb/testsuite/gdb.base/advance.exp +++ b/gdb/testsuite/gdb.base/advance.exp @@ -17,8 +17,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/all-bin.exp b/gdb/testsuite/gdb.base/all-bin.exp index 18fc3c31be0..acd058e19ac 100644 --- a/gdb/testsuite/gdb.base/all-bin.exp +++ b/gdb/testsuite/gdb.base/all-bin.exp @@ -33,8 +33,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/anon.exp b/gdb/testsuite/gdb.base/anon.exp index bf5054d3280..e6f3927e675 100644 --- a/gdb/testsuite/gdb.base/anon.exp +++ b/gdb/testsuite/gdb.base/anon.exp @@ -16,7 +16,7 @@ standard_testfile .c -if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug}] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/args.exp b/gdb/testsuite/gdb.base/args.exp index f0869df6d3d..6a99dc3002a 100644 --- a/gdb/testsuite/gdb.base/args.exp +++ b/gdb/testsuite/gdb.base/args.exp @@ -27,7 +27,7 @@ standard_testfile if {[build_executable $testfile.exp $testfile \ $srcfile {debug nowarnings}] == -1} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/arithmet.exp b/gdb/testsuite/gdb.base/arithmet.exp index 1915ef03f35..43adacda6ef 100644 --- a/gdb/testsuite/gdb.base/arithmet.exp +++ b/gdb/testsuite/gdb.base/arithmet.exp @@ -28,8 +28,7 @@ standard_testfile int-type.c -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/async-shell.exp b/gdb/testsuite/gdb.base/async-shell.exp index 6b887c3cd44..9c9f8b13c0d 100644 --- a/gdb/testsuite/gdb.base/async-shell.exp +++ b/gdb/testsuite/gdb.base/async-shell.exp @@ -25,7 +25,7 @@ if [target_info exists use_gdb_stub] { return 0 } -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/async.exp b/gdb/testsuite/gdb.base/async.exp index 3adb1564cfa..0451373969c 100644 --- a/gdb/testsuite/gdb.base/async.exp +++ b/gdb/testsuite/gdb.base/async.exp @@ -20,8 +20,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/attach-pie-noexec.exp b/gdb/testsuite/gdb.base/attach-pie-noexec.exp index 1a51049dfd1..4ea302e0cbe 100644 --- a/gdb/testsuite/gdb.base/attach-pie-noexec.exp +++ b/gdb/testsuite/gdb.base/attach-pie-noexec.exp @@ -20,7 +20,7 @@ if {![can_spawn_for_attach]} { standard_testfile .c set executable ${testfile} -if { [prepare_for_testing ${testfile}.exp $executable "" [list debug "additional_flags=-fPIE -pie"]] } { +if { [prepare_for_testing "failed to prepare" $executable "" [list debug "additional_flags=-fPIE -pie"]] } { return -1 } @@ -42,13 +42,13 @@ gdb_test_multiple "info shared" $test { pass $test } -re "No shared libraries loaded at this time\\.\r\n$gdb_prompt $" { - untested ${testfile}.exp + untested "no shared libraries loaded" } } gdb_exit if {$arch == ""} { - untested ${testfile}.exp + untested "no architecture set" return 0 } diff --git a/gdb/testsuite/gdb.base/attach-twice.exp b/gdb/testsuite/gdb.base/attach-twice.exp index dc10c737390..64f2e937b9f 100644 --- a/gdb/testsuite/gdb.base/attach-twice.exp +++ b/gdb/testsuite/gdb.base/attach-twice.exp @@ -20,7 +20,7 @@ if {![can_spawn_for_attach]} { standard_testfile set executable ${testfile} -if { [prepare_for_testing ${testfile}.exp $executable] } { +if { [prepare_for_testing "failed to prepare" $executable] } { return -1 } diff --git a/gdb/testsuite/gdb.base/auto-load.exp b/gdb/testsuite/gdb.base/auto-load.exp index 1bd9f0bdfb6..b0a070cd24a 100644 --- a/gdb/testsuite/gdb.base/auto-load.exp +++ b/gdb/testsuite/gdb.base/auto-load.exp @@ -26,7 +26,7 @@ set targetscript "${targetscriptdir}/${testfile}-gdb.gdb" remote_exec host "rm -rf ${targetdir}" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/bang.exp b/gdb/testsuite/gdb.base/bang.exp index d9949cf688c..2b709734d6a 100644 --- a/gdb/testsuite/gdb.base/bang.exp +++ b/gdb/testsuite/gdb.base/bang.exp @@ -18,9 +18,8 @@ standard_testfile args.c -if {[prepare_for_testing $testfile.exp ${testfile}! $srcfile \ +if {[prepare_for_testing "failed to prepare" ${testfile}! $srcfile \ {debug nowarnings}]} { - untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/bitfields.exp b/gdb/testsuite/gdb.base/bitfields.exp index 700007045d1..af300f926de 100644 --- a/gdb/testsuite/gdb.base/bitfields.exp +++ b/gdb/testsuite/gdb.base/bitfields.exp @@ -18,8 +18,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/break-always.exp b/gdb/testsuite/gdb.base/break-always.exp index a1a416525ee..068e3312035 100644 --- a/gdb/testsuite/gdb.base/break-always.exp +++ b/gdb/testsuite/gdb.base/break-always.exp @@ -17,7 +17,7 @@ # Also verifies that breakpoint enabling/disabling works properly # with duplicated breakpoints. -if { [prepare_for_testing break-always.exp break-always break-always.c] } { +if { [prepare_for_testing "failed to prepare" break-always break-always.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/break-caller-line.exp b/gdb/testsuite/gdb.base/break-caller-line.exp index f4a6d73a966..5254d1ab2ac 100644 --- a/gdb/testsuite/gdb.base/break-caller-line.exp +++ b/gdb/testsuite/gdb.base/break-caller-line.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/break-entry.exp b/gdb/testsuite/gdb.base/break-entry.exp index 6b18611d36a..91fb73b9738 100644 --- a/gdb/testsuite/gdb.base/break-entry.exp +++ b/gdb/testsuite/gdb.base/break-entry.exp @@ -28,11 +28,11 @@ standard_testfile start.c if [target_info exists use_gdb_stub] { - untested ${testfile}.exp + untested "skipping tests due to use_gdb_stub" return } -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile {additional_flags=-static}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile {additional_flags=-static}] } { return -1 } @@ -45,7 +45,7 @@ gdb_test_multiple $test $test { } } if {$entry == ""} { - untested ${testfile}.exp + untested "no entrypoint" return } diff --git a/gdb/testsuite/gdb.base/break-inline.exp b/gdb/testsuite/gdb.base/break-inline.exp index e6162c508c5..3834e68540b 100644 --- a/gdb/testsuite/gdb.base/break-inline.exp +++ b/gdb/testsuite/gdb.base/break-inline.exp @@ -14,7 +14,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -if { [prepare_for_testing break-inline.exp "break-inline" {} {debug nowarnings optimize=-O2}] } { +if { [prepare_for_testing "failed to prepare" "break-inline" {} {debug nowarnings optimize=-O2}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp b/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp index 65dab5ac139..06013ceb485 100644 --- a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp +++ b/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp @@ -35,7 +35,7 @@ set additional_flags {-ffunction-sections -Wl,--gc-sections} if {[build_executable_from_specs $testfile.exp $testfile \ {c++ additional_flags=-Wl,--gc-sections} \ $srcfile {debug c++ additional_flags=-ffunction-sections}]} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/break-probes.exp b/gdb/testsuite/gdb.base/break-probes.exp index 68130435dcd..7196ae7347e 100644 --- a/gdb/testsuite/gdb.base/break-probes.exp +++ b/gdb/testsuite/gdb.base/break-probes.exp @@ -32,7 +32,7 @@ if { [gdb_compile_shlib $srcfile_lib $binfile_lib \ return -1 } -if { [prepare_for_testing $testfile.exp $testfile $srcfile \ +if { [prepare_for_testing "failed to prepare" $testfile $srcfile \ [list additional_flags=-DSHLIB_NAME=\"$binfile_lib\" libs=-ldl]] } { return -1 } diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp index ef0a5d2faca..95d5baeeb0c 100644 --- a/gdb/testsuite/gdb.base/break.exp +++ b/gdb/testsuite/gdb.base/break.exp @@ -15,7 +15,7 @@ # This file was written by Rob Savoye. (rob@cygnus.com) -if { [prepare_for_testing break.exp "break" {break.c break1.c} {debug nowarnings}] } { +if { [prepare_for_testing "failed to prepare" "break" {break.c break1.c} {debug nowarnings}] } { return -1 } set srcfile break.c @@ -747,7 +747,7 @@ test_next_with_recursion # build a new file with optimization enabled so that we can try breakpoints # on targets with optimized prologues -if { [prepare_for_testing break.exp "breako2" {break.c break1.c} {debug nowarnings optimize=-O2}] } { +if { [prepare_for_testing "failed to prepare" "breako2" {break.c break1.c} {debug nowarnings optimize=-O2}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/breakpoint-shadow.exp b/gdb/testsuite/gdb.base/breakpoint-shadow.exp index edf4b3b6dfe..ac86157a142 100644 --- a/gdb/testsuite/gdb.base/breakpoint-shadow.exp +++ b/gdb/testsuite/gdb.base/breakpoint-shadow.exp @@ -15,8 +15,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp index 0e10453dbb6..de53daed9a4 100644 --- a/gdb/testsuite/gdb.base/call-ar-st.exp +++ b/gdb/testsuite/gdb.base/call-ar-st.exp @@ -35,8 +35,7 @@ if [get_compiler_info] { set skip_float_test [gdb_skip_float_test] -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp index a5405df32ff..32cfa815c60 100644 --- a/gdb/testsuite/gdb.base/call-sc.exp +++ b/gdb/testsuite/gdb.base/call-sc.exp @@ -59,7 +59,7 @@ proc start_scalars_test { type } { # built the second test case since we can't use prototypes warning "Prototypes not supported, rebuilding with -DNO_PROTOTYPES" if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "${flags} additional_flags=-DNO_PROTOTYPES"] != "" } { - untested call-sc.exp + untested "failed to compile" return -1 } } diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp index 5dd580cbdc1..a962a5642c8 100644 --- a/gdb/testsuite/gdb.base/call-signal-resume.exp +++ b/gdb/testsuite/gdb.base/call-signal-resume.exp @@ -29,7 +29,7 @@ if [target_info exists gdb,nosignals] { standard_testfile call-signals.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested call-signal-resume.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp index ac1bf6d03d2..b9ee3180124 100644 --- a/gdb/testsuite/gdb.base/call-strs.exp +++ b/gdb/testsuite/gdb.base/call-strs.exp @@ -33,8 +33,7 @@ if [target_info exists gdb,cannot_call_functions] { } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp index 47c0b2573d0..2878cdfce6e 100644 --- a/gdb/testsuite/gdb.base/callfuncs.exp +++ b/gdb/testsuite/gdb.base/callfuncs.exp @@ -499,10 +499,10 @@ proc perform_all_tests {} { # Perform all tests with and without function prototypes. -if { ![prepare_for_testing ${testfile}.exp $testfile $srcfile "$compile_flags additional_flags=-DPROTOTYPES"] } { +if { ![prepare_for_testing "failed to prepare" $testfile $srcfile "$compile_flags additional_flags=-DPROTOTYPES"] } { perform_all_tests } -if { ![prepare_for_testing ${testfile}.exp $testfile $srcfile "$compile_flags additional_flags=-DNO_PROTOTYPES"] } { +if { ![prepare_for_testing "failed to prepare" $testfile $srcfile "$compile_flags additional_flags=-DNO_PROTOTYPES"] } { with_test_prefix "noproto" perform_all_tests } diff --git a/gdb/testsuite/gdb.base/catch-fork-static.exp b/gdb/testsuite/gdb.base/catch-fork-static.exp index 6d39a14b78f..1ca596cf4c6 100644 --- a/gdb/testsuite/gdb.base/catch-fork-static.exp +++ b/gdb/testsuite/gdb.base/catch-fork-static.exp @@ -34,7 +34,7 @@ if { ![istarget "*-*-linux*"] && ![istarget "*-*-openbsd*"] } then { # Reusing foll-fork.c since it's a simple forking program. standard_testfile foll-fork.c -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile \ +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile \ {additional_flags=-static}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp index 63c3292ae24..2414e431f0f 100644 --- a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp +++ b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp @@ -31,7 +31,7 @@ if [target_info exists gdb,cannot_call_functions] { set dp_location [gdb_get_line_number "set dprintf here"] set bp_location [gdb_get_line_number "set breakpoint here"] -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/catch-load.exp b/gdb/testsuite/gdb.base/catch-load.exp index 5908e3257b0..d37bc7572fb 100644 --- a/gdb/testsuite/gdb.base/catch-load.exp +++ b/gdb/testsuite/gdb.base/catch-load.exp @@ -14,19 +14,19 @@ # if {[skip_shlib_tests]} { - untested catch-load.exp + untested "skipping shared library tests" return -1 } if {[get_compiler_info]} { warning "Could not get compiler info" - untested catch-load.exp + untested "no compiler info" return -1 } standard_testfile .c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug shlib_load}] != "" } { - untested catch-load.exp + untested "failed to compile" return -1 } @@ -35,7 +35,7 @@ set srcfile2 ${testfile2}.c set binfile2 [standard_output_file ${testfile2}.so] set binfile2_dlopen [shlib_target_file ${testfile2}.so] if { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" ${binfile2} {debug}] != "" } { - untested catch-load.exp + untested "failed to compile shared library" return -1 } diff --git a/gdb/testsuite/gdb.base/catch-signal-fork.exp b/gdb/testsuite/gdb.base/catch-signal-fork.exp index d49e0cfd329..f6f5314d228 100644 --- a/gdb/testsuite/gdb.base/catch-signal-fork.exp +++ b/gdb/testsuite/gdb.base/catch-signal-fork.exp @@ -20,7 +20,7 @@ if [target_info exists gdb,nosignals] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/catch-signal.exp b/gdb/testsuite/gdb.base/catch-signal.exp index 3e2d1c5cde0..d11e5cb9627 100644 --- a/gdb/testsuite/gdb.base/catch-signal.exp +++ b/gdb/testsuite/gdb.base/catch-signal.exp @@ -20,7 +20,7 @@ if [target_info exists gdb,nosignals] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp index 4bec7a634c3..d828c9cf5d9 100644 --- a/gdb/testsuite/gdb.base/catch-syscall.exp +++ b/gdb/testsuite/gdb.base/catch-syscall.exp @@ -21,8 +21,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp $testfile ${testfile}.c] } { - untested catch-syscall.exp +if { [prepare_for_testing "failed to prepare" $testfile ${testfile}.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp index 7662937181c..8205a26757b 100644 --- a/gdb/testsuite/gdb.base/charset.exp +++ b/gdb/testsuite/gdb.base/charset.exp @@ -23,7 +23,7 @@ standard_testfile .c charset-malloc.c -if { [prepare_for_testing ${testfile}.exp ${testfile} [list $srcfile $srcfile2]] } { +if { [prepare_for_testing "failed to prepare" ${testfile} [list $srcfile $srcfile2]] } { return -1 } diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp index 73ea08a92c8..872a0bb078a 100644 --- a/gdb/testsuite/gdb.base/checkpoint.exp +++ b/gdb/testsuite/gdb.base/checkpoint.exp @@ -36,9 +36,8 @@ if {[is_remote host]} { set copy1_txt [standard_output_file copy1.txt] } -if {[prepare_for_testing ${testfile}.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ [list debug "additional_flags=-DPI_TXT=\"$pi_txt\" -DCOPY1_TXT=\"$copy1_txt\""]]} { - untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/chng-syms.exp b/gdb/testsuite/gdb.base/chng-syms.exp index f161ca375a0..bed98769aa1 100644 --- a/gdb/testsuite/gdb.base/chng-syms.exp +++ b/gdb/testsuite/gdb.base/chng-syms.exp @@ -21,7 +21,7 @@ standard_testfile .c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DVARIABLE=var1}] != "" } { - untested chng-syms.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/code-expr.exp b/gdb/testsuite/gdb.base/code-expr.exp index 78b6c537f98..5f0ccae1829 100644 --- a/gdb/testsuite/gdb.base/code-expr.exp +++ b/gdb/testsuite/gdb.base/code-expr.exp @@ -25,7 +25,7 @@ standard_testfile cvexpr.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested code-expr.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/code_elim.exp b/gdb/testsuite/gdb.base/code_elim.exp index 9ace1dfb3fc..7c7254517dd 100644 --- a/gdb/testsuite/gdb.base/code_elim.exp +++ b/gdb/testsuite/gdb.base/code_elim.exp @@ -32,12 +32,12 @@ remote_exec build "rm -f ${binfile1}" remote_exec build "rm -f ${binfile2}" if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile1}" executable $opts] != "" } { - untested code_elim.exp + untested "failed to compile" return -1 } if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable $opts] != "" } { - untested code_elim.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index 85b0bf7af42..3fbbdef3091 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -19,7 +19,7 @@ standard_testfile -if { [prepare_for_testing commands.exp commands run.c {debug additional_flags=-DFAKEARGV}] } { +if { [prepare_for_testing "failed to prepare" commands run.c {debug additional_flags=-DFAKEARGV}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp index b72ccf56d99..3f129ec283e 100644 --- a/gdb/testsuite/gdb.base/completion.exp +++ b/gdb/testsuite/gdb.base/completion.exp @@ -56,9 +56,8 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug nowarnings}]} { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/complex.exp b/gdb/testsuite/gdb.base/complex.exp index 5767af60501..625246241a0 100644 --- a/gdb/testsuite/gdb.base/complex.exp +++ b/gdb/testsuite/gdb.base/complex.exp @@ -20,8 +20,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/cond-expr.exp b/gdb/testsuite/gdb.base/cond-expr.exp index be2ef2420fc..9ba04db1ec3 100644 --- a/gdb/testsuite/gdb.base/cond-expr.exp +++ b/gdb/testsuite/gdb.base/cond-expr.exp @@ -34,7 +34,7 @@ standard_testfile int-type.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } { - untested cond-expr.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/condbreak.exp index fb41f1b9a2e..d8c0c250654 100644 --- a/gdb/testsuite/gdb.base/condbreak.exp +++ b/gdb/testsuite/gdb.base/condbreak.exp @@ -23,7 +23,7 @@ standard_testfile break.c break1.c -if {[prepare_for_testing ${testfile}.exp $testfile [list $srcfile $srcfile2] \ +if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile $srcfile2] \ {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/consecutive.exp b/gdb/testsuite/gdb.base/consecutive.exp index 505295ed08b..512a6294f26 100644 --- a/gdb/testsuite/gdb.base/consecutive.exp +++ b/gdb/testsuite/gdb.base/consecutive.exp @@ -26,8 +26,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/continue-all-already-running.exp b/gdb/testsuite/gdb.base/continue-all-already-running.exp index 9e8aff35c90..4e5e034b7ce 100644 --- a/gdb/testsuite/gdb.base/continue-all-already-running.exp +++ b/gdb/testsuite/gdb.base/continue-all-already-running.exp @@ -18,7 +18,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/coredump-filter.exp b/gdb/testsuite/gdb.base/coredump-filter.exp index 574941847df..7d7ab85229a 100644 --- a/gdb/testsuite/gdb.base/coredump-filter.exp +++ b/gdb/testsuite/gdb.base/coredump-filter.exp @@ -22,7 +22,6 @@ if ![istarget *-*-linux*] then { } if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } { - untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp index a6f445ddbdb..b5f8ac42f79 100644 --- a/gdb/testsuite/gdb.base/corefile.exp +++ b/gdb/testsuite/gdb.base/corefile.exp @@ -30,7 +30,7 @@ if [get_compiler_info] { } if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp index 3d18d6f6c6b..c649400cca0 100644 --- a/gdb/testsuite/gdb.base/dbx.exp +++ b/gdb/testsuite/gdb.base/dbx.exp @@ -18,7 +18,7 @@ standard_testfile average.c sum.c if {[build_executable $testfile.exp $testfile \ [list $srcfile $srcfile2] debug] == -1} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/debug-expr.exp b/gdb/testsuite/gdb.base/debug-expr.exp index f254d45183b..babe994aec3 100644 --- a/gdb/testsuite/gdb.base/debug-expr.exp +++ b/gdb/testsuite/gdb.base/debug-expr.exp @@ -17,7 +17,7 @@ standard_testfile .c -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/define.exp b/gdb/testsuite/gdb.base/define.exp index 81774492118..607a3897a0d 100644 --- a/gdb/testsuite/gdb.base/define.exp +++ b/gdb/testsuite/gdb.base/define.exp @@ -22,7 +22,7 @@ standard_testfile break.c break1.c -if {[prepare_for_testing ${testfile}.exp ${testfile} \ +if {[prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2] {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/del.exp b/gdb/testsuite/gdb.base/del.exp index 2d7e920b909..9efb0ca1270 100644 --- a/gdb/testsuite/gdb.base/del.exp +++ b/gdb/testsuite/gdb.base/del.exp @@ -19,8 +19,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/disabled-location.exp b/gdb/testsuite/gdb.base/disabled-location.exp index 10e51219b6e..18da4ce34c0 100644 --- a/gdb/testsuite/gdb.base/disabled-location.exp +++ b/gdb/testsuite/gdb.base/disabled-location.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/disasm-end-cu.exp b/gdb/testsuite/gdb.base/disasm-end-cu.exp index 38488f7c68f..ca88a785b90 100644 --- a/gdb/testsuite/gdb.base/disasm-end-cu.exp +++ b/gdb/testsuite/gdb.base/disasm-end-cu.exp @@ -17,7 +17,7 @@ # units displaying source lines. This checks that the disassemble routine # can handle our use of line number 0 to mark the end of sequence. -if { [prepare_for_testing disasm-end-cu.exp "disasm-end-cu" {disasm-end-cu-1.c disasm-end-cu-2.c} {debug}] } { +if { [prepare_for_testing "failed to prepare" "disasm-end-cu" {disasm-end-cu-1.c disasm-end-cu-2.c} {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/disasm-optim.exp b/gdb/testsuite/gdb.base/disasm-optim.exp index 3a60f25c5f4..75ea1707956 100644 --- a/gdb/testsuite/gdb.base/disasm-optim.exp +++ b/gdb/testsuite/gdb.base/disasm-optim.exp @@ -21,7 +21,7 @@ if { ![istarget "x86_64-*-linux*"] } { standard_testfile .S -if { [prepare_for_testing ${testfile}.exp $testfile ${testfile}.S {nodebug}] } { +if { [prepare_for_testing "failed to prepare" $testfile ${testfile}.S {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp index c02fcf5d134..d1bcb8f0584 100644 --- a/gdb/testsuite/gdb.base/display.exp +++ b/gdb/testsuite/gdb.base/display.exp @@ -18,9 +18,8 @@ # standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ {debug nowarnings}]} { - untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/duplicate-bp.exp b/gdb/testsuite/gdb.base/duplicate-bp.exp index 41423625794..6ffd5daf26c 100644 --- a/gdb/testsuite/gdb.base/duplicate-bp.exp +++ b/gdb/testsuite/gdb.base/duplicate-bp.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/ena-dis-br.exp b/gdb/testsuite/gdb.base/ena-dis-br.exp index ff3073d0d76..c8e47e6a4b1 100644 --- a/gdb/testsuite/gdb.base/ena-dis-br.exp +++ b/gdb/testsuite/gdb.base/ena-dis-br.exp @@ -21,7 +21,7 @@ standard_testfile break.c break1.c -if {[prepare_for_testing ${testfile}.exp ${testfile} \ +if {[prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2] {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp index f94ee4b6124..48eac1564a0 100644 --- a/gdb/testsuite/gdb.base/ending-run.exp +++ b/gdb/testsuite/gdb.base/ending-run.exp @@ -23,7 +23,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp $testfile] } { +if { [prepare_for_testing "failed to prepare" $testfile] } { return -1 } remote_exec build "rm -f core" diff --git a/gdb/testsuite/gdb.base/enumval.exp b/gdb/testsuite/gdb.base/enumval.exp index 78e5cefb972..698fc2cb9a3 100644 --- a/gdb/testsuite/gdb.base/enumval.exp +++ b/gdb/testsuite/gdb.base/enumval.exp @@ -17,8 +17,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/environ.exp b/gdb/testsuite/gdb.base/environ.exp index 5644339c366..0ee006fb8e6 100644 --- a/gdb/testsuite/gdb.base/environ.exp +++ b/gdb/testsuite/gdb.base/environ.exp @@ -26,9 +26,8 @@ if ![istarget "hppa*-*-hpux*"] then { standard_testfile break.c break1.c -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug nowarnings}]} { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/eu-strip-infcall.exp b/gdb/testsuite/gdb.base/eu-strip-infcall.exp index 75b05b40015..7edb77cd63b 100644 --- a/gdb/testsuite/gdb.base/eu-strip-infcall.exp +++ b/gdb/testsuite/gdb.base/eu-strip-infcall.exp @@ -22,7 +22,7 @@ if {[build_executable ${testfile}.exp $testfile] == -1} { set test "eu-strip" set status [remote_exec build "eu-strip -f ${binfile}.debug $binfile"] if {[lindex $status 0] != 0} { - untested ${testfile}.exp + untested "failed to compile" return 0 } diff --git a/gdb/testsuite/gdb.base/eval-avoid-side-effects.exp b/gdb/testsuite/gdb.base/eval-avoid-side-effects.exp index f6560b42232..39bf10467f0 100644 --- a/gdb/testsuite/gdb.base/eval-avoid-side-effects.exp +++ b/gdb/testsuite/gdb.base/eval-avoid-side-effects.exp @@ -18,7 +18,7 @@ standard_testfile int-type.c -if { [prepare_for_testing ${testfile}.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/eval-skip.exp b/gdb/testsuite/gdb.base/eval-skip.exp index 8a4eb3ff30d..eab4d01f69c 100644 --- a/gdb/testsuite/gdb.base/eval-skip.exp +++ b/gdb/testsuite/gdb.base/eval-skip.exp @@ -35,7 +35,7 @@ standard_testfile int-type.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } { - untested eval-skip.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/exitsignal.exp b/gdb/testsuite/gdb.base/exitsignal.exp index d7027d375aa..6ab500e14a7 100644 --- a/gdb/testsuite/gdb.base/exitsignal.exp +++ b/gdb/testsuite/gdb.base/exitsignal.exp @@ -28,7 +28,7 @@ if { [target_info exists gdb,nosignals] } { standard_testfile segv.c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } @@ -78,7 +78,7 @@ gdb_test "print \$_exitcode" " = void" \ # inferior execution. standard_testfile normal.c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/expand-psymtabs.exp b/gdb/testsuite/gdb.base/expand-psymtabs.exp index 59b10d58d8c..ff509fa8e02 100644 --- a/gdb/testsuite/gdb.base/expand-psymtabs.exp +++ b/gdb/testsuite/gdb.base/expand-psymtabs.exp @@ -37,7 +37,7 @@ if [get_compiler_info] { } # We intentionally compile the source file in twice. -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile debug $srcfile {debug additional_flags=-DFIRST} \ $srcfile debug]]} { return -1 diff --git a/gdb/testsuite/gdb.base/filesym.exp b/gdb/testsuite/gdb.base/filesym.exp index a0037c0aef8..44177144e1f 100644 --- a/gdb/testsuite/gdb.base/filesym.exp +++ b/gdb/testsuite/gdb.base/filesym.exp @@ -18,7 +18,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/find-unmapped.exp b/gdb/testsuite/gdb.base/find-unmapped.exp index 2f3473f73ce..2bc4f62770f 100644 --- a/gdb/testsuite/gdb.base/find-unmapped.exp +++ b/gdb/testsuite/gdb.base/find-unmapped.exp @@ -21,7 +21,7 @@ if {[is_remote target]} { standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/finish.exp b/gdb/testsuite/gdb.base/finish.exp index 35294ccb6e3..c5d830526da 100644 --- a/gdb/testsuite/gdb.base/finish.exp +++ b/gdb/testsuite/gdb.base/finish.exp @@ -18,7 +18,7 @@ set skip_float_test [gdb_skip_float_test] # re-use the program from the "return2" test. -if { [prepare_for_testing finish.exp finish return2.c] } { +if { [prepare_for_testing "failed to prepare" finish return2.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/float.exp b/gdb/testsuite/gdb.base/float.exp index bc3e230357a..7ab30c925f0 100644 --- a/gdb/testsuite/gdb.base/float.exp +++ b/gdb/testsuite/gdb.base/float.exp @@ -23,7 +23,7 @@ # -if { [prepare_for_testing float.exp float float.c] } { +if { [prepare_for_testing "failed to prepare" float float.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/foll-exec-mode.exp b/gdb/testsuite/gdb.base/foll-exec-mode.exp index 2c6e3799998..5de3b038b2d 100644 --- a/gdb/testsuite/gdb.base/foll-exec-mode.exp +++ b/gdb/testsuite/gdb.base/foll-exec-mode.exp @@ -49,12 +49,12 @@ set compile_options debug # build the first test case if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable $compile_options] != "" } { - untested foll-exec-mode.exp + untested "failed to compile" return -1 } if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $compile_options] != "" } { - untested foll-exec-mode.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/foll-exec.exp b/gdb/testsuite/gdb.base/foll-exec.exp index ed86c0f192b..b56e23e0bb2 100644 --- a/gdb/testsuite/gdb.base/foll-exec.exp +++ b/gdb/testsuite/gdb.base/foll-exec.exp @@ -32,12 +32,12 @@ set compile_options debug # build the first test case if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable $compile_options] != "" } { - untested foll-exec.exp + untested "failed to compile" return -1 } if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $compile_options] != "" } { - untested foll-exec.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp index 61aefc1767d..7c8a2deb154 100644 --- a/gdb/testsuite/gdb.base/foll-fork.exp +++ b/gdb/testsuite/gdb.base/foll-fork.exp @@ -22,8 +22,7 @@ if { ![istarget "*-*-linux*"] && ![istarget "*-*-openbsd*"] } then { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/fortran-sym-case.exp b/gdb/testsuite/gdb.base/fortran-sym-case.exp index 9aac96be64f..94884c667f9 100644 --- a/gdb/testsuite/gdb.base/fortran-sym-case.exp +++ b/gdb/testsuite/gdb.base/fortran-sym-case.exp @@ -15,7 +15,7 @@ standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/freebpcmd.exp b/gdb/testsuite/gdb.base/freebpcmd.exp index f4c4770b324..7a8334ec569 100644 --- a/gdb/testsuite/gdb.base/freebpcmd.exp +++ b/gdb/testsuite/gdb.base/freebpcmd.exp @@ -45,8 +45,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/func-ptr.exp b/gdb/testsuite/gdb.base/func-ptr.exp index cda2e9dbcdc..920e438a63c 100644 --- a/gdb/testsuite/gdb.base/func-ptr.exp +++ b/gdb/testsuite/gdb.base/func-ptr.exp @@ -17,7 +17,7 @@ # Trying to print foo->bar if foo is a pointer to a typedef of a pointer # to a function will put gdb into an infinite loop. -if { [prepare_for_testing func-ptr.exp "func-ptr" {func-ptr.c} {debug}] } { +if { [prepare_for_testing "failed to prepare" "func-ptr" {func-ptr.c} {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/func-ptrs.exp b/gdb/testsuite/gdb.base/func-ptrs.exp index a3b55a87485..ed6f8b1fcd1 100644 --- a/gdb/testsuite/gdb.base/func-ptrs.exp +++ b/gdb/testsuite/gdb.base/func-ptrs.exp @@ -15,12 +15,12 @@ set testname func-ptrs set srcfile ${testname}.c -if { [prepare_for_testing ${testname}.exp ${testname} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testname} ${srcfile}] } { return -1 } if { ![runto_main] } { - untested ${testname}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/funcargs.exp b/gdb/testsuite/gdb.base/funcargs.exp index fe04b2f34a2..27e6a96df00 100644 --- a/gdb/testsuite/gdb.base/funcargs.exp +++ b/gdb/testsuite/gdb.base/funcargs.exp @@ -31,8 +31,7 @@ if [get_compiler_info] { set skip_float_test [gdb_skip_float_test] -if {[prepare_for_testing $testfile.exp $testfile $srcfile $compile_flags]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile $compile_flags]} { return -1 } diff --git a/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp b/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp index 92df25f2de5..30c45ee7343 100644 --- a/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp +++ b/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp @@ -23,7 +23,7 @@ set pattern 0123456789012345678901234567890123456789012345678901234567890123456 append binfile -${pattern} if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } @@ -35,7 +35,7 @@ gdb_test_no_output "set args ${pattern}" \ "set buffer exceeding arguments" if { ! [ runto_main ] } then { - untested gcore-buffer-overflow.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/gcore-relro-pie.exp b/gdb/testsuite/gdb.base/gcore-relro-pie.exp index 5a22d5d787a..1876838b8e5 100644 --- a/gdb/testsuite/gdb.base/gcore-relro-pie.exp +++ b/gdb/testsuite/gdb.base/gcore-relro-pie.exp @@ -19,7 +19,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug additional_flags=-fpie "ldflags=-pie -Wl,-z,relro"}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug additional_flags=-fpie "ldflags=-pie -Wl,-z,relro"}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/gcore-relro.exp b/gdb/testsuite/gdb.base/gcore-relro.exp index 0467c90b454..abe7f80b6f5 100644 --- a/gdb/testsuite/gdb.base/gcore-relro.exp +++ b/gdb/testsuite/gdb.base/gcore-relro.exp @@ -26,7 +26,7 @@ set objfile [standard_output_file ${testfile}.o] if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} {debug}] != "" || [gdb_compile ${srcdir}/${subdir}/${srcfile} ${objfile} object {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } set opts [list debug shlib=${binfile_lib} additional_flags=-Wl,-z,relro] diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp index 9f271702a11..73c77b359a7 100644 --- a/gdb/testsuite/gdb.base/gcore.exp +++ b/gdb/testsuite/gdb.base/gcore.exp @@ -19,8 +19,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested "failed to compile" +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/gdb1090.exp b/gdb/testsuite/gdb.base/gdb1090.exp index 2bba93e1899..4acc2dced0e 100644 --- a/gdb/testsuite/gdb.base/gdb1090.exp +++ b/gdb/testsuite/gdb.base/gdb1090.exp @@ -24,8 +24,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/gdb11530.exp b/gdb/testsuite/gdb.base/gdb11530.exp index 16fdaaafdb7..9ac54ccd45f 100644 --- a/gdb/testsuite/gdb.base/gdb11530.exp +++ b/gdb/testsuite/gdb.base/gdb11530.exp @@ -31,7 +31,7 @@ if { ![test_compiler_info gcc*] } { return 0 } -if { [prepare_for_testing $testfile.exp $testfile $testfile.c {debug}] } { +if { [prepare_for_testing "failed to prepare" $testfile $testfile.c {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/gdb11531.exp b/gdb/testsuite/gdb.base/gdb11531.exp index 0aea181c993..efece253a6b 100644 --- a/gdb/testsuite/gdb.base/gdb11531.exp +++ b/gdb/testsuite/gdb.base/gdb11531.exp @@ -22,7 +22,7 @@ standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $testfile.c {debug}] } { +if { [prepare_for_testing "failed to prepare" $testfile $testfile.c {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/gdb1821.exp b/gdb/testsuite/gdb.base/gdb1821.exp index 07de3d6e142..1a133440809 100644 --- a/gdb/testsuite/gdb.base/gdb1821.exp +++ b/gdb/testsuite/gdb.base/gdb1821.exp @@ -24,8 +24,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/gdbindex-stabs.exp b/gdb/testsuite/gdb.base/gdbindex-stabs.exp index 562d88643e5..09855a8c18a 100644 --- a/gdb/testsuite/gdb.base/gdbindex-stabs.exp +++ b/gdb/testsuite/gdb.base/gdbindex-stabs.exp @@ -24,7 +24,7 @@ set objfile_dwarf [standard_output_file ${testfile}-dwarf.o] if {[gdb_compile "${srcdir}/${subdir}/${srcfile_stabs}" ${objfile_stabs} object {additional_flags=-gstabs}] != "" || [gdb_compile "${srcdir}/${subdir}/${srcfile_dwarf}" ${objfile_dwarf} object {additional_flags=-gdwarf-2}] != "" || [gdb_compile "${objfile_stabs} ${objfile_dwarf}" ${binfile} executable {nodebug}] != ""} { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/gdbvars.exp b/gdb/testsuite/gdb.base/gdbvars.exp index 4722ea46691..0a15056c142 100644 --- a/gdb/testsuite/gdb.base/gdbvars.exp +++ b/gdb/testsuite/gdb.base/gdbvars.exp @@ -18,8 +18,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/hbreak.exp b/gdb/testsuite/gdb.base/hbreak.exp index 82a03a79e8b..5450f489f36 100644 --- a/gdb/testsuite/gdb.base/hbreak.exp +++ b/gdb/testsuite/gdb.base/hbreak.exp @@ -19,7 +19,7 @@ if {[skip_hw_breakpoint_tests]} { set test hbreak set srcfile ${test}.c -if { [prepare_for_testing ${test}.exp ${test} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${test} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/hbreak2.exp b/gdb/testsuite/gdb.base/hbreak2.exp index 3a303ec99b8..58911540206 100644 --- a/gdb/testsuite/gdb.base/hbreak2.exp +++ b/gdb/testsuite/gdb.base/hbreak2.exp @@ -19,7 +19,7 @@ # the number available. -if { [prepare_for_testing hbreak2.exp "hbreak2" {break.c break1.c} {debug nowarnings}] } { +if { [prepare_for_testing "failed to prepare" "hbreak2" {break.c break1.c} {debug nowarnings}] } { return -1 } set srcfile break.c @@ -510,7 +510,7 @@ test_next_with_recursion # Build a new file with optimization enabled so that we can try breakpoints # on targets with optimized prologues. -if { [prepare_for_testing hbreak2.exp "hbreak2o2" {break.c break1.c} {debug nowarnings optimize=-O2}] } { +if { [prepare_for_testing "failed to prepare" "hbreak2o2" {break.c break1.c} {debug nowarnings optimize=-O2}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/included.exp b/gdb/testsuite/gdb.base/included.exp index d884a802ccf..cf3ff5e844f 100644 --- a/gdb/testsuite/gdb.base/included.exp +++ b/gdb/testsuite/gdb.base/included.exp @@ -14,8 +14,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/infcall-input.exp b/gdb/testsuite/gdb.base/infcall-input.exp index 5e764f09336..2bef9d2cc63 100644 --- a/gdb/testsuite/gdb.base/infcall-input.exp +++ b/gdb/testsuite/gdb.base/infcall-input.exp @@ -23,8 +23,7 @@ if [target_info exists gdb,cannot_call_functions] { continue } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested "failed to compile" +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/inferior-died.exp b/gdb/testsuite/gdb.base/inferior-died.exp index ce68e5cae83..f8551732fae 100644 --- a/gdb/testsuite/gdb.base/inferior-died.exp +++ b/gdb/testsuite/gdb.base/inferior-died.exp @@ -33,7 +33,7 @@ if { ![support_displaced_stepping] } { standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${testfile}.c] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${testfile}.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/infnan.exp b/gdb/testsuite/gdb.base/infnan.exp index 364bc91fe36..77aee63af54 100644 --- a/gdb/testsuite/gdb.base/infnan.exp +++ b/gdb/testsuite/gdb.base/infnan.exp @@ -17,8 +17,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/info-macros.exp b/gdb/testsuite/gdb.base/info-macros.exp index a798b370380..34575910d2d 100644 --- a/gdb/testsuite/gdb.base/info-macros.exp +++ b/gdb/testsuite/gdb.base/info-macros.exp @@ -17,13 +17,13 @@ standard_testfile .c # Fission doesn't support macros yet. Bug 15954. if [using_fission] { - untested ${testfile}.exp + untested "fission does not support macros yet" return -1 } get_compiler_info if ![test_compiler_info gcc*] { - untested ${testfile}.exp + untested "no compiler info" return -1 } @@ -31,13 +31,12 @@ if ![test_compiler_info gcc*] { # command line, possibly overriding "-g3" (depending on gcc version). set options "additional_flags=-g3" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $options] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $options] } { return -1 } if ![runto_main] { - untested ${testfile}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/info-os.exp b/gdb/testsuite/gdb.base/info-os.exp index 32a7b18235e..8bd7f23fa7e 100644 --- a/gdb/testsuite/gdb.base/info-os.exp +++ b/gdb/testsuite/gdb.base/info-os.exp @@ -28,7 +28,7 @@ if [gdb_skip_xml_test] then { } # Compile test program. -if { [prepare_for_testing ${testfile}.exp $testfile $srcfile {debug additional_flags=-lpthread}] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug additional_flags=-lpthread}] } { fail "cannot compile test program" return -1 } diff --git a/gdb/testsuite/gdb.base/info-proc.exp b/gdb/testsuite/gdb.base/info-proc.exp index 3f67752608c..d054a511c99 100644 --- a/gdb/testsuite/gdb.base/info-proc.exp +++ b/gdb/testsuite/gdb.base/info-proc.exp @@ -20,9 +20,8 @@ set ws "\[ \t\]+" standard_testfile break.c break1.c -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug nowarnings}]} { - untested $testfile.exp return -1 } @@ -40,7 +39,7 @@ gdb_test_multiple "info proc" "info proc without a process" { } if { ! [ runto_main ] } then { - untested info-proc.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/info-shared.exp b/gdb/testsuite/gdb.base/info-shared.exp index e80326ae5a7..3dc0cb3837b 100644 --- a/gdb/testsuite/gdb.base/info-shared.exp +++ b/gdb/testsuite/gdb.base/info-shared.exp @@ -42,7 +42,7 @@ if { [gdb_compile_shlib $srcfile_lib2 $binfile_lib2 \ } set cflags "$define1 $define2" -if { [prepare_for_testing $testfile.exp $testfile $srcfile \ +if { [prepare_for_testing "failed to prepare" $testfile $srcfile \ [list additional_flags=$cflags libs=-ldl]] } { return -1 } diff --git a/gdb/testsuite/gdb.base/info-target.exp b/gdb/testsuite/gdb.base/info-target.exp index 03111f326ae..6436cf18d4b 100644 --- a/gdb/testsuite/gdb.base/info-target.exp +++ b/gdb/testsuite/gdb.base/info-target.exp @@ -16,7 +16,7 @@ standard_testfile start.c -if { [prepare_for_testing ${testfile}.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/infoline.exp b/gdb/testsuite/gdb.base/infoline.exp index 2a848f05801..daf4d3206ff 100644 --- a/gdb/testsuite/gdb.base/infoline.exp +++ b/gdb/testsuite/gdb.base/infoline.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/interp.exp b/gdb/testsuite/gdb.base/interp.exp index 0f3ec81469b..a9d0ce64f8c 100644 --- a/gdb/testsuite/gdb.base/interp.exp +++ b/gdb/testsuite/gdb.base/interp.exp @@ -17,7 +17,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile {debug}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp index d5add422844..cb0f238b931 100644 --- a/gdb/testsuite/gdb.base/interrupt.exp +++ b/gdb/testsuite/gdb.base/interrupt.exp @@ -31,7 +31,7 @@ if { ! [target_info exists gdb,nosignals] } { } if {[build_executable $testfile.exp $testfile $srcfile $options] == -1} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp index 642c257eff9..9871cc03820 100644 --- a/gdb/testsuite/gdb.base/jit-reader.exp +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -43,7 +43,7 @@ set jit_reader_flag "-DJIT_READER_H=\"$jit_reader_header\"" if { [gdb_compile "${srcdir}/${subdir}/${jit_host_src}" "${jit_host_bin}" \ executable [list debug additional_flags=$jit_reader_flag]] != "" } { - untested jit-reader.exp + untested "failed to compile" return -1 } @@ -53,7 +53,7 @@ set jit_reader_bin [standard_output_file ${jit_reader}.so] if { [gdb_compile_shlib "${srcdir}/${subdir}/${jit_reader_src}" "${jit_reader_bin}" \ [list debug additional_flags=$jit_reader_flag]] != "" } { - untested jit-reader.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/jit-simple.exp b/gdb/testsuite/gdb.base/jit-simple.exp index 30e41e14a14..c2bc6cd0163 100644 --- a/gdb/testsuite/gdb.base/jit-simple.exp +++ b/gdb/testsuite/gdb.base/jit-simple.exp @@ -25,7 +25,7 @@ # address between runs. if {[skip_shlib_tests]} { - untested jit-simple.exp + untested "skipping shared library tests" return -1 } @@ -79,7 +79,7 @@ set binfile_dl $binfile-dl set options [list debug shlib=${binfile_lib}] if {[gdb_compile ${srcdir}/${subdir}/${srcfile_dl} $binfile_dl executable \ [list debug shlib=$binfile_lib]] == -1 } { - untested jit-simple.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/kill-after-signal.exp b/gdb/testsuite/gdb.base/kill-after-signal.exp index 4181beca446..c331a286400 100644 --- a/gdb/testsuite/gdb.base/kill-after-signal.exp +++ b/gdb/testsuite/gdb.base/kill-after-signal.exp @@ -16,7 +16,7 @@ standard_testfile .c if { ![can_single_step_to_signal_handler] } { - untested ${testfile}.exp + untested "cannot single-step to signal handler" return } @@ -25,7 +25,7 @@ if [target_info exists gdb,nosignals] { continue } -if [prepare_for_testing ${testfile}.exp ${testfile}] { +if [prepare_for_testing "failed to prepare" ${testfile}] { return -1 } diff --git a/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp b/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp index bdecbbda78e..4696825609f 100644 --- a/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp +++ b/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp @@ -25,7 +25,7 @@ if ![can_spawn_for_attach] { standard_testfile set executable $testfile -if [prepare_for_testing $testfile.exp $executable] { +if [prepare_for_testing "failed to prepare" $executable] { return -1 } diff --git a/gdb/testsuite/gdb.base/label.exp b/gdb/testsuite/gdb.base/label.exp index 2901c332e74..7b38582af9c 100644 --- a/gdb/testsuite/gdb.base/label.exp +++ b/gdb/testsuite/gdb.base/label.exp @@ -25,8 +25,7 @@ if [is_remote target] then { standard_testfile .c -if { [prepare_for_testing ${testfile}.exp $testfile ${srcfile} debug] } { - untested "failed to compile" +if { [prepare_for_testing "failed to prepare" $testfile ${srcfile} debug] } { return -1 } diff --git a/gdb/testsuite/gdb.base/langs.exp b/gdb/testsuite/gdb.base/langs.exp index d2f4f2c5945..b5d807756f5 100644 --- a/gdb/testsuite/gdb.base/langs.exp +++ b/gdb/testsuite/gdb.base/langs.exp @@ -22,7 +22,7 @@ if [is_remote host] { } -if {[prepare_for_testing ${testfile}.exp ${testfile} \ +if {[prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2 $srcfile3] {debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/ldbl_e308.exp b/gdb/testsuite/gdb.base/ldbl_e308.exp index 3d211f1d92a..d302682c58b 100644 --- a/gdb/testsuite/gdb.base/ldbl_e308.exp +++ b/gdb/testsuite/gdb.base/ldbl_e308.exp @@ -15,12 +15,12 @@ set testfile ldbl_e308 set srcfile ${testfile}.c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } if ![runto_main] { - untested ${testfile}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/line-symtabs.exp b/gdb/testsuite/gdb.base/line-symtabs.exp index 85e9b2f6e63..b8177b6f5fa 100644 --- a/gdb/testsuite/gdb.base/line-symtabs.exp +++ b/gdb/testsuite/gdb.base/line-symtabs.exp @@ -16,7 +16,7 @@ standard_testfile .c line-symtabs.h -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/linespecs.exp b/gdb/testsuite/gdb.base/linespecs.exp index c5644955029..2a005ee1800 100644 --- a/gdb/testsuite/gdb.base/linespecs.exp +++ b/gdb/testsuite/gdb.base/linespecs.exp @@ -18,7 +18,7 @@ # We don't currently need our own test case for testing, so grab # another one. -if {[prepare_for_testing linespecs.exp linespecs memattr.c]} { +if {[prepare_for_testing "failed to prepare" linespecs memattr.c]} { return -1 } diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp index a9e2965dc4c..ac64e43c1d3 100644 --- a/gdb/testsuite/gdb.base/list.exp +++ b/gdb/testsuite/gdb.base/list.exp @@ -21,7 +21,7 @@ standard_testfile list0.c list1.c # Need to download the header to the host. gdb_remote_download host ${srcdir}/${subdir}/list0.h -if {[prepare_for_testing $testfile.exp $testfile [list $srcfile $srcfile2] \ +if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile $srcfile2] \ {debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp index ab47374d5fc..39d1b3cea71 100644 --- a/gdb/testsuite/gdb.base/long_long.exp +++ b/gdb/testsuite/gdb.base/long_long.exp @@ -31,7 +31,7 @@ if [get_compiler_info] { } if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [concat debug nowarnings]] != "" } { - untested long_long.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/longest-types.exp b/gdb/testsuite/gdb.base/longest-types.exp index e94652f92e9..3ee0d0e374c 100644 --- a/gdb/testsuite/gdb.base/longest-types.exp +++ b/gdb/testsuite/gdb.base/longest-types.exp @@ -17,7 +17,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile {debug quiet}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile {debug quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp index df5525d1278..49be78deae2 100644 --- a/gdb/testsuite/gdb.base/maint.exp +++ b/gdb/testsuite/gdb.base/maint.exp @@ -48,9 +48,8 @@ standard_testfile break.c break1.c -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug nowarnings}]} { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/max-value-size.exp b/gdb/testsuite/gdb.base/max-value-size.exp index 730e9816237..112fb4a8fb5 100644 --- a/gdb/testsuite/gdb.base/max-value-size.exp +++ b/gdb/testsuite/gdb.base/max-value-size.exp @@ -15,8 +15,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/memattr.exp b/gdb/testsuite/gdb.base/memattr.exp index 0f46b3109df..aa8229e4a55 100644 --- a/gdb/testsuite/gdb.base/memattr.exp +++ b/gdb/testsuite/gdb.base/memattr.exp @@ -19,7 +19,7 @@ standard_testfile .c -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/mips_pro.exp b/gdb/testsuite/gdb.base/mips_pro.exp index ff131f77a7b..5ad1ed7e9e4 100644 --- a/gdb/testsuite/gdb.base/mips_pro.exp +++ b/gdb/testsuite/gdb.base/mips_pro.exp @@ -30,8 +30,7 @@ if { [test_compiler_info gcc-*-*] } then { lappend options additional_flags=-O2 additional_flags=-fno-inline } -if {[prepare_for_testing $testfile.exp $testfile $srcfile $options]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile $options]} { return -1 } diff --git a/gdb/testsuite/gdb.base/morestack.exp b/gdb/testsuite/gdb.base/morestack.exp index fb9bbf312f9..2f07baaf3a7 100644 --- a/gdb/testsuite/gdb.base/morestack.exp +++ b/gdb/testsuite/gdb.base/morestack.exp @@ -26,8 +26,8 @@ standard_testfile # -fuse-ld=gold is used for calling printf code built without -fsplit-stack # which could crash otherwise. See GCC documentation of -fsplit-stack. set opts "additional_flags=-fsplit-stack" -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile [list $opts additional_flags=-fuse-ld=gold]] \ - && [prepare_for_testing ${testfile}.exp ${testfile} $srcfile $opts] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile [list $opts additional_flags=-fuse-ld=gold]] \ + && [prepare_for_testing "failed to prepare" ${testfile} $srcfile $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.base/moribund-step.exp b/gdb/testsuite/gdb.base/moribund-step.exp index 65e724060b8..ea423cc4b64 100644 --- a/gdb/testsuite/gdb.base/moribund-step.exp +++ b/gdb/testsuite/gdb.base/moribund-step.exp @@ -20,7 +20,7 @@ if { ![support_displaced_stepping] } { return -1 } -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp index d3f57008277..811daef44c3 100644 --- a/gdb/testsuite/gdb.base/multi-forks.exp +++ b/gdb/testsuite/gdb.base/multi-forks.exp @@ -24,7 +24,7 @@ if { ![istarget "*-*-linux*"] } then { standard_testfile .c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested multi-forks.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/nested-addr.exp b/gdb/testsuite/gdb.base/nested-addr.exp index 1c105673f3f..1a6d2c2e833 100644 --- a/gdb/testsuite/gdb.base/nested-addr.exp +++ b/gdb/testsuite/gdb.base/nested-addr.exp @@ -15,7 +15,7 @@ standard_testfile -if {[prepare_for_testing "${testfile}.exp" "${testfile}" "${srcfile}"]} { +if {[prepare_for_testing "failed to prepare" "${testfile}" "${srcfile}"]} { return -1 } diff --git a/gdb/testsuite/gdb.base/nextoverexit.exp b/gdb/testsuite/gdb.base/nextoverexit.exp index c768451a7d3..4c8b844bd28 100644 --- a/gdb/testsuite/gdb.base/nextoverexit.exp +++ b/gdb/testsuite/gdb.base/nextoverexit.exp @@ -14,7 +14,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $testfile.c]} { +if {[prepare_for_testing "failed to prepare" $testfile $testfile.c]} { return -1 } diff --git a/gdb/testsuite/gdb.base/noreturn-finish.exp b/gdb/testsuite/gdb.base/noreturn-finish.exp index 4affdcdbee9..4ad30f68077 100644 --- a/gdb/testsuite/gdb.base/noreturn-finish.exp +++ b/gdb/testsuite/gdb.base/noreturn-finish.exp @@ -23,7 +23,7 @@ proc noreturn_finish_test { } { global gdb_prompt if { ! [ runto_main ] } then { - untested ${testfile}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/noreturn-return.exp b/gdb/testsuite/gdb.base/noreturn-return.exp index 6c7bf073dd1..d1635bd240f 100644 --- a/gdb/testsuite/gdb.base/noreturn-return.exp +++ b/gdb/testsuite/gdb.base/noreturn-return.exp @@ -23,7 +23,7 @@ proc noreturn_test { } { global gdb_prompt if { ! [ runto_main ] } then { - untested ${testfile}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/nostdlib.exp b/gdb/testsuite/gdb.base/nostdlib.exp index c0e15788132..448410fd4b9 100644 --- a/gdb/testsuite/gdb.base/nostdlib.exp +++ b/gdb/testsuite/gdb.base/nostdlib.exp @@ -19,7 +19,7 @@ standard_testfile .c # See also the comment in break-entry.exp. if [target_info exists use_gdb_stub] { - untested ${testfile}.exp + untested "skipping tests due to use_gdb_stub" return } @@ -41,7 +41,7 @@ if [board_info $board exists mathlib] { unset_board_info mathlib } if {$err != ""} { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/offsets.exp b/gdb/testsuite/gdb.base/offsets.exp index 9637eabe86c..e6943c2bf74 100644 --- a/gdb/testsuite/gdb.base/offsets.exp +++ b/gdb/testsuite/gdb.base/offsets.exp @@ -19,7 +19,6 @@ standard_testfile offsets.c if { [prepare_for_testing "failed to prepare for testing large offsets" \ ${testfile} ${srcfile}] } { - untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/opaque.exp b/gdb/testsuite/gdb.base/opaque.exp index 3241171a5fb..5b06ffa566d 100644 --- a/gdb/testsuite/gdb.base/opaque.exp +++ b/gdb/testsuite/gdb.base/opaque.exp @@ -24,9 +24,8 @@ if [get_compiler_info] { standard_testfile opaque0.c opaque1.c -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] debug]} { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/pc-fp.exp b/gdb/testsuite/gdb.base/pc-fp.exp index e2b92283d42..dc44591db7b 100644 --- a/gdb/testsuite/gdb.base/pc-fp.exp +++ b/gdb/testsuite/gdb.base/pc-fp.exp @@ -30,8 +30,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/permissions.exp b/gdb/testsuite/gdb.base/permissions.exp index 19c3b047dc3..0e962a32109 100644 --- a/gdb/testsuite/gdb.base/permissions.exp +++ b/gdb/testsuite/gdb.base/permissions.exp @@ -22,7 +22,7 @@ standard_testfile start.c if {[build_executable $testfile.exp $testfile \ $srcfile {debug nowarnings}] == -1} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/print-symbol-loading.exp b/gdb/testsuite/gdb.base/print-symbol-loading.exp index ac7d67af3c1..9e28e14383d 100644 --- a/gdb/testsuite/gdb.base/print-symbol-loading.exp +++ b/gdb/testsuite/gdb.base/print-symbol-loading.exp @@ -28,12 +28,12 @@ set objfile [standard_output_file ${testfile}.o] if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} {debug}] != "" || [gdb_compile ${srcdir}/${subdir}/${srcfile} ${objfile} object {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } set opts [list debug shlib=${binfile_lib}] if { [gdb_compile ${objfile} ${binfile} executable $opts] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/prologue-include.exp b/gdb/testsuite/gdb.base/prologue-include.exp index 08cc9e9ea9f..75cf17516ad 100644 --- a/gdb/testsuite/gdb.base/prologue-include.exp +++ b/gdb/testsuite/gdb.base/prologue-include.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/psymtab.exp b/gdb/testsuite/gdb.base/psymtab.exp index d316d941222..dc820bb1c44 100644 --- a/gdb/testsuite/gdb.base/psymtab.exp +++ b/gdb/testsuite/gdb.base/psymtab.exp @@ -34,9 +34,8 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] debug]} { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/ptype.exp b/gdb/testsuite/gdb.base/ptype.exp index 296b67a47eb..3f73121b2a4 100644 --- a/gdb/testsuite/gdb.base/ptype.exp +++ b/gdb/testsuite/gdb.base/ptype.exp @@ -21,7 +21,7 @@ standard_testfile .c ptype1.c -if {[prepare_for_testing ${testfile}.exp ${testfile} \ +if {[prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2] {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/random-signal.exp b/gdb/testsuite/gdb.base/random-signal.exp index b14662a33dc..b666e086385 100644 --- a/gdb/testsuite/gdb.base/random-signal.exp +++ b/gdb/testsuite/gdb.base/random-signal.exp @@ -26,7 +26,7 @@ if [target_info exists gdb,nointerrupts] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/randomize.exp b/gdb/testsuite/gdb.base/randomize.exp index 529e6d65549..2c9d6d0446b 100644 --- a/gdb/testsuite/gdb.base/randomize.exp +++ b/gdb/testsuite/gdb.base/randomize.exp @@ -15,8 +15,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/range-stepping.exp b/gdb/testsuite/gdb.base/range-stepping.exp index 9ed92c78219..ed16ae6b05f 100644 --- a/gdb/testsuite/gdb.base/range-stepping.exp +++ b/gdb/testsuite/gdb.base/range-stepping.exp @@ -18,7 +18,7 @@ load_lib "range-stepping-support.exp" standard_testfile set executable $testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug}] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/readline-ask.exp b/gdb/testsuite/gdb.base/readline-ask.exp index 48973676e29..05d3e1f7216 100644 --- a/gdb/testsuite/gdb.base/readline-ask.exp +++ b/gdb/testsuite/gdb.base/readline-ask.exp @@ -17,7 +17,7 @@ standard_testfile .c set inputrc ${srcdir}/${subdir}/${testfile}.inputrc if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/recpar.exp b/gdb/testsuite/gdb.base/recpar.exp index cc1a46c06c9..225f7524962 100644 --- a/gdb/testsuite/gdb.base/recpar.exp +++ b/gdb/testsuite/gdb.base/recpar.exp @@ -15,12 +15,12 @@ standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } if ![runto_main] { - untested ${testfile}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/recurse.exp b/gdb/testsuite/gdb.base/recurse.exp index d4c5a264a60..1ab46432c7a 100644 --- a/gdb/testsuite/gdb.base/recurse.exp +++ b/gdb/testsuite/gdb.base/recurse.exp @@ -18,8 +18,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/relational.exp b/gdb/testsuite/gdb.base/relational.exp index cebd42304ca..e2909a73622 100644 --- a/gdb/testsuite/gdb.base/relational.exp +++ b/gdb/testsuite/gdb.base/relational.exp @@ -25,7 +25,7 @@ # test running programs # -if { [prepare_for_testing relational.exp relational int-type.c {debug nowarnings}] } { +if { [prepare_for_testing "failed to prepare" relational int-type.c {debug nowarnings}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/restore.exp b/gdb/testsuite/gdb.base/restore.exp index ece5df2e72f..313efa38509 100644 --- a/gdb/testsuite/gdb.base/restore.exp +++ b/gdb/testsuite/gdb.base/restore.exp @@ -24,7 +24,7 @@ standard_testfile set executable $testfile -if { [prepare_for_testing $testfile.exp $executable $srcfile] } { +if { [prepare_for_testing "failed to prepare" $executable $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/return-nodebug.exp b/gdb/testsuite/gdb.base/return-nodebug.exp index 0d58ba58464..2e1111d29c1 100644 --- a/gdb/testsuite/gdb.base/return-nodebug.exp +++ b/gdb/testsuite/gdb.base/return-nodebug.exp @@ -54,7 +54,7 @@ foreach type {{signed char} {short} {int} {long} {long long} {float} {double}} { set additional_flags "additional_flags=-DTYPE=$typeesc" - if {[prepare_for_testing_full $testfile.exp \ + if {[prepare_for_testing_full "failed to prepare" \ [list ${testfile}-${typenospace} debug \ $srcfile [list debug $additional_flags] \ $srcfile2 [list $additional_flags]]]} { diff --git a/gdb/testsuite/gdb.base/return.exp b/gdb/testsuite/gdb.base/return.exp index 63cccf2634e..f5fe3df57ee 100644 --- a/gdb/testsuite/gdb.base/return.exp +++ b/gdb/testsuite/gdb.base/return.exp @@ -15,7 +15,7 @@ # This file was written by Jeff Law. (law@cs.utah.edu) -if { [prepare_for_testing return.exp "return"] } { +if { [prepare_for_testing "failed to prepare" "return"] } { return -1 } diff --git a/gdb/testsuite/gdb.base/run-after-attach.exp b/gdb/testsuite/gdb.base/run-after-attach.exp index c4551abba3b..1aaa97fe4da 100644 --- a/gdb/testsuite/gdb.base/run-after-attach.exp +++ b/gdb/testsuite/gdb.base/run-after-attach.exp @@ -23,7 +23,7 @@ if ![can_spawn_for_attach] { standard_testfile set executable $testfile -if [prepare_for_testing $testfile.exp $executable] { +if [prepare_for_testing "failed to prepare" $executable] { return -1 } diff --git a/gdb/testsuite/gdb.base/save-bp.exp b/gdb/testsuite/gdb.base/save-bp.exp index 7eae0138a46..cc711639c9d 100644 --- a/gdb/testsuite/gdb.base/save-bp.exp +++ b/gdb/testsuite/gdb.base/save-bp.exp @@ -15,12 +15,12 @@ standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } { return -1 } if ![runto_main] { - untested ${testfile}.exp + untested "could not run to main" return -1 } # Delete all breakpoints so that the "runto_main" breakpoint above diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp index 37d06576bd1..42987a1c39e 100644 --- a/gdb/testsuite/gdb.base/scope.exp +++ b/gdb/testsuite/gdb.base/scope.exp @@ -18,7 +18,7 @@ standard_testfile scope0.c scope1.c -if {[prepare_for_testing ${testfile}.exp ${testfile} \ +if {[prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2] {debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/sect-cmd.exp b/gdb/testsuite/gdb.base/sect-cmd.exp index 502e1b50b6c..df469e5695d 100644 --- a/gdb/testsuite/gdb.base/sect-cmd.exp +++ b/gdb/testsuite/gdb.base/sect-cmd.exp @@ -32,17 +32,17 @@ set srcfile1 break1.c set binfile ${objdir}/${subdir}/${testfile} if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } { - untested sect-cmd.exp + untested "failed to compile" return -1 } if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } { - untested sect-cmd.exp + untested "failed to compile" return -1 } if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } { - untested sect-cmd.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/set-lang-auto.exp b/gdb/testsuite/gdb.base/set-lang-auto.exp index 6887e1e73ba..f0eb1cad139 100644 --- a/gdb/testsuite/gdb.base/set-lang-auto.exp +++ b/gdb/testsuite/gdb.base/set-lang-auto.exp @@ -16,8 +16,7 @@ standard_testfile start.c -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/set-noassign.exp b/gdb/testsuite/gdb.base/set-noassign.exp index fd9691ded83..b92a417014d 100644 --- a/gdb/testsuite/gdb.base/set-noassign.exp +++ b/gdb/testsuite/gdb.base/set-noassign.exp @@ -14,7 +14,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -if { [prepare_for_testing set-noassign.exp "set-noassign" start.c {debug nowarnings}] } { +if { [prepare_for_testing "failed to prepare" "set-noassign" start.c {debug nowarnings}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/setvar.exp b/gdb/testsuite/gdb.base/setvar.exp index bda9e735bd7..426ec22c865 100644 --- a/gdb/testsuite/gdb.base/setvar.exp +++ b/gdb/testsuite/gdb.base/setvar.exp @@ -32,8 +32,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/sigall.exp b/gdb/testsuite/gdb.base/sigall.exp index fd593ff08b4..78d3111b1c6 100644 --- a/gdb/testsuite/gdb.base/sigall.exp +++ b/gdb/testsuite/gdb.base/sigall.exp @@ -20,8 +20,7 @@ if [target_info exists gdb,nosignals] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp index 012bd290068..4b6452e7766 100644 --- a/gdb/testsuite/gdb.base/sigbpt.exp +++ b/gdb/testsuite/gdb.base/sigbpt.exp @@ -36,8 +36,7 @@ if [target_info exists gdb,nosignals] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/siginfo-addr.exp b/gdb/testsuite/gdb.base/siginfo-addr.exp index 70900d42663..a14c933a295 100644 --- a/gdb/testsuite/gdb.base/siginfo-addr.exp +++ b/gdb/testsuite/gdb.base/siginfo-addr.exp @@ -27,8 +27,7 @@ if [target_info exists gdb,nosignals] { } standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested "failed to compile" +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/siginfo-infcall.exp b/gdb/testsuite/gdb.base/siginfo-infcall.exp index 59773602ed1..bd7dab7b38a 100644 --- a/gdb/testsuite/gdb.base/siginfo-infcall.exp +++ b/gdb/testsuite/gdb.base/siginfo-infcall.exp @@ -20,7 +20,7 @@ if [target_info exists gdb,nosignals] { standard_testfile .c -if { [prepare_for_testing ${testfile}.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/siginfo-obj.exp b/gdb/testsuite/gdb.base/siginfo-obj.exp index ca4021622d3..2f604bc0d03 100644 --- a/gdb/testsuite/gdb.base/siginfo-obj.exp +++ b/gdb/testsuite/gdb.base/siginfo-obj.exp @@ -34,8 +34,7 @@ if { ![supports_get_siginfo_type] } { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/siginfo.exp b/gdb/testsuite/gdb.base/siginfo.exp index 9f54ac05876..94cd7480fb4 100644 --- a/gdb/testsuite/gdb.base/siginfo.exp +++ b/gdb/testsuite/gdb.base/siginfo.exp @@ -31,8 +31,7 @@ if [target_info exists gdb,nosignals] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/signals-state-child.exp b/gdb/testsuite/gdb.base/signals-state-child.exp index cd6a9a517eb..2e6d033da78 100644 --- a/gdb/testsuite/gdb.base/signals-state-child.exp +++ b/gdb/testsuite/gdb.base/signals-state-child.exp @@ -46,13 +46,13 @@ remote_file target delete $standalone_txt set options [list debug "additional_flags=-DOUTPUT_TXT=\"$gdb_txt\""] if {[build_executable $testfile.exp $testfile $srcfile $options]} { - untested $testfile.exp + untested "failed to compile" return -1 } set options [list debug "additional_flags=-DOUTPUT_TXT=\"$standalone_txt\""] if {[build_executable $testfile.exp $testfile-standalone $srcfile $options]} { - untested $testfile.exp + untested "failed to compile" return -1 } @@ -80,7 +80,7 @@ remote_close target clean_restart $binfile if { ! [ runto_main ] } then { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/signest.exp b/gdb/testsuite/gdb.base/signest.exp index d53b1b0016c..f0d5562860a 100644 --- a/gdb/testsuite/gdb.base/signest.exp +++ b/gdb/testsuite/gdb.base/signest.exp @@ -22,13 +22,12 @@ if [target_info exists gdb,nosignals] { return -1 } -if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug}] { - untested ${testfile}.exp +if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug}] { return -1 } if ![runto_main] then { - untested ${testfile}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/sigstep.exp b/gdb/testsuite/gdb.base/sigstep.exp index 48d104bbff2..7b2199ff69d 100644 --- a/gdb/testsuite/gdb.base/sigstep.exp +++ b/gdb/testsuite/gdb.base/sigstep.exp @@ -30,7 +30,7 @@ if [target_info exists gdb,nosignals] { standard_testfile if {[build_executable $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/sizeof.exp b/gdb/testsuite/gdb.base/sizeof.exp index e6c7af66195..0645d81d6c1 100644 --- a/gdb/testsuite/gdb.base/sizeof.exp +++ b/gdb/testsuite/gdb.base/sizeof.exp @@ -25,8 +25,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/skip.exp b/gdb/testsuite/gdb.base/skip.exp index 7eafd9453fe..63f1fe15449 100644 --- a/gdb/testsuite/gdb.base/skip.exp +++ b/gdb/testsuite/gdb.base/skip.exp @@ -16,7 +16,7 @@ # This file was written by Justin Lebar. (justin.lebar@gmail.com) # And further hacked on by Doug Evans. (dje@google.com) -if { [prepare_for_testing skip.exp "skip" \ +if { [prepare_for_testing "failed to prepare" "skip" \ {skip.c skip1.c } \ {debug nowarnings}] } { return -1 diff --git a/gdb/testsuite/gdb.base/solib-corrupted.exp b/gdb/testsuite/gdb.base/solib-corrupted.exp index 71a42ba3a3b..f0f02d79878 100644 --- a/gdb/testsuite/gdb.base/solib-corrupted.exp +++ b/gdb/testsuite/gdb.base/solib-corrupted.exp @@ -26,8 +26,7 @@ if {[is_remote target]} { set testfile "solib-corrupted" set srcfile start.c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/solib-nodir.exp b/gdb/testsuite/gdb.base/solib-nodir.exp index e4f15d09bc7..3d6083d0a41 100644 --- a/gdb/testsuite/gdb.base/solib-nodir.exp +++ b/gdb/testsuite/gdb.base/solib-nodir.exp @@ -36,7 +36,7 @@ if { [get_compiler_info] || [gdb_gnu_strip_debug $binlibfile] || [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug}] != "" || [gdb_compile "${objfile} ${binlibfile}" "${binfile}" executable {}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/solib-search.exp b/gdb/testsuite/gdb.base/solib-search.exp index a080f2b714d..9018b486ae3 100644 --- a/gdb/testsuite/gdb.base/solib-search.exp +++ b/gdb/testsuite/gdb.base/solib-search.exp @@ -17,14 +17,14 @@ # is properly reset when the path is changed. if {[is_remote target] || [skip_shlib_tests]} { - untested solib-search.exp + untested "skipping remote target and shared library tests" return -1 } # This is required by gdb_compile_shlib. if {[get_compiler_info]} { warning "Could not get compiler info" - untested solib-search.exp + untested "no compiler info" return 1 } diff --git a/gdb/testsuite/gdb.base/stack-checking.exp b/gdb/testsuite/gdb.base/stack-checking.exp index aa685757c93..c786edbae74 100644 --- a/gdb/testsuite/gdb.base/stack-checking.exp +++ b/gdb/testsuite/gdb.base/stack-checking.exp @@ -17,7 +17,7 @@ standard_testfile .c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [concat debug additional_flags=-fstack-check nowarnings]] != "" } { - untested stack-checking.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/stale-infcall.exp b/gdb/testsuite/gdb.base/stale-infcall.exp index 67b42e5fa5b..bc8f9ac0426 100644 --- a/gdb/testsuite/gdb.base/stale-infcall.exp +++ b/gdb/testsuite/gdb.base/stale-infcall.exp @@ -15,7 +15,7 @@ standard_testfile .c -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/stap-probe.exp b/gdb/testsuite/gdb.base/stap-probe.exp index df46e807bf2..c3726be7931 100644 --- a/gdb/testsuite/gdb.base/stap-probe.exp +++ b/gdb/testsuite/gdb.base/stap-probe.exp @@ -21,7 +21,7 @@ standard_testfile proc stap_test {exec_name {arg ""}} { global testfile hex srcfile - if {[prepare_for_testing ${testfile}.exp ${exec_name} $srcfile \ + if {[prepare_for_testing "failed to prepare" ${exec_name} $srcfile \ [concat $arg debug]]} { return -1 } @@ -96,7 +96,7 @@ proc stap_test {exec_name {arg ""}} { proc stap_test_no_debuginfo {exec_name {arg ""}} { global testfile hex - if {[prepare_for_testing ${testfile}.exp ${exec_name} ${testfile}.c \ + if {[prepare_for_testing "failed to prepare" ${exec_name} ${testfile}.c \ {$arg nodebug optimize=-O2}]} { return -1 } @@ -161,7 +161,7 @@ proc stap_test_no_debuginfo {exec_name {arg ""}} { with_test_prefix "without semaphore, not optimized" { if {[stap_test "stap-probe-nosem-noopt"] == -1} { - untested stap-probe.exp + untested "stap probe test failed" return -1 } } diff --git a/gdb/testsuite/gdb.base/start.exp b/gdb/testsuite/gdb.base/start.exp index c338a08090d..27959bad148 100644 --- a/gdb/testsuite/gdb.base/start.exp +++ b/gdb/testsuite/gdb.base/start.exp @@ -16,8 +16,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/step-break.exp b/gdb/testsuite/gdb.base/step-break.exp index 19794cbbb35..949660968ff 100644 --- a/gdb/testsuite/gdb.base/step-break.exp +++ b/gdb/testsuite/gdb.base/step-break.exp @@ -17,8 +17,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested step-break.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/step-bt.exp b/gdb/testsuite/gdb.base/step-bt.exp index 74d97083169..a7008d1454e 100644 --- a/gdb/testsuite/gdb.base/step-bt.exp +++ b/gdb/testsuite/gdb.base/step-bt.exp @@ -19,8 +19,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/step-line.exp b/gdb/testsuite/gdb.base/step-line.exp index 292dc7ca5c1..ac8c9204465 100644 --- a/gdb/testsuite/gdb.base/step-line.exp +++ b/gdb/testsuite/gdb.base/step-line.exp @@ -23,8 +23,7 @@ standard_testfile set linefile ${testfile}.inp -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/step-over-exit.exp b/gdb/testsuite/gdb.base/step-over-exit.exp index 3cf5d0dc77e..b42e578bcdf 100644 --- a/gdb/testsuite/gdb.base/step-over-exit.exp +++ b/gdb/testsuite/gdb.base/step-over-exit.exp @@ -31,8 +31,7 @@ if { [istarget "i\[34567\]86-*-linux*"] || [istarget "x86_64-*-linux*"] } { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/step-over-syscall.exp b/gdb/testsuite/gdb.base/step-over-syscall.exp index e1d5ba1ee60..14e99718a51 100644 --- a/gdb/testsuite/gdb.base/step-over-syscall.exp +++ b/gdb/testsuite/gdb.base/step-over-syscall.exp @@ -115,7 +115,7 @@ proc step_over_syscall { syscall } { set testfile "step-over-$syscall" if [build_executable ${testfile}.exp ${testfile} ${testfile}.c {debug}] { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/step-resume-infcall.exp b/gdb/testsuite/gdb.base/step-resume-infcall.exp index ecd202424e3..72bd84b58e5 100644 --- a/gdb/testsuite/gdb.base/step-resume-infcall.exp +++ b/gdb/testsuite/gdb.base/step-resume-infcall.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/step-test.exp b/gdb/testsuite/gdb.base/step-test.exp index 280b892d9f2..64bb2e36fc1 100644 --- a/gdb/testsuite/gdb.base/step-test.exp +++ b/gdb/testsuite/gdb.base/step-test.exp @@ -20,7 +20,7 @@ standard_testfile .c remote_exec build "rm -f ${binfile}" if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested step-test.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/store.exp b/gdb/testsuite/gdb.base/store.exp index fed5c8ab558..658ee39ad22 100644 --- a/gdb/testsuite/gdb.base/store.exp +++ b/gdb/testsuite/gdb.base/store.exp @@ -18,7 +18,7 @@ standard_testfile set executable $testfile -if { [prepare_for_testing $testfile.exp $executable $srcfile] } { +if { [prepare_for_testing "failed to prepare" $executable $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/structs3.exp b/gdb/testsuite/gdb.base/structs3.exp index ea12f83438a..8325f470c11 100644 --- a/gdb/testsuite/gdb.base/structs3.exp +++ b/gdb/testsuite/gdb.base/structs3.exp @@ -17,7 +17,7 @@ standard_testfile .c -if { [prepare_for_testing structs3.exp "structs3" "" {debug}] } { +if { [prepare_for_testing "failed to prepare" "structs3" "" {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/sym-file.exp b/gdb/testsuite/gdb.base/sym-file.exp index 996ba827bb3..f2d34cf0a1f 100644 --- a/gdb/testsuite/gdb.base/sym-file.exp +++ b/gdb/testsuite/gdb.base/sym-file.exp @@ -65,11 +65,11 @@ if [get_compiler_info] { } if {[gdb_compile_shlib $libsrc $lib_so {debug}] != ""} { - untested ${testfile} + untested "failed to compile shared library" return } -if {[prepare_for_testing $testfile $binfile "$srcfile $srcfile2" $exec_opts]} { +if {[prepare_for_testing "failed to prepare" $binfile "$srcfile $srcfile2" $exec_opts]} { return } diff --git a/gdb/testsuite/gdb.base/symbol-without-target_section.exp b/gdb/testsuite/gdb.base/symbol-without-target_section.exp index 1a6403b6809..442739b3f3c 100644 --- a/gdb/testsuite/gdb.base/symbol-without-target_section.exp +++ b/gdb/testsuite/gdb.base/symbol-without-target_section.exp @@ -23,7 +23,7 @@ set binlibfile ${testfile}.x if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" \ [standard_output_file ${binlibfile}] object {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } if {[build_executable ${testfile}.exp ${testfile} ${srcfile} {debug}] == -1} { diff --git a/gdb/testsuite/gdb.base/term.exp b/gdb/testsuite/gdb.base/term.exp index bb369772407..6869cb9e05d 100644 --- a/gdb/testsuite/gdb.base/term.exp +++ b/gdb/testsuite/gdb.base/term.exp @@ -18,7 +18,7 @@ if [is_remote target] then { continue } -if { [prepare_for_testing term.exp term term.c] } { +if { [prepare_for_testing "failed to prepare" term term.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/testenv.exp b/gdb/testsuite/gdb.base/testenv.exp index 9d03f9135ae..850fd8acd30 100644 --- a/gdb/testsuite/gdb.base/testenv.exp +++ b/gdb/testsuite/gdb.base/testenv.exp @@ -28,7 +28,7 @@ standard_testfile .c # Compile binary # and start with a fresh gdb -if { [prepare_for_testing ${testfile}.exp ${binfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${binfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/ui-redirect.exp b/gdb/testsuite/gdb.base/ui-redirect.exp index 9fa28d75362..8f5c2963660 100644 --- a/gdb/testsuite/gdb.base/ui-redirect.exp +++ b/gdb/testsuite/gdb.base/ui-redirect.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 { [prepare_for_testing ui-redirect.exp ui-redirect start.c] } { +if { [prepare_for_testing "failed to prepare" ui-redirect start.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/until.exp b/gdb/testsuite/gdb.base/until.exp index b9b986ca803..afad6982ff1 100644 --- a/gdb/testsuite/gdb.base/until.exp +++ b/gdb/testsuite/gdb.base/until.exp @@ -16,7 +16,7 @@ # until.exp -- Expect script to test 'until' in gdb set srcfile break.c -if { [prepare_for_testing until.exp "until" {break.c break1.c} {debug nowarnings}] } { +if { [prepare_for_testing "failed to prepare" "until" {break.c break1.c} {debug nowarnings}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/unwindonsignal.exp b/gdb/testsuite/gdb.base/unwindonsignal.exp index 1c0661da55e..602c746b3c6 100644 --- a/gdb/testsuite/gdb.base/unwindonsignal.exp +++ b/gdb/testsuite/gdb.base/unwindonsignal.exp @@ -28,8 +28,7 @@ if [target_info exists gdb,cannot_call_functions] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/value-double-free.exp b/gdb/testsuite/gdb.base/value-double-free.exp index 0019a5309c3..07ee9050899 100644 --- a/gdb/testsuite/gdb.base/value-double-free.exp +++ b/gdb/testsuite/gdb.base/value-double-free.exp @@ -15,8 +15,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/vla-datatypes.exp b/gdb/testsuite/gdb.base/vla-datatypes.exp index db81f9bf397..683cdd70128 100644 --- a/gdb/testsuite/gdb.base/vla-datatypes.exp +++ b/gdb/testsuite/gdb.base/vla-datatypes.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/vla-ptr.exp b/gdb/testsuite/gdb.base/vla-ptr.exp index 6cdd00dc42f..97926365d49 100644 --- a/gdb/testsuite/gdb.base/vla-ptr.exp +++ b/gdb/testsuite/gdb.base/vla-ptr.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/vla-sideeffect.exp b/gdb/testsuite/gdb.base/vla-sideeffect.exp index 14f633e3860..a2665b07d57 100644 --- a/gdb/testsuite/gdb.base/vla-sideeffect.exp +++ b/gdb/testsuite/gdb.base/vla-sideeffect.exp @@ -18,7 +18,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp index dd01f7ecace..81510ab5b1c 100644 --- a/gdb/testsuite/gdb.base/volatile.exp +++ b/gdb/testsuite/gdb.base/volatile.exp @@ -35,7 +35,7 @@ # Use the same test program constvars.c. -if { [prepare_for_testing volatile.exp volatile constvars.c] } { +if { [prepare_for_testing "failed to prepare" volatile constvars.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/watch-cond-infcall.exp b/gdb/testsuite/gdb.base/watch-cond-infcall.exp index e31a50b3fc3..2b20ff2d9b3 100644 --- a/gdb/testsuite/gdb.base/watch-cond-infcall.exp +++ b/gdb/testsuite/gdb.base/watch-cond-infcall.exp @@ -19,7 +19,7 @@ standard_testfile if { [build_executable ${testfile}.exp ${testfile} ${testfile}.c {debug}] } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/watch-cond.exp b/gdb/testsuite/gdb.base/watch-cond.exp index f26741f1092..46357eb6650 100644 --- a/gdb/testsuite/gdb.base/watch-cond.exp +++ b/gdb/testsuite/gdb.base/watch-cond.exp @@ -19,8 +19,7 @@ standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/watch-non-mem.exp b/gdb/testsuite/gdb.base/watch-non-mem.exp index a773543afc4..3c2f0dcf408 100644 --- a/gdb/testsuite/gdb.base/watch-non-mem.exp +++ b/gdb/testsuite/gdb.base/watch-non-mem.exp @@ -19,8 +19,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/watch-read.exp b/gdb/testsuite/gdb.base/watch-read.exp index ed30ae82511..e9310405285 100644 --- a/gdb/testsuite/gdb.base/watch-read.exp +++ b/gdb/testsuite/gdb.base/watch-read.exp @@ -28,8 +28,7 @@ if {[skip_hw_watchpoint_access_tests]} { return 0 } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/watch-vfork.exp b/gdb/testsuite/gdb.base/watch-vfork.exp index 631eab89e34..0b57e8612b2 100644 --- a/gdb/testsuite/gdb.base/watch-vfork.exp +++ b/gdb/testsuite/gdb.base/watch-vfork.exp @@ -18,7 +18,7 @@ standard_testfile .c if { [build_executable ${testfile}.exp ${testfile} $srcfile {debug}] } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp b/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp index d85a0ff1027..136453e50cc 100644 --- a/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp +++ b/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp @@ -19,9 +19,8 @@ standard_testfile .c watchpoint-cond-gone-stripped.c # Stepping into a dynamic function trampoline or stepping out of MAIN may work # but it is not a reliable FAIL case. -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile debug $srcfile debug $srcfile2 {}]]} { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/watchpoint-delete.exp b/gdb/testsuite/gdb.base/watchpoint-delete.exp index 4d3c23ab80a..2d89feac71f 100644 --- a/gdb/testsuite/gdb.base/watchpoint-delete.exp +++ b/gdb/testsuite/gdb.base/watchpoint-delete.exp @@ -15,8 +15,7 @@ standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp b/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp index 46d5c6272fa..8c900ed859b 100644 --- a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp +++ b/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp @@ -19,7 +19,7 @@ if {[skip_hw_watchpoint_access_tests]} { set test watchpoint-hw-hit-once set srcfile ${test}.c -if { [prepare_for_testing ${test}.exp ${test} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${test} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.exp b/gdb/testsuite/gdb.base/watchpoint-hw.exp index a1b3a14447c..dfdf6f8f851 100644 --- a/gdb/testsuite/gdb.base/watchpoint-hw.exp +++ b/gdb/testsuite/gdb.base/watchpoint-hw.exp @@ -20,8 +20,7 @@ if {[skip_hw_watchpoint_tests]} { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp b/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp index 4d158c35215..7bb362d100e 100644 --- a/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp +++ b/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp @@ -75,8 +75,7 @@ if {[target_info exists gdb,no_hardware_watchpoints]} { return -1 } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/watchpoints.exp b/gdb/testsuite/gdb.base/watchpoints.exp index f6cf24de005..795278eeb60 100644 --- a/gdb/testsuite/gdb.base/watchpoints.exp +++ b/gdb/testsuite/gdb.base/watchpoints.exp @@ -24,8 +24,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/wchar.exp b/gdb/testsuite/gdb.base/wchar.exp index fdc9d53549b..dcf84660ee6 100644 --- a/gdb/testsuite/gdb.base/wchar.exp +++ b/gdb/testsuite/gdb.base/wchar.exp @@ -15,7 +15,7 @@ standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/whatis-exp.exp b/gdb/testsuite/gdb.base/whatis-exp.exp index 511d490a78d..61c7dfa4b4e 100644 --- a/gdb/testsuite/gdb.base/whatis-exp.exp +++ b/gdb/testsuite/gdb.base/whatis-exp.exp @@ -29,7 +29,7 @@ # test running programs # -if { [prepare_for_testing whatis-exp.exp whatis-exp int-type.c {debug nowarnings}] } { +if { [prepare_for_testing "failed to prepare" whatis-exp int-type.c {debug nowarnings}] } { return -1 } diff --git a/gdb/testsuite/gdb.btrace/buffer-size.exp b/gdb/testsuite/gdb.btrace/buffer-size.exp index 2f19bf1d823..7ecce944c72 100644 --- a/gdb/testsuite/gdb.btrace/buffer-size.exp +++ b/gdb/testsuite/gdb.btrace/buffer-size.exp @@ -22,7 +22,7 @@ if { [skip_btrace_tests] } { return -1 } # start inferior standard_testfile record_goto.c -if [prepare_for_testing $testfile.exp $testfile $srcfile] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { return -1 } diff --git a/gdb/testsuite/gdb.btrace/data.exp b/gdb/testsuite/gdb.btrace/data.exp index f39b24f5099..924e81cb56d 100644 --- a/gdb/testsuite/gdb.btrace/data.exp +++ b/gdb/testsuite/gdb.btrace/data.exp @@ -22,7 +22,7 @@ if { [skip_btrace_tests] } { return -1 } # start inferior standard_testfile -if [prepare_for_testing $testfile.exp $testfile $srcfile] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { return -1 } if ![runto_main] { diff --git a/gdb/testsuite/gdb.btrace/delta.exp b/gdb/testsuite/gdb.btrace/delta.exp index c9dbf389fa5..58d017e194b 100644 --- a/gdb/testsuite/gdb.btrace/delta.exp +++ b/gdb/testsuite/gdb.btrace/delta.exp @@ -22,7 +22,7 @@ if { [skip_btrace_tests] } { return -1 } # start inferior standard_testfile record_goto.c -if [prepare_for_testing delta.exp $testfile $srcfile] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { return -1 } if ![runto_main] { diff --git a/gdb/testsuite/gdb.btrace/dlopen.exp b/gdb/testsuite/gdb.btrace/dlopen.exp index 1e5b4f13c74..346403042f8 100644 --- a/gdb/testsuite/gdb.btrace/dlopen.exp +++ b/gdb/testsuite/gdb.btrace/dlopen.exp @@ -30,7 +30,7 @@ if { [gdb_compile_shlib $srcfile_lib $binfile_lib \ return -1 } -if { [prepare_for_testing $testfile.exp $testfile $srcfile \ +if { [prepare_for_testing "failed to prepare" $testfile $srcfile \ [list additional_flags=-DDSO_NAME=\"$binfile_lib\" libs=-ldl]] } { return -1 } diff --git a/gdb/testsuite/gdb.btrace/enable.exp b/gdb/testsuite/gdb.btrace/enable.exp index fd63006da3b..f2503cc02de 100644 --- a/gdb/testsuite/gdb.btrace/enable.exp +++ b/gdb/testsuite/gdb.btrace/enable.exp @@ -37,7 +37,7 @@ gdb_test "info record" "No record target is currently active\\." "info record wi # start inferior standard_testfile -if [prepare_for_testing $testfile.exp $testfile {} {debug}] { +if [prepare_for_testing "failed to prepare" $testfile {} {debug}] { return -1 } if ![runto_main] { diff --git a/gdb/testsuite/gdb.btrace/exception.exp b/gdb/testsuite/gdb.btrace/exception.exp index 4462d0443fb..47a89c916d3 100755 --- a/gdb/testsuite/gdb.btrace/exception.exp +++ b/gdb/testsuite/gdb.btrace/exception.exp @@ -22,7 +22,7 @@ if { [skip_btrace_tests] } { return -1 } # start inferior standard_testfile exception.cc -if [prepare_for_testing $testfile.exp $testfile $srcfile {c++ debug}] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile {c++ debug}] { return -1 } if ![runto_main] { diff --git a/gdb/testsuite/gdb.btrace/function_call_history.exp b/gdb/testsuite/gdb.btrace/function_call_history.exp index 7d1e40491d8..b630dbeef75 100644 --- a/gdb/testsuite/gdb.btrace/function_call_history.exp +++ b/gdb/testsuite/gdb.btrace/function_call_history.exp @@ -22,7 +22,7 @@ if { [skip_btrace_tests] } { return -1 } # start inferior standard_testfile -if [prepare_for_testing function_call_history.exp $testfile {} {debug}] { +if [prepare_for_testing "failed to prepare" $testfile {} {debug}] { return -1 } if ![runto_main] { diff --git a/gdb/testsuite/gdb.btrace/gcore.exp b/gdb/testsuite/gdb.btrace/gcore.exp index 3eef2a1f2e6..ece51762957 100644 --- a/gdb/testsuite/gdb.btrace/gcore.exp +++ b/gdb/testsuite/gdb.btrace/gcore.exp @@ -22,7 +22,7 @@ if { [skip_btrace_tests] } { return -1 } # start inferior standard_testfile record_goto.c -if [prepare_for_testing gcore.exp $testfile $srcfile] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { return -1 } diff --git a/gdb/testsuite/gdb.btrace/instruction_history.exp b/gdb/testsuite/gdb.btrace/instruction_history.exp index 58ae77015b2..e56c52e430e 100644 --- a/gdb/testsuite/gdb.btrace/instruction_history.exp +++ b/gdb/testsuite/gdb.btrace/instruction_history.exp @@ -22,7 +22,7 @@ if { [skip_btrace_tests] } { return -1 } # compile and run to main standard_testfile .c .S -if [prepare_for_testing $testfile.exp $testfile "$srcfile $srcfile2" {debug}] { +if [prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" {debug}] { return -1 } if ![runto_main] { diff --git a/gdb/testsuite/gdb.btrace/nohist.exp b/gdb/testsuite/gdb.btrace/nohist.exp index b30921801e0..900b7cc1e12 100644 --- a/gdb/testsuite/gdb.btrace/nohist.exp +++ b/gdb/testsuite/gdb.btrace/nohist.exp @@ -22,7 +22,7 @@ if { [skip_btrace_tests] } { return -1 } # start inferior standard_testfile record_goto.c -if [prepare_for_testing nohist.exp $testfile $srcfile] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { return -1 } diff --git a/gdb/testsuite/gdb.btrace/reconnect.exp b/gdb/testsuite/gdb.btrace/reconnect.exp index 485a4df852c..a95c6cac81c 100644 --- a/gdb/testsuite/gdb.btrace/reconnect.exp +++ b/gdb/testsuite/gdb.btrace/reconnect.exp @@ -23,7 +23,7 @@ if { [skip_btrace_tests] } { return -1 } if { [skip_gdbserver_tests] } { return -1 } standard_testfile -if [prepare_for_testing $testfile.exp $testfile $srcfile] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { return -1 } diff --git a/gdb/testsuite/gdb.btrace/record_goto-step.exp b/gdb/testsuite/gdb.btrace/record_goto-step.exp index 1d0be5ceb76..99b7b863aba 100644 --- a/gdb/testsuite/gdb.btrace/record_goto-step.exp +++ b/gdb/testsuite/gdb.btrace/record_goto-step.exp @@ -23,7 +23,7 @@ if { [skip_btrace_tests] } { return -1 } standard_testfile record_goto.c # start inferior -if [prepare_for_testing record_goto-step.exp $testfile $srcfile] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { return -1 } diff --git a/gdb/testsuite/gdb.btrace/record_goto.exp b/gdb/testsuite/gdb.btrace/record_goto.exp index 7df33bc3dd3..ea4cf694a2d 100644 --- a/gdb/testsuite/gdb.btrace/record_goto.exp +++ b/gdb/testsuite/gdb.btrace/record_goto.exp @@ -44,7 +44,7 @@ if [info exists COMPILE] { return -1 } -if [prepare_for_testing record_goto.exp $testfile $srcfile $opts] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] { return -1 } if ![runto_main] { diff --git a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp b/gdb/testsuite/gdb.btrace/rn-dl-bind.exp index 0f929755421..286b1667449 100644 --- a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp +++ b/gdb/testsuite/gdb.btrace/rn-dl-bind.exp @@ -26,7 +26,7 @@ if { [skip_btrace_tests] } { return -1 } # start inferior standard_testfile -if [prepare_for_testing $testfile.exp $testfile $srcfile {c++ debug}] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile {c++ debug}] { return -1 } if ![runto_main] { diff --git a/gdb/testsuite/gdb.btrace/segv.exp b/gdb/testsuite/gdb.btrace/segv.exp index bc6fd3a8498..811be27f8fc 100644 --- a/gdb/testsuite/gdb.btrace/segv.exp +++ b/gdb/testsuite/gdb.btrace/segv.exp @@ -22,7 +22,7 @@ if { [skip_btrace_tests] } { return -1 } # start inferior standard_testfile -if [prepare_for_testing $testfile.exp $testfile $srcfile] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { return -1 } if ![runto_main] { diff --git a/gdb/testsuite/gdb.btrace/step.exp b/gdb/testsuite/gdb.btrace/step.exp index 1122ff10579..7b1c3786cf5 100644 --- a/gdb/testsuite/gdb.btrace/step.exp +++ b/gdb/testsuite/gdb.btrace/step.exp @@ -23,7 +23,7 @@ if { [skip_btrace_tests] } { return -1 } standard_testfile record_goto.c # start inferior -if [prepare_for_testing step.exp $testfile $srcfile] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { return -1 } diff --git a/gdb/testsuite/gdb.btrace/stepi.exp b/gdb/testsuite/gdb.btrace/stepi.exp index b21e4e570e9..f50c26a3e56 100644 --- a/gdb/testsuite/gdb.btrace/stepi.exp +++ b/gdb/testsuite/gdb.btrace/stepi.exp @@ -43,7 +43,7 @@ if [info exists COMPILE] { } # start inferior -if [prepare_for_testing stepi.exp $testfile $srcfile] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { return -1 } diff --git a/gdb/testsuite/gdb.btrace/tailcall-only.exp b/gdb/testsuite/gdb.btrace/tailcall-only.exp index 494e2e806b2..1def8c4f61a 100644 --- a/gdb/testsuite/gdb.btrace/tailcall-only.exp +++ b/gdb/testsuite/gdb.btrace/tailcall-only.exp @@ -46,7 +46,7 @@ if [info exists COMPILE] { return -1 } -if [prepare_for_testing tailcall-only.exp $testfile $srcfile $opts] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] { return -1 } if ![runto_main] { diff --git a/gdb/testsuite/gdb.btrace/tailcall.exp b/gdb/testsuite/gdb.btrace/tailcall.exp index bc8afc472a7..01518475537 100644 --- a/gdb/testsuite/gdb.btrace/tailcall.exp +++ b/gdb/testsuite/gdb.btrace/tailcall.exp @@ -43,7 +43,7 @@ if [info exists COMPILE] { return -1 } -if [prepare_for_testing tailcall.exp $testfile $srcfile $opts] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] { return -1 } if ![runto_main] { diff --git a/gdb/testsuite/gdb.btrace/tsx.exp b/gdb/testsuite/gdb.btrace/tsx.exp index e501b3a2502..ec1b1978a78 100644 --- a/gdb/testsuite/gdb.btrace/tsx.exp +++ b/gdb/testsuite/gdb.btrace/tsx.exp @@ -20,7 +20,7 @@ if { [skip_tsx_tests] } { return -1 } # compile and run to main standard_testfile .c x86-tsx.S -if [prepare_for_testing tsx.exp $testfile "$srcfile $srcfile2" {debug}] { +if [prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" {debug}] { return -1 } if ![runto_main] { diff --git a/gdb/testsuite/gdb.btrace/unknown_functions.exp b/gdb/testsuite/gdb.btrace/unknown_functions.exp index 9f2d6237d10..284f2d8ec3a 100644 --- a/gdb/testsuite/gdb.btrace/unknown_functions.exp +++ b/gdb/testsuite/gdb.btrace/unknown_functions.exp @@ -25,7 +25,7 @@ standard_testfile # discard local symbols set ldflags "additional_flags=-Wl,-x" -if [prepare_for_testing $testfile.exp $testfile $srcfile $ldflags] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile $ldflags] { return -1 } if ![runto test] { diff --git a/gdb/testsuite/gdb.btrace/vdso.exp b/gdb/testsuite/gdb.btrace/vdso.exp index 3d99cbb78de..88d7fc6ff94 100644 --- a/gdb/testsuite/gdb.btrace/vdso.exp +++ b/gdb/testsuite/gdb.btrace/vdso.exp @@ -25,7 +25,7 @@ if { [skip_btrace_tests] } { return -1 } # start inferior standard_testfile -if [prepare_for_testing $testfile.exp $testfile $srcfile] { +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { return -1 } if ![runto_main] { diff --git a/gdb/testsuite/gdb.compile/compile-ifunc.exp b/gdb/testsuite/gdb.compile/compile-ifunc.exp index 37edd26f09b..d4b3ed294f7 100644 --- a/gdb/testsuite/gdb.compile/compile-ifunc.exp +++ b/gdb/testsuite/gdb.compile/compile-ifunc.exp @@ -17,7 +17,7 @@ standard_testfile with_test_prefix "nodebug" { - if { [prepare_for_testing ${testfile}.exp "$testfile-nodebug" $srcfile {}] } { + if { [prepare_for_testing "failed to prepare" "$testfile-nodebug" $srcfile {}] } { return -1 } @@ -44,7 +44,7 @@ with_test_prefix "nodebug" { with_test_prefix "debug" { - if { [prepare_for_testing ${testfile}.exp "$testfile-debug" $srcfile] } { + if { [prepare_for_testing "failed to prepare" "$testfile-debug" $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.compile/compile-ops.exp b/gdb/testsuite/gdb.compile/compile-ops.exp index 7a343abf4c5..7d3ee1d581d 100644 --- a/gdb/testsuite/gdb.compile/compile-ops.exp +++ b/gdb/testsuite/gdb.compile/compile-ops.exp @@ -401,7 +401,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.compile/compile-print.exp b/gdb/testsuite/gdb.compile/compile-print.exp index 6fc7a20411b..542549e0cd4 100644 --- a/gdb/testsuite/gdb.compile/compile-print.exp +++ b/gdb/testsuite/gdb.compile/compile-print.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp "$testfile"] } { +if { [prepare_for_testing "failed to prepare" "$testfile"] } { return -1 } diff --git a/gdb/testsuite/gdb.compile/compile-setjmp.exp b/gdb/testsuite/gdb.compile/compile-setjmp.exp index c0dd0e0753d..8c9d4a5a2b0 100644 --- a/gdb/testsuite/gdb.compile/compile-setjmp.exp +++ b/gdb/testsuite/gdb.compile/compile-setjmp.exp @@ -15,7 +15,7 @@ standard_testfile .c compile-setjmp-mod.c -if { [prepare_for_testing ${testfile}.exp $testfile] } { +if { [prepare_for_testing "failed to prepare" $testfile] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/abstract-origin.exp b/gdb/testsuite/gdb.cp/abstract-origin.exp index 920145118c8..6f7f2984b62 100644 --- a/gdb/testsuite/gdb.cp/abstract-origin.exp +++ b/gdb/testsuite/gdb.cp/abstract-origin.exp @@ -15,7 +15,7 @@ standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/ambiguous.exp b/gdb/testsuite/gdb.cp/ambiguous.exp index 3b20d89d009..82a4b95dd6a 100644 --- a/gdb/testsuite/gdb.cp/ambiguous.exp +++ b/gdb/testsuite/gdb.cp/ambiguous.exp @@ -35,7 +35,7 @@ if [get_compiler_info "c++"] { if { [test_compiler_info gcc-*] } then { continue } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp index 549fd8c3d02..bec4d278df5 100644 --- a/gdb/testsuite/gdb.cp/annota2.exp +++ b/gdb/testsuite/gdb.cp/annota2.exp @@ -24,7 +24,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ {debug c++ nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/annota3.exp b/gdb/testsuite/gdb.cp/annota3.exp index a8bad4fe4a8..8bee1497974 100644 --- a/gdb/testsuite/gdb.cp/annota3.exp +++ b/gdb/testsuite/gdb.cp/annota3.exp @@ -24,7 +24,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ {debug c++ nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/anon-ns.exp b/gdb/testsuite/gdb.cp/anon-ns.exp index 3b2d1e81b30..c0f29940c61 100644 --- a/gdb/testsuite/gdb.cp/anon-ns.exp +++ b/gdb/testsuite/gdb.cp/anon-ns.exp @@ -21,7 +21,7 @@ if {[skip_cplus_tests]} { continue } standard_testfile .cc anon-ns2.cc -if {[prepare_for_testing $testfile $testfile "$srcfile $srcfile2" {c++ debug}]} { +if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" {c++ debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/anon-struct.exp b/gdb/testsuite/gdb.cp/anon-struct.exp index 624d5606653..76f4ecfc847 100644 --- a/gdb/testsuite/gdb.cp/anon-struct.exp +++ b/gdb/testsuite/gdb.cp/anon-struct.exp @@ -16,7 +16,7 @@ standard_testfile .cc -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/anon-union.exp b/gdb/testsuite/gdb.cp/anon-union.exp index ebbe01da927..c3a9c4923db 100644 --- a/gdb/testsuite/gdb.cp/anon-union.exp +++ b/gdb/testsuite/gdb.cp/anon-union.exp @@ -27,7 +27,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/arg-reference.exp b/gdb/testsuite/gdb.cp/arg-reference.exp index e43ad943736..4af886e7a6e 100644 --- a/gdb/testsuite/gdb.cp/arg-reference.exp +++ b/gdb/testsuite/gdb.cp/arg-reference.exp @@ -26,7 +26,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/baseenum.exp b/gdb/testsuite/gdb.cp/baseenum.exp index 16de7d243b4..0f0dfe7c9aa 100644 --- a/gdb/testsuite/gdb.cp/baseenum.exp +++ b/gdb/testsuite/gdb.cp/baseenum.exp @@ -17,7 +17,7 @@ standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/bool.exp b/gdb/testsuite/gdb.cp/bool.exp index 2b07d8e8e77..f41819fa5a4 100644 --- a/gdb/testsuite/gdb.cp/bool.exp +++ b/gdb/testsuite/gdb.cp/bool.exp @@ -25,7 +25,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/breakpoint.exp b/gdb/testsuite/gdb.cp/breakpoint.exp index 97e5ab55224..5c2fe50727b 100644 --- a/gdb/testsuite/gdb.cp/breakpoint.exp +++ b/gdb/testsuite/gdb.cp/breakpoint.exp @@ -29,7 +29,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/bs15503.exp b/gdb/testsuite/gdb.cp/bs15503.exp index 117ccb2d4ed..bf49c5ba4b3 100644 --- a/gdb/testsuite/gdb.cp/bs15503.exp +++ b/gdb/testsuite/gdb.cp/bs15503.exp @@ -30,7 +30,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/call-c.exp b/gdb/testsuite/gdb.cp/call-c.exp index d2c74e35e3b..7e4a9880f86 100644 --- a/gdb/testsuite/gdb.cp/call-c.exp +++ b/gdb/testsuite/gdb.cp/call-c.exp @@ -23,7 +23,7 @@ set objfilecpp [standard_output_file ${testfile}.o] if {[gdb_compile "$srcdir/$subdir/${srcfile2}" "${objfilec}" object {debug}] != "" || [gdb_compile "$srcdir/$subdir/${srcfile}" "${objfilecpp}" object {c++ debug}] != "" || [gdb_compile "${objfilecpp} ${objfilec}" "${binfile}" executable {c++ debug}] != ""} { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.cp/casts.exp b/gdb/testsuite/gdb.cp/casts.exp index 57a56b8198c..e60c469ec08 100644 --- a/gdb/testsuite/gdb.cp/casts.exp +++ b/gdb/testsuite/gdb.cp/casts.exp @@ -33,7 +33,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } @@ -173,7 +173,7 @@ gdb_test "print dynamic_cast<Gamma *> (add)" \ " = \\(Gamma \\*\\) $nonzero_hex" \ "dynamic_cast to sibling" -if {[prepare_for_testing $testfile.exp ${testfile}03 $srcfile2 \ +if {[prepare_for_testing "failed to prepare" ${testfile}03 $srcfile2 \ {debug c++ additional_flags=-std=c++03}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/chained-calls.exp b/gdb/testsuite/gdb.cp/chained-calls.exp index 0d775db560f..dcd0ce85098 100644 --- a/gdb/testsuite/gdb.cp/chained-calls.exp +++ b/gdb/testsuite/gdb.cp/chained-calls.exp @@ -19,7 +19,7 @@ if {[skip_cplus_tests]} { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/class2.exp b/gdb/testsuite/gdb.cp/class2.exp index eabb2f2931a..c7fc2d19084 100644 --- a/gdb/testsuite/gdb.cp/class2.exp +++ b/gdb/testsuite/gdb.cp/class2.exp @@ -24,7 +24,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/classes.exp b/gdb/testsuite/gdb.cp/classes.exp index 005548f1162..4c550e74462 100644 --- a/gdb/testsuite/gdb.cp/classes.exp +++ b/gdb/testsuite/gdb.cp/classes.exp @@ -24,7 +24,7 @@ load_lib "cp-support.exp" standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/cmpd-minsyms.exp b/gdb/testsuite/gdb.cp/cmpd-minsyms.exp index 9dfe4981324..bd2ed12f836 100644 --- a/gdb/testsuite/gdb.cp/cmpd-minsyms.exp +++ b/gdb/testsuite/gdb.cp/cmpd-minsyms.exp @@ -23,7 +23,7 @@ if {[skip_cplus_tests]} { continue } standard_testfile .cc # Do NOT compile with debug flag. -if {[prepare_for_testing $testfile $testfile $srcfile {c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/converts.exp b/gdb/testsuite/gdb.cp/converts.exp index 34f30a4bd24..47fdc6734ec 100644 --- a/gdb/testsuite/gdb.cp/converts.exp +++ b/gdb/testsuite/gdb.cp/converts.exp @@ -15,7 +15,7 @@ standard_testfile .cc -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/cp-relocate.exp b/gdb/testsuite/gdb.cp/cp-relocate.exp index 8fe25f306b5..e5d969999c4 100644 --- a/gdb/testsuite/gdb.cp/cp-relocate.exp +++ b/gdb/testsuite/gdb.cp/cp-relocate.exp @@ -21,7 +21,7 @@ append binfile .o if { [skip_cplus_tests] } { continue } if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {c++ debug}] != "" } { - untested cp-relocate.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.cp/cpcompletion.exp b/gdb/testsuite/gdb.cp/cpcompletion.exp index 32121405ae7..35efe7b2bef 100644 --- a/gdb/testsuite/gdb.cp/cpcompletion.exp +++ b/gdb/testsuite/gdb.cp/cpcompletion.exp @@ -53,7 +53,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile pr9594.cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/cpexprs.exp b/gdb/testsuite/gdb.cp/cpexprs.exp index 1acd8753e09..a7984d7b25b 100644 --- a/gdb/testsuite/gdb.cp/cpexprs.exp +++ b/gdb/testsuite/gdb.cp/cpexprs.exp @@ -692,7 +692,7 @@ if {[get_compiler_info "c++"]} { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/cplabel.exp b/gdb/testsuite/gdb.cp/cplabel.exp index caa152adda7..cf7b67eefe4 100644 --- a/gdb/testsuite/gdb.cp/cplabel.exp +++ b/gdb/testsuite/gdb.cp/cplabel.exp @@ -19,7 +19,7 @@ if {[skip_cplus_tests]} { continue } standard_testfile .cc -if {[prepare_for_testing "$testfile.exp" $testfile $srcfile {c++ debug}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {c++ debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp index fb9df5caf9d..b39e99abcb4 100644 --- a/gdb/testsuite/gdb.cp/cplusfuncs.exp +++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp @@ -24,7 +24,7 @@ if { [get_compiler_info "c++"] } { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/cpsizeof.exp b/gdb/testsuite/gdb.cp/cpsizeof.exp index de95c4902c8..da713b84a25 100644 --- a/gdb/testsuite/gdb.cp/cpsizeof.exp +++ b/gdb/testsuite/gdb.cp/cpsizeof.exp @@ -18,7 +18,7 @@ standard_testfile .cc if {[skip_cplus_tests]} { continue } -if {[prepare_for_testing ${testfile}.exp $testfile $srcfile {debug c++}] } { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/ctti.exp b/gdb/testsuite/gdb.cp/ctti.exp index 0d1c43b41f6..b23f6ffcaeb 100644 --- a/gdb/testsuite/gdb.cp/ctti.exp +++ b/gdb/testsuite/gdb.cp/ctti.exp @@ -29,7 +29,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2 $srcfile3 $srcfile4] {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/derivation.exp b/gdb/testsuite/gdb.cp/derivation.exp index 645c2b8769e..d306a48acab 100644 --- a/gdb/testsuite/gdb.cp/derivation.exp +++ b/gdb/testsuite/gdb.cp/derivation.exp @@ -34,7 +34,7 @@ load_lib "cp-support.exp" standard_testfile derivation.cc derivation2.cc -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/destrprint.exp b/gdb/testsuite/gdb.cp/destrprint.exp index 6c3aee42550..65ffa3bb00f 100644 --- a/gdb/testsuite/gdb.cp/destrprint.exp +++ b/gdb/testsuite/gdb.cp/destrprint.exp @@ -15,7 +15,7 @@ standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/dispcxx.exp b/gdb/testsuite/gdb.cp/dispcxx.exp index 0be6b78087d..8cfdd4b07e5 100644 --- a/gdb/testsuite/gdb.cp/dispcxx.exp +++ b/gdb/testsuite/gdb.cp/dispcxx.exp @@ -22,7 +22,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/enum-class.exp b/gdb/testsuite/gdb.cp/enum-class.exp index f6e5a8f93b0..745c96359de 100644 --- a/gdb/testsuite/gdb.cp/enum-class.exp +++ b/gdb/testsuite/gdb.cp/enum-class.exp @@ -19,7 +19,7 @@ if {[skip_cplus_tests]} { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ {debug c++ additional_flags=-std=c++11}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/exception.exp b/gdb/testsuite/gdb.cp/exception.exp index 81fde049c4d..71445a45c14 100644 --- a/gdb/testsuite/gdb.cp/exception.exp +++ b/gdb/testsuite/gdb.cp/exception.exp @@ -42,7 +42,7 @@ if { [istarget "spu*-*-*"] } { standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/exceptprint.exp b/gdb/testsuite/gdb.cp/exceptprint.exp index b2cc3d2aed3..34c46d016d8 100644 --- a/gdb/testsuite/gdb.cp/exceptprint.exp +++ b/gdb/testsuite/gdb.cp/exceptprint.exp @@ -19,7 +19,7 @@ if {[skip_cplus_tests]} { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp b/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp index 5e75fe936bb..ca8b96d73f3 100644 --- a/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp +++ b/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp @@ -20,7 +20,7 @@ standard_testfile .cc set executable ${testfile} if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug c++} ] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.cp/expand-sals.exp b/gdb/testsuite/gdb.cp/expand-sals.exp index 8188f3dbd15..f735160a587 100644 --- a/gdb/testsuite/gdb.cp/expand-sals.exp +++ b/gdb/testsuite/gdb.cp/expand-sals.exp @@ -16,7 +16,7 @@ if { [skip_cplus_tests] } { continue } set srcfile expand-sals.cc -if { [prepare_for_testing expand-sals.exp expand-sals $srcfile {debug c++}] } { +if { [prepare_for_testing "failed to prepare" expand-sals $srcfile {debug c++}] } { return -1 } if ![runto_main] { diff --git a/gdb/testsuite/gdb.cp/extern-c.exp b/gdb/testsuite/gdb.cp/extern-c.exp index d4b5346168b..4a622451f5e 100644 --- a/gdb/testsuite/gdb.cp/extern-c.exp +++ b/gdb/testsuite/gdb.cp/extern-c.exp @@ -19,7 +19,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/filename.exp b/gdb/testsuite/gdb.cp/filename.exp index 805c697d541..20a76513ce1 100644 --- a/gdb/testsuite/gdb.cp/filename.exp +++ b/gdb/testsuite/gdb.cp/filename.exp @@ -17,7 +17,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/formatted-ref.exp b/gdb/testsuite/gdb.cp/formatted-ref.exp index 2ca7cb3ad87..7cf4b9ebe8a 100644 --- a/gdb/testsuite/gdb.cp/formatted-ref.exp +++ b/gdb/testsuite/gdb.cp/formatted-ref.exp @@ -32,7 +32,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/fpointer.exp b/gdb/testsuite/gdb.cp/fpointer.exp index b30633c7dac..9aa54c8ff15 100644 --- a/gdb/testsuite/gdb.cp/fpointer.exp +++ b/gdb/testsuite/gdb.cp/fpointer.exp @@ -18,7 +18,7 @@ standard_testfile .cc -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/gdb1355.exp b/gdb/testsuite/gdb.cp/gdb1355.exp index 9a19ab5314f..00332ce3954 100644 --- a/gdb/testsuite/gdb.cp/gdb1355.exp +++ b/gdb/testsuite/gdb.cp/gdb1355.exp @@ -33,7 +33,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb2495.exp index ac743828347..98b3e5ecf44 100644 --- a/gdb/testsuite/gdb.cp/gdb2495.exp +++ b/gdb/testsuite/gdb.cp/gdb2495.exp @@ -58,7 +58,7 @@ if [target_info exists gdb,cannot_call_functions] { continue } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/hang.exp b/gdb/testsuite/gdb.cp/hang.exp index ab43c7b951d..7f5aae3d33f 100644 --- a/gdb/testsuite/gdb.cp/hang.exp +++ b/gdb/testsuite/gdb.cp/hang.exp @@ -18,7 +18,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile hang1.cc hang2.cc hang3.cc -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2 $srcfile3] {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/impl-this.exp b/gdb/testsuite/gdb.cp/impl-this.exp index 4f4a1d4ebbd..1c5d0573079 100644 --- a/gdb/testsuite/gdb.cp/impl-this.exp +++ b/gdb/testsuite/gdb.cp/impl-this.exp @@ -22,7 +22,7 @@ if {[skip_cplus_tests]} { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/infcall-dlopen.exp b/gdb/testsuite/gdb.cp/infcall-dlopen.exp index 25ead401f23..0d618d31704 100644 --- a/gdb/testsuite/gdb.cp/infcall-dlopen.exp +++ b/gdb/testsuite/gdb.cp/infcall-dlopen.exp @@ -27,7 +27,7 @@ set lib_dlopen [shlib_target_file ${testfile}.so] # Use completely arbitrary file for $libfile source. if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile2} ${libfile} {debug c++}] != "" - || [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++ shlib_load}] } { + || [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++ shlib_load}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/inherit.exp b/gdb/testsuite/gdb.cp/inherit.exp index 0c976390aef..c3758178b07 100644 --- a/gdb/testsuite/gdb.cp/inherit.exp +++ b/gdb/testsuite/gdb.cp/inherit.exp @@ -26,7 +26,7 @@ load_lib "cp-support.exp" standard_testfile misc.cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/iostream.exp b/gdb/testsuite/gdb.cp/iostream.exp index 6ac402194b4..8a72706376e 100644 --- a/gdb/testsuite/gdb.cp/iostream.exp +++ b/gdb/testsuite/gdb.cp/iostream.exp @@ -20,7 +20,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/koenig.exp b/gdb/testsuite/gdb.cp/koenig.exp index 60baba4ae94..61d43588a31 100644 --- a/gdb/testsuite/gdb.cp/koenig.exp +++ b/gdb/testsuite/gdb.cp/koenig.exp @@ -15,7 +15,7 @@ standard_testfile .cc -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/local.exp b/gdb/testsuite/gdb.cp/local.exp index da63312e43d..6e773e12bbb 100644 --- a/gdb/testsuite/gdb.cp/local.exp +++ b/gdb/testsuite/gdb.cp/local.exp @@ -35,7 +35,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/m-data.exp b/gdb/testsuite/gdb.cp/m-data.exp index 7166740b33c..ed1dc6ccb7a 100644 --- a/gdb/testsuite/gdb.cp/m-data.exp +++ b/gdb/testsuite/gdb.cp/m-data.exp @@ -30,7 +30,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp index 9c73c69a16c..e5d8ac4693a 100644 --- a/gdb/testsuite/gdb.cp/m-static.exp +++ b/gdb/testsuite/gdb.cp/m-static.exp @@ -31,7 +31,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/mb-ctor.exp b/gdb/testsuite/gdb.cp/mb-ctor.exp index 4d7ad65ca63..9bcbda850e7 100644 --- a/gdb/testsuite/gdb.cp/mb-ctor.exp +++ b/gdb/testsuite/gdb.cp/mb-ctor.exp @@ -25,7 +25,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/mb-inline.exp b/gdb/testsuite/gdb.cp/mb-inline.exp index 7f4a874024a..e49646ad0a9 100644 --- a/gdb/testsuite/gdb.cp/mb-inline.exp +++ b/gdb/testsuite/gdb.cp/mb-inline.exp @@ -27,7 +27,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/mb-templates.exp b/gdb/testsuite/gdb.cp/mb-templates.exp index a17adf03d6d..eb512807db4 100644 --- a/gdb/testsuite/gdb.cp/mb-templates.exp +++ b/gdb/testsuite/gdb.cp/mb-templates.exp @@ -30,7 +30,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/member-name.exp b/gdb/testsuite/gdb.cp/member-name.exp index 43401e2b429..6f56fa4fa27 100644 --- a/gdb/testsuite/gdb.cp/member-name.exp +++ b/gdb/testsuite/gdb.cp/member-name.exp @@ -17,7 +17,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/member-ptr.exp b/gdb/testsuite/gdb.cp/member-ptr.exp index 35b29d241f9..920812d1b01 100644 --- a/gdb/testsuite/gdb.cp/member-ptr.exp +++ b/gdb/testsuite/gdb.cp/member-ptr.exp @@ -30,7 +30,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/meth-typedefs.exp b/gdb/testsuite/gdb.cp/meth-typedefs.exp index 09b2ae23267..ac9a2e3a0b0 100644 --- a/gdb/testsuite/gdb.cp/meth-typedefs.exp +++ b/gdb/testsuite/gdb.cp/meth-typedefs.exp @@ -35,7 +35,7 @@ if {[skip_cplus_tests]} { continue } # Tests for c++/12266 et al standard_testfile .cc -if {[prepare_for_testing $testfile $testfile $srcfile {c++ debug}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {c++ debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/method.exp b/gdb/testsuite/gdb.cp/method.exp index 409f1adf930..8989df9d87c 100644 --- a/gdb/testsuite/gdb.cp/method.exp +++ b/gdb/testsuite/gdb.cp/method.exp @@ -40,7 +40,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/method2.exp b/gdb/testsuite/gdb.cp/method2.exp index 5204a3988b3..c4b7ddd2e29 100644 --- a/gdb/testsuite/gdb.cp/method2.exp +++ b/gdb/testsuite/gdb.cp/method2.exp @@ -22,8 +22,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { - untested "failed to compile" +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/minsym-fallback.exp b/gdb/testsuite/gdb.cp/minsym-fallback.exp index 0ed9a55fbf8..58b6a1a5e4c 100644 --- a/gdb/testsuite/gdb.cp/minsym-fallback.exp +++ b/gdb/testsuite/gdb.cp/minsym-fallback.exp @@ -25,7 +25,7 @@ set objmainfile [standard_output_file ${testfile}-main.o] if {[gdb_compile $srcdir/$subdir/$srcfile $objfile object {}] != "" || [gdb_compile $srcdir/$subdir/$srcfile2 $objmainfile object {debug}] != "" || [gdb_compile "$objfile $objmainfile" $binfile executable {c++}] != ""} { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.cp/misc.exp b/gdb/testsuite/gdb.cp/misc.exp index f6d13b62069..5a6089dce41 100644 --- a/gdb/testsuite/gdb.cp/misc.exp +++ b/gdb/testsuite/gdb.cp/misc.exp @@ -19,7 +19,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/namelessclass.exp b/gdb/testsuite/gdb.cp/namelessclass.exp index 27e1c097d4f..196f1f1c25c 100644 --- a/gdb/testsuite/gdb.cp/namelessclass.exp +++ b/gdb/testsuite/gdb.cp/namelessclass.exp @@ -35,7 +35,7 @@ if {![istarget "x86_64-*-*"] || ![is_lp64_target]} { standard_testfile .S set csrcfile "${testfile}.cc" -if {[prepare_for_testing $testfile.exp $testfile $srcfile {nodebug}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/namespace-enum.exp b/gdb/testsuite/gdb.cp/namespace-enum.exp index 45361d65c39..25f8ca7bc01 100644 --- a/gdb/testsuite/gdb.cp/namespace-enum.exp +++ b/gdb/testsuite/gdb.cp/namespace-enum.exp @@ -15,7 +15,7 @@ standard_testfile .cc namespace-enum-main.cc -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/namespace-nested-import.exp b/gdb/testsuite/gdb.cp/namespace-nested-import.exp index 6c418dd3a0e..58b527f731e 100644 --- a/gdb/testsuite/gdb.cp/namespace-nested-import.exp +++ b/gdb/testsuite/gdb.cp/namespace-nested-import.exp @@ -16,7 +16,7 @@ standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp index 7a10aa4743e..d5f66ae5aac 100644 --- a/gdb/testsuite/gdb.cp/namespace.exp +++ b/gdb/testsuite/gdb.cp/namespace.exp @@ -40,7 +40,7 @@ if {[test_compiler_info {gcc-[0-3]-*}] set xfail_class_types 1 } -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/nextoverthrow.exp b/gdb/testsuite/gdb.cp/nextoverthrow.exp index 6d36c3fa833..09da1f9dfc2 100644 --- a/gdb/testsuite/gdb.cp/nextoverthrow.exp +++ b/gdb/testsuite/gdb.cp/nextoverthrow.exp @@ -25,7 +25,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/no-dmgl-verbose.exp b/gdb/testsuite/gdb.cp/no-dmgl-verbose.exp index 70bf8cc92e0..4d82f257e4e 100644 --- a/gdb/testsuite/gdb.cp/no-dmgl-verbose.exp +++ b/gdb/testsuite/gdb.cp/no-dmgl-verbose.exp @@ -20,7 +20,7 @@ standard_testfile .cc if { [skip_cplus_tests] } { continue } if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}.o" object {c++ debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.cp/non-trivial-retval.exp b/gdb/testsuite/gdb.cp/non-trivial-retval.exp index 5772bbc4d41..98027b77661 100644 --- a/gdb/testsuite/gdb.cp/non-trivial-retval.exp +++ b/gdb/testsuite/gdb.cp/non-trivial-retval.exp @@ -19,7 +19,7 @@ if {[skip_cplus_tests]} { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/noparam.exp b/gdb/testsuite/gdb.cp/noparam.exp index 750bf7ab1bf..b69c932a796 100644 --- a/gdb/testsuite/gdb.cp/noparam.exp +++ b/gdb/testsuite/gdb.cp/noparam.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 { [prepare_for_testing noparam.exp "noparam" "noparam.cc" {debug c++}] } { +if { [prepare_for_testing "failed to prepare" "noparam" "noparam.cc" {debug c++}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/nsdecl.exp b/gdb/testsuite/gdb.cp/nsdecl.exp index c43ba647365..d8bbb3ef42c 100644 --- a/gdb/testsuite/gdb.cp/nsdecl.exp +++ b/gdb/testsuite/gdb.cp/nsdecl.exp @@ -22,7 +22,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/nsimport.exp b/gdb/testsuite/gdb.cp/nsimport.exp index 8700d9a84fc..a1650ac057f 100644 --- a/gdb/testsuite/gdb.cp/nsimport.exp +++ b/gdb/testsuite/gdb.cp/nsimport.exp @@ -19,7 +19,7 @@ standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/nsnested.exp b/gdb/testsuite/gdb.cp/nsnested.exp index 88fb8e68f9a..dcce67dc233 100644 --- a/gdb/testsuite/gdb.cp/nsnested.exp +++ b/gdb/testsuite/gdb.cp/nsnested.exp @@ -15,7 +15,7 @@ standard_testfile .cc -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/nsnoimports.exp b/gdb/testsuite/gdb.cp/nsnoimports.exp index 938c88b3630..75a404ea350 100644 --- a/gdb/testsuite/gdb.cp/nsnoimports.exp +++ b/gdb/testsuite/gdb.cp/nsnoimports.exp @@ -15,7 +15,7 @@ standard_testfile .cc -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/nsrecurs.exp b/gdb/testsuite/gdb.cp/nsrecurs.exp index 330f6fc91fe..feec61868b3 100644 --- a/gdb/testsuite/gdb.cp/nsrecurs.exp +++ b/gdb/testsuite/gdb.cp/nsrecurs.exp @@ -20,7 +20,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/nsstress.exp b/gdb/testsuite/gdb.cp/nsstress.exp index c6a7291b3f9..c903b1c9300 100644 --- a/gdb/testsuite/gdb.cp/nsstress.exp +++ b/gdb/testsuite/gdb.cp/nsstress.exp @@ -22,7 +22,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/nsusing.exp b/gdb/testsuite/gdb.cp/nsusing.exp index cb69044c28a..77f26cff70d 100644 --- a/gdb/testsuite/gdb.cp/nsusing.exp +++ b/gdb/testsuite/gdb.cp/nsusing.exp @@ -20,7 +20,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/operator.exp b/gdb/testsuite/gdb.cp/operator.exp index dc3d39a190c..769a92235c1 100644 --- a/gdb/testsuite/gdb.cp/operator.exp +++ b/gdb/testsuite/gdb.cp/operator.exp @@ -15,7 +15,7 @@ standard_testfile .cc -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/oranking.exp b/gdb/testsuite/gdb.cp/oranking.exp index 3e9aa0ed5f4..ca76ed55994 100644 --- a/gdb/testsuite/gdb.cp/oranking.exp +++ b/gdb/testsuite/gdb.cp/oranking.exp @@ -15,7 +15,7 @@ standard_testfile .cc -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/overload-const.exp b/gdb/testsuite/gdb.cp/overload-const.exp index b927534db9e..84df0c17d9a 100644 --- a/gdb/testsuite/gdb.cp/overload-const.exp +++ b/gdb/testsuite/gdb.cp/overload-const.exp @@ -19,7 +19,7 @@ if {[skip_cplus_tests]} { continue } standard_testfile .cc -if {[prepare_for_testing $testfile $testfile $testfile.cc {c++ debug}]} { +if {[prepare_for_testing "failed to prepare" $testfile $testfile.cc {c++ debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/overload.exp b/gdb/testsuite/gdb.cp/overload.exp index 0cfa6384867..78f9836aaf9 100644 --- a/gdb/testsuite/gdb.cp/overload.exp +++ b/gdb/testsuite/gdb.cp/overload.exp @@ -28,7 +28,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovldbreak.exp index 2c1ff6c9908..78bafb437f9 100644 --- a/gdb/testsuite/gdb.cp/ovldbreak.exp +++ b/gdb/testsuite/gdb.cp/ovldbreak.exp @@ -32,7 +32,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/ovsrch.exp b/gdb/testsuite/gdb.cp/ovsrch.exp index e0f77884cd0..dd33e2eea38 100644 --- a/gdb/testsuite/gdb.cp/ovsrch.exp +++ b/gdb/testsuite/gdb.cp/ovsrch.exp @@ -57,7 +57,7 @@ if { [skip_cplus_tests] } { continue } # Test for c++/11734 standard_testfile ovsrch1.cc ovsrch2.cc ovsrch3.cc ovsrch4.cc -if {[prepare_for_testing $testfile $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2 $srcfile3 $srcfile4] {c++ debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/paren-type.exp b/gdb/testsuite/gdb.cp/paren-type.exp index 6b301051156..056ec0bd9e3 100644 --- a/gdb/testsuite/gdb.cp/paren-type.exp +++ b/gdb/testsuite/gdb.cp/paren-type.exp @@ -15,7 +15,7 @@ standard_testfile .cc -if { [prepare_for_testing ${testfile}.exp ${testfile} ${testfile}.cc {c++ debug}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${testfile}.cc {c++ debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/parse-lang.exp b/gdb/testsuite/gdb.cp/parse-lang.exp index be26212a6b1..c901c65f59a 100644 --- a/gdb/testsuite/gdb.cp/parse-lang.exp +++ b/gdb/testsuite/gdb.cp/parse-lang.exp @@ -15,7 +15,7 @@ standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/pass-by-ref.exp b/gdb/testsuite/gdb.cp/pass-by-ref.exp index 248645addc0..7e5dd091cf7 100644 --- a/gdb/testsuite/gdb.cp/pass-by-ref.exp +++ b/gdb/testsuite/gdb.cp/pass-by-ref.exp @@ -20,7 +20,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/pr-1023.exp b/gdb/testsuite/gdb.cp/pr-1023.exp index ff4cd91a072..f44b7af6115 100644 --- a/gdb/testsuite/gdb.cp/pr-1023.exp +++ b/gdb/testsuite/gdb.cp/pr-1023.exp @@ -30,7 +30,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/pr-1210.exp b/gdb/testsuite/gdb.cp/pr-1210.exp index 753aaa7af78..b4a81a4aef5 100644 --- a/gdb/testsuite/gdb.cp/pr-1210.exp +++ b/gdb/testsuite/gdb.cp/pr-1210.exp @@ -29,7 +29,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/pr-574.exp b/gdb/testsuite/gdb.cp/pr-574.exp index 178bfda1fa8..e5edde0bd6e 100644 --- a/gdb/testsuite/gdb.cp/pr-574.exp +++ b/gdb/testsuite/gdb.cp/pr-574.exp @@ -32,7 +32,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/pr10687.exp b/gdb/testsuite/gdb.cp/pr10687.exp index 385e64a3ef7..03339b508a0 100644 --- a/gdb/testsuite/gdb.cp/pr10687.exp +++ b/gdb/testsuite/gdb.cp/pr10687.exp @@ -15,7 +15,7 @@ standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/pr12028.exp b/gdb/testsuite/gdb.cp/pr12028.exp index 1f09d382d7d..b3ef03bdd60 100644 --- a/gdb/testsuite/gdb.cp/pr12028.exp +++ b/gdb/testsuite/gdb.cp/pr12028.exp @@ -15,7 +15,7 @@ standard_testfile .cc -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/pr17132.exp b/gdb/testsuite/gdb.cp/pr17132.exp index b15abef2313..4e9a6fba613 100644 --- a/gdb/testsuite/gdb.cp/pr17132.exp +++ b/gdb/testsuite/gdb.cp/pr17132.exp @@ -19,7 +19,7 @@ if {[skip_cplus_tests]} { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/pr17494.exp b/gdb/testsuite/gdb.cp/pr17494.exp index 38fda24b38c..15f649fdb52 100644 --- a/gdb/testsuite/gdb.cp/pr17494.exp +++ b/gdb/testsuite/gdb.cp/pr17494.exp @@ -19,7 +19,7 @@ if {[skip_cplus_tests]} { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/pr9067.exp b/gdb/testsuite/gdb.cp/pr9067.exp index 0682aba333b..330bcf458fb 100644 --- a/gdb/testsuite/gdb.cp/pr9067.exp +++ b/gdb/testsuite/gdb.cp/pr9067.exp @@ -21,7 +21,7 @@ load_lib "cp-support.exp" standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/pr9167.exp b/gdb/testsuite/gdb.cp/pr9167.exp index cdd7d2a4e10..b78f3602561 100644 --- a/gdb/testsuite/gdb.cp/pr9167.exp +++ b/gdb/testsuite/gdb.cp/pr9167.exp @@ -20,7 +20,7 @@ if { [istarget "spu*-*-*"] } { standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/pr9631.exp b/gdb/testsuite/gdb.cp/pr9631.exp index 7525c1e2133..27acc145f46 100644 --- a/gdb/testsuite/gdb.cp/pr9631.exp +++ b/gdb/testsuite/gdb.cp/pr9631.exp @@ -23,7 +23,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/printmethod.exp b/gdb/testsuite/gdb.cp/printmethod.exp index d0b0c9d5b34..db6fcca7c32 100644 --- a/gdb/testsuite/gdb.cp/printmethod.exp +++ b/gdb/testsuite/gdb.cp/printmethod.exp @@ -31,7 +31,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/psmang.exp b/gdb/testsuite/gdb.cp/psmang.exp index 3d10ccae6ff..6d873b191e0 100644 --- a/gdb/testsuite/gdb.cp/psmang.exp +++ b/gdb/testsuite/gdb.cp/psmang.exp @@ -184,7 +184,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/psymtab-parameter.exp b/gdb/testsuite/gdb.cp/psymtab-parameter.exp index 9f981d89592..55528e0c4f5 100644 --- a/gdb/testsuite/gdb.cp/psymtab-parameter.exp +++ b/gdb/testsuite/gdb.cp/psymtab-parameter.exp @@ -18,7 +18,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}.x" object {debug c++}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.cp/ptype-cv-cp.exp b/gdb/testsuite/gdb.cp/ptype-cv-cp.exp index b66d12180f5..96cb230110d 100644 --- a/gdb/testsuite/gdb.cp/ptype-cv-cp.exp +++ b/gdb/testsuite/gdb.cp/ptype-cv-cp.exp @@ -19,7 +19,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/ptype-flags.exp b/gdb/testsuite/gdb.cp/ptype-flags.exp index ad3f59c3c32..f49c5981932 100644 --- a/gdb/testsuite/gdb.cp/ptype-flags.exp +++ b/gdb/testsuite/gdb.cp/ptype-flags.exp @@ -21,7 +21,7 @@ load_lib "cp-support.exp" standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/re-set-overloaded.exp b/gdb/testsuite/gdb.cp/re-set-overloaded.exp index 3d5d6070e25..3113b42f328 100644 --- a/gdb/testsuite/gdb.cp/re-set-overloaded.exp +++ b/gdb/testsuite/gdb.cp/re-set-overloaded.exp @@ -28,7 +28,7 @@ if [get_compiler_info "c++"] { if { [gdb_compile_shlib $srcdir/$subdir/$srcfile2 $sofile {debug c++}] != "" || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list debug "c++" shlib=${sofile}]] != ""} { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.cp/ref-types.exp b/gdb/testsuite/gdb.cp/ref-types.exp index 3b557f91d90..66df7a64e91 100644 --- a/gdb/testsuite/gdb.cp/ref-types.exp +++ b/gdb/testsuite/gdb.cp/ref-types.exp @@ -24,7 +24,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/rtti.exp b/gdb/testsuite/gdb.cp/rtti.exp index 4969c4bf0a0..8ec8235ea4c 100644 --- a/gdb/testsuite/gdb.cp/rtti.exp +++ b/gdb/testsuite/gdb.cp/rtti.exp @@ -38,7 +38,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/scope-err.exp b/gdb/testsuite/gdb.cp/scope-err.exp index 7b11fad229d..6981da9952a 100644 --- a/gdb/testsuite/gdb.cp/scope-err.exp +++ b/gdb/testsuite/gdb.cp/scope-err.exp @@ -23,7 +23,7 @@ if {[skip_cplus_tests]} { standard_testfile .cc set exefile $testfile -if {[prepare_for_testing $testfile $exefile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $exefile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/shadow.exp b/gdb/testsuite/gdb.cp/shadow.exp index bdd02b253c0..37d5467f581 100644 --- a/gdb/testsuite/gdb.cp/shadow.exp +++ b/gdb/testsuite/gdb.cp/shadow.exp @@ -23,7 +23,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/smartp.exp b/gdb/testsuite/gdb.cp/smartp.exp index 396a4b7f1c9..4e58cc181c2 100644 --- a/gdb/testsuite/gdb.cp/smartp.exp +++ b/gdb/testsuite/gdb.cp/smartp.exp @@ -15,7 +15,7 @@ standard_testfile .cc -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] } { return -1 } diff --git a/gdb/testsuite/gdb.cp/static-method.exp b/gdb/testsuite/gdb.cp/static-method.exp index 95b3eb9eb4b..8be47ab81b5 100644 --- a/gdb/testsuite/gdb.cp/static-method.exp +++ b/gdb/testsuite/gdb.cp/static-method.exp @@ -43,7 +43,7 @@ if {[skip_cplus_tests]} { continue } # Tests for c++/12750 standard_testfile .cc -if {[prepare_for_testing $testfile $testfile $srcfile {c++ debug}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {c++ debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/static-print-quit.exp b/gdb/testsuite/gdb.cp/static-print-quit.exp index 61572452d42..624acba9893 100644 --- a/gdb/testsuite/gdb.cp/static-print-quit.exp +++ b/gdb/testsuite/gdb.cp/static-print-quit.exp @@ -18,7 +18,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc if { [gdb_compile $srcdir/$subdir/$srcfile $binfile.o object {debug c++}] != ""} { - untested ${testfile}.exp + untested "failed to compile" return -1 } @@ -34,7 +34,7 @@ gdb_test_multiple "print c" $test { } -re "\r\n---Type <return>" { # gdb-7.1 did not crash with this testcase but it had the same bug. - untested ${testfile}.exp + untested "bug does not reproduce" return 0 } } diff --git a/gdb/testsuite/gdb.cp/temargs.exp b/gdb/testsuite/gdb.cp/temargs.exp index 5adf46fdf22..34729635ebb 100644 --- a/gdb/testsuite/gdb.cp/temargs.exp +++ b/gdb/testsuite/gdb.cp/temargs.exp @@ -23,7 +23,7 @@ if {[skip_cplus_tests]} { standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/templates.exp b/gdb/testsuite/gdb.cp/templates.exp index 8a60c6d8181..02371455fdc 100644 --- a/gdb/testsuite/gdb.cp/templates.exp +++ b/gdb/testsuite/gdb.cp/templates.exp @@ -27,7 +27,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/try_catch.exp b/gdb/testsuite/gdb.cp/try_catch.exp index 0b9de91b286..8d17a4718aa 100644 --- a/gdb/testsuite/gdb.cp/try_catch.exp +++ b/gdb/testsuite/gdb.cp/try_catch.exp @@ -30,7 +30,7 @@ if [get_compiler_info "c++"] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/typedef-operator.exp b/gdb/testsuite/gdb.cp/typedef-operator.exp index f4b0dfb347b..9e391a5ddb8 100644 --- a/gdb/testsuite/gdb.cp/typedef-operator.exp +++ b/gdb/testsuite/gdb.cp/typedef-operator.exp @@ -19,7 +19,7 @@ if {[skip_cplus_tests]} { continue } standard_testfile .cc -if {[prepare_for_testing $testfile $testfile $srcfile {c++ debug}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {c++ debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/typeid.exp b/gdb/testsuite/gdb.cp/typeid.exp index 84c65438fe8..50cef2e0186 100644 --- a/gdb/testsuite/gdb.cp/typeid.exp +++ b/gdb/testsuite/gdb.cp/typeid.exp @@ -19,7 +19,7 @@ if {[skip_cplus_tests]} { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/userdef.exp b/gdb/testsuite/gdb.cp/userdef.exp index 19a843f783f..9779425d221 100644 --- a/gdb/testsuite/gdb.cp/userdef.exp +++ b/gdb/testsuite/gdb.cp/userdef.exp @@ -28,7 +28,7 @@ if { [istarget "spu*-*-*"] } { standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/using-crash.exp b/gdb/testsuite/gdb.cp/using-crash.exp index a5c6b085111..7e0964c881c 100644 --- a/gdb/testsuite/gdb.cp/using-crash.exp +++ b/gdb/testsuite/gdb.cp/using-crash.exp @@ -14,7 +14,7 @@ standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/var-tag.exp b/gdb/testsuite/gdb.cp/var-tag.exp index f6d371ed436..83e0bd4480f 100644 --- a/gdb/testsuite/gdb.cp/var-tag.exp +++ b/gdb/testsuite/gdb.cp/var-tag.exp @@ -21,7 +21,7 @@ if {[skip_cplus_tests]} { continue } standard_testfile var-tag.cc var-tag-2.cc var-tag-3.cc var-tag-4.cc -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2 $srcfile3 $srcfile4] {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/virtbase.exp b/gdb/testsuite/gdb.cp/virtbase.exp index 3fe52efff54..00a48ca036a 100644 --- a/gdb/testsuite/gdb.cp/virtbase.exp +++ b/gdb/testsuite/gdb.cp/virtbase.exp @@ -19,7 +19,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/virtfunc.exp b/gdb/testsuite/gdb.cp/virtfunc.exp index 2776b0a6467..5ffa9b38e12 100644 --- a/gdb/testsuite/gdb.cp/virtfunc.exp +++ b/gdb/testsuite/gdb.cp/virtfunc.exp @@ -24,7 +24,7 @@ load_lib "cp-support.exp" standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/virtfunc2.exp b/gdb/testsuite/gdb.cp/virtfunc2.exp index bcc492587da..99cd04c94c4 100644 --- a/gdb/testsuite/gdb.cp/virtfunc2.exp +++ b/gdb/testsuite/gdb.cp/virtfunc2.exp @@ -24,7 +24,7 @@ load_lib "cp-support.exp" standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.cp/vla-cxx.exp b/gdb/testsuite/gdb.cp/vla-cxx.exp index f6224dc97b5..e2bd143d0da 100644 --- a/gdb/testsuite/gdb.cp/vla-cxx.exp +++ b/gdb/testsuite/gdb.cp/vla-cxx.exp @@ -15,7 +15,7 @@ standard_testfile .cc -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.disasm/t01_mov.exp b/gdb/testsuite/gdb.disasm/t01_mov.exp index a56a7a158b3..be2d5ca01d5 100644 --- a/gdb/testsuite/gdb.disasm/t01_mov.exp +++ b/gdb/testsuite/gdb.disasm/t01_mov.exp @@ -31,12 +31,12 @@ set link-flags "-m h8300sxelf" if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then { - untested t01_mov.exp + untested "failed to assemble" return -1 } if {[target_link $objfile $binfile "${link-flags}"] != ""} then { - untested t01_mov.exp + untested "failed to link" return -1 } diff --git a/gdb/testsuite/gdb.disasm/t02_mova.exp b/gdb/testsuite/gdb.disasm/t02_mova.exp index 71b0c997410..535a41722ee 100644 --- a/gdb/testsuite/gdb.disasm/t02_mova.exp +++ b/gdb/testsuite/gdb.disasm/t02_mova.exp @@ -31,12 +31,12 @@ set link-flags "-m h8300sxelf" if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then { - untested t02_mova.exp + untested "failed to assemble" return -1 } if {[target_link $objfile $binfile "${link-flags}"] != ""} then { - untested t02_mova.exp + untested "failed to link" return -1 } diff --git a/gdb/testsuite/gdb.disasm/t03_add.exp b/gdb/testsuite/gdb.disasm/t03_add.exp index 77b44e35813..79609632480 100644 --- a/gdb/testsuite/gdb.disasm/t03_add.exp +++ b/gdb/testsuite/gdb.disasm/t03_add.exp @@ -31,12 +31,12 @@ set link-flags "-m h8300sxelf" if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then { - untested t03_add.exp + untested "failed to assemble" return -1 } if {[target_link $objfile $binfile "${link-flags}"] != ""} then { - untested t03_add.exp + untested "failed to link" return -1 } diff --git a/gdb/testsuite/gdb.disasm/t04_sub.exp b/gdb/testsuite/gdb.disasm/t04_sub.exp index 5ffb08fe8a5..68c71692fe4 100644 --- a/gdb/testsuite/gdb.disasm/t04_sub.exp +++ b/gdb/testsuite/gdb.disasm/t04_sub.exp @@ -31,12 +31,12 @@ set link-flags "-m h8300sxelf" if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then { - untested t04_sub.exp + untested "failed to assemble" return -1 } if {[target_link $objfile $binfile "${link-flags}"] != ""} then { - untested t04_sub.exp + untested "failed to link" return -1 } diff --git a/gdb/testsuite/gdb.disasm/t05_cmp.exp b/gdb/testsuite/gdb.disasm/t05_cmp.exp index 38fa8fb38c1..d6687a91722 100644 --- a/gdb/testsuite/gdb.disasm/t05_cmp.exp +++ b/gdb/testsuite/gdb.disasm/t05_cmp.exp @@ -31,12 +31,12 @@ set link-flags "-m h8300sxelf" if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then { - untested t05_cmp.exp + untested "failed to assemble" return -1 } if {[target_link $objfile $binfile "${link-flags}"] != ""} then { - untested t05_cmp.exp + untested "failed to link" return -1 } diff --git a/gdb/testsuite/gdb.disasm/t06_ari2.exp b/gdb/testsuite/gdb.disasm/t06_ari2.exp index b6c84ed4d7d..96349ae4c07 100644 --- a/gdb/testsuite/gdb.disasm/t06_ari2.exp +++ b/gdb/testsuite/gdb.disasm/t06_ari2.exp @@ -31,12 +31,12 @@ set link-flags "-m h8300sxelf" if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then { - untested t06_ari2.exp + untested "failed to assemble" return -1 } if {[target_link $objfile $binfile "${link-flags}"] != ""} then { - untested t06_ari2.exp + untested "failed to link" return -1 } diff --git a/gdb/testsuite/gdb.disasm/t07_ari3.exp b/gdb/testsuite/gdb.disasm/t07_ari3.exp index 73f7a44bdbe..1d0374d9742 100644 --- a/gdb/testsuite/gdb.disasm/t07_ari3.exp +++ b/gdb/testsuite/gdb.disasm/t07_ari3.exp @@ -31,12 +31,12 @@ set link-flags "-m h8300sxelf" if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then { - untested t07_ari3.exp + untested "failed to assemble" return -1 } if {[target_link $objfile $binfile "${link-flags}"] != ""} then { - untested t07_ari3.exp + untested "failed to link" return -1 } diff --git a/gdb/testsuite/gdb.disasm/t08_or.exp b/gdb/testsuite/gdb.disasm/t08_or.exp index 03d9c78a842..a5c7694531c 100644 --- a/gdb/testsuite/gdb.disasm/t08_or.exp +++ b/gdb/testsuite/gdb.disasm/t08_or.exp @@ -31,12 +31,12 @@ set link-flags "-m h8300sxelf" if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then { - untested t08_or.exp + untested "failed to assemble" return -1 } if {[target_link $objfile $binfile "${link-flags}"] != ""} then { - untested t08_or.exp + untested "failed to link" return -1 } diff --git a/gdb/testsuite/gdb.disasm/t09_xor.exp b/gdb/testsuite/gdb.disasm/t09_xor.exp index 4cbfbd33a6d..013591dd030 100644 --- a/gdb/testsuite/gdb.disasm/t09_xor.exp +++ b/gdb/testsuite/gdb.disasm/t09_xor.exp @@ -31,12 +31,12 @@ set link-flags "-m h8300sxelf" if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then { - untested t09_xor.exp + untested "failed to assemble" return -1 } if {[target_link $objfile $binfile "${link-flags}"] != ""} then { - untested t09_xor.exp + untested "failed to link" return -1 } diff --git a/gdb/testsuite/gdb.disasm/t10_and.exp b/gdb/testsuite/gdb.disasm/t10_and.exp index cd9059bd4ab..f3103c1cef2 100644 --- a/gdb/testsuite/gdb.disasm/t10_and.exp +++ b/gdb/testsuite/gdb.disasm/t10_and.exp @@ -31,12 +31,12 @@ set link-flags "-m h8300sxelf" if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then { - untested t10_and.exp + untested "failed to assemble" return -1 } if {[target_link $objfile $binfile "${link-flags}"] != ""} then { - untested t10_and.exp + untested "failed to link" return -1 } diff --git a/gdb/testsuite/gdb.disasm/t11_logs.exp b/gdb/testsuite/gdb.disasm/t11_logs.exp index aa810aaa0fc..108dadaedc6 100644 --- a/gdb/testsuite/gdb.disasm/t11_logs.exp +++ b/gdb/testsuite/gdb.disasm/t11_logs.exp @@ -31,12 +31,12 @@ set link-flags "-m h8300sxelf" if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then { - untested t11_logs.exp + untested "failed to assemble" return -1 } if {[target_link $objfile $binfile "${link-flags}"] != ""} then { - untested t11_logs.exp + untested "failed to link" return -1 } diff --git a/gdb/testsuite/gdb.disasm/t12_bit.exp b/gdb/testsuite/gdb.disasm/t12_bit.exp index 8711724b407..03b8dca66de 100644 --- a/gdb/testsuite/gdb.disasm/t12_bit.exp +++ b/gdb/testsuite/gdb.disasm/t12_bit.exp @@ -31,12 +31,12 @@ set link-flags "-m h8300sxelf" if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then { - untested t12_bit.exp + untested "failed to assemble" return -1 } if {[target_link $objfile $binfile "${link-flags}"] != ""} then { - untested t12_bit.exp + untested "failed to link" return -1 } diff --git a/gdb/testsuite/gdb.disasm/t13_otr.exp b/gdb/testsuite/gdb.disasm/t13_otr.exp index 6ca6e2d00aa..58a9ce8b407 100644 --- a/gdb/testsuite/gdb.disasm/t13_otr.exp +++ b/gdb/testsuite/gdb.disasm/t13_otr.exp @@ -31,12 +31,12 @@ set link-flags "-m h8300sxelf" if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then { - untested t13_otr.exp + untested "failed to assemble" return -1 } if {[target_link $objfile $binfile "${link-flags}"] != ""} then { - untested t13_otr.exp + untested "failed to link" return -1 } diff --git a/gdb/testsuite/gdb.dlang/circular.exp b/gdb/testsuite/gdb.dlang/circular.exp index c6eb789579a..1c250101d5e 100644 --- a/gdb/testsuite/gdb.dlang/circular.exp +++ b/gdb/testsuite/gdb.dlang/circular.exp @@ -134,7 +134,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/arr-stride.exp b/gdb/testsuite/gdb.dwarf2/arr-stride.exp index 4d48b2409c0..f4404fc7ec2 100644 --- a/gdb/testsuite/gdb.dwarf2/arr-stride.exp +++ b/gdb/testsuite/gdb.dwarf2/arr-stride.exp @@ -83,7 +83,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/arr-subrange.exp b/gdb/testsuite/gdb.dwarf2/arr-subrange.exp index 57e84ad9e03..aed93cd4fe9 100644 --- a/gdb/testsuite/gdb.dwarf2/arr-subrange.exp +++ b/gdb/testsuite/gdb.dwarf2/arr-subrange.exp @@ -77,7 +77,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/atomic-type.exp b/gdb/testsuite/gdb.dwarf2/atomic-type.exp index 0addefea2e6..319f76faef6 100644 --- a/gdb/testsuite/gdb.dwarf2/atomic-type.exp +++ b/gdb/testsuite/gdb.dwarf2/atomic-type.exp @@ -87,7 +87,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/bad-regnum.exp b/gdb/testsuite/gdb.dwarf2/bad-regnum.exp index 4635735ab41..3b2c71962b7 100644 --- a/gdb/testsuite/gdb.dwarf2/bad-regnum.exp +++ b/gdb/testsuite/gdb.dwarf2/bad-regnum.exp @@ -60,7 +60,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp b/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp index b789970abaa..71dfd35aa7c 100644 --- a/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp +++ b/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp @@ -73,7 +73,7 @@ Dwarf::assemble $asm_file { } } -if [prepare_for_testing ${testfile}.exp $executable "${asm_file} ${srcfile}" {}] { +if [prepare_for_testing "failed to prepare" $executable "${asm_file} ${srcfile}" {}] { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/callframecfa.exp b/gdb/testsuite/gdb.dwarf2/callframecfa.exp index a04c13256bc..773fcffa1e1 100644 --- a/gdb/testsuite/gdb.dwarf2/callframecfa.exp +++ b/gdb/testsuite/gdb.dwarf2/callframecfa.exp @@ -27,7 +27,7 @@ if {![is_x86_like_target]} { standard_testfile .S -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ [list {additional_flags=-nostdlib}]]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/clztest.exp b/gdb/testsuite/gdb.dwarf2/clztest.exp index 17ed76d0e62..c09c9c6c3ce 100644 --- a/gdb/testsuite/gdb.dwarf2/clztest.exp +++ b/gdb/testsuite/gdb.dwarf2/clztest.exp @@ -28,7 +28,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} { return 0 } -if { [prepare_for_testing "${test}.exp" "${test}" ${test}.S {nodebug additional_flags=-nostdlib}] } { +if { [prepare_for_testing "failed to prepare" "${test}" ${test}.S {nodebug additional_flags=-nostdlib}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/corrupt.exp b/gdb/testsuite/gdb.dwarf2/corrupt.exp index fce378f69ac..c9fa59ee92a 100644 --- a/gdb/testsuite/gdb.dwarf2/corrupt.exp +++ b/gdb/testsuite/gdb.dwarf2/corrupt.exp @@ -69,7 +69,7 @@ Dwarf::assemble $asm_file { } } -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $asm_file] {nodebug}]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/data-loc.exp b/gdb/testsuite/gdb.dwarf2/data-loc.exp index 2e460ca3455..31804f09bea 100644 --- a/gdb/testsuite/gdb.dwarf2/data-loc.exp +++ b/gdb/testsuite/gdb.dwarf2/data-loc.exp @@ -28,8 +28,7 @@ standard_testfile data-loc.c data-loc-dw.S # Any program would do, but since we already have data-loc.c # specifically for this testcase, might as well use that. -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } @@ -121,7 +120,7 @@ Dwarf::assemble $asm_file { # program using our debug info instead of the info generated by # the compiler. -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dup-psym.exp b/gdb/testsuite/gdb.dwarf2/dup-psym.exp index 1c752852181..9ffb66e8840 100644 --- a/gdb/testsuite/gdb.dwarf2/dup-psym.exp +++ b/gdb/testsuite/gdb.dwarf2/dup-psym.exp @@ -23,7 +23,7 @@ if {![dwarf2_support]} { standard_testfile .S -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile {debug} main.c debug $srcfile nodebug]]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp b/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp index d4a36d5a112..608d167c207 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp @@ -26,7 +26,7 @@ standard_testfile .S if {[gdb_compile [file join $srcdir $subdir $srcfile] $binfile \ object {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp index 7b43eab5b10..6aff73785bd 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp @@ -24,7 +24,7 @@ if {![dwarf2_support]} { standard_testfile .S set dwarf_srcfile "file1.txt" -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile debug main.c debug $srcfile nodebug]]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp index 043c1dab29a..604d0d31efb 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp @@ -68,7 +68,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp index a7000b12841..4bb3f3d7680 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp @@ -50,7 +50,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp index 0b2c2c681fe..98213a267dd 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp @@ -24,7 +24,7 @@ if {![dwarf2_support]} { standard_testfile .S set dwarf_srcfile "file1.txt" -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile debug main.c debug $srcfile nodebug]]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp index b628dd50164..bdc3ad9a97d 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp @@ -25,7 +25,7 @@ set additional_flags [gdb_target_symbol_prefix_flags_asm] standard_testfile .S set executable ${testfile} -if [prepare_for_testing $testfile.exp $testfile $srcfile \ +if [prepare_for_testing "failed to prepare" $testfile $srcfile \ [list nodebug $additional_flags]] { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.exp b/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.exp index 844690a157c..4d60a337ad4 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.exp @@ -27,7 +27,7 @@ if [is_ilp32_target] { set ptrbits 64 } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2] \ [list nodebug additional_flags=-DPTRBITS=$ptrbits]] } { return -1 diff --git a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp index cd209f245c2..39e450b0f54 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp @@ -32,7 +32,7 @@ if {[skip_fortran_tests]} { standard_testfile .S -if { [prepare_for_testing "${testfile}.exp" "${testfile}" $srcfile \ +if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile \ {nodebug f90}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp b/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp index 4cb43cae102..1d81ae1c5cf 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp @@ -23,7 +23,7 @@ if {![dwarf2_support]} { set additional_flags [gdb_target_symbol_prefix_flags_asm] standard_testfile .S -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ $additional_flags]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp index a44325cba6c..fa0a629703f 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp @@ -24,7 +24,7 @@ if {![dwarf2_support]} { standard_testfile .S set dwarf_srcfile "file1.txt" -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile \ {debug additional_flags=-static additional_flags=-nostdlib} \ main.c -g0 $srcfile nodebug]]} { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-const.exp b/gdb/testsuite/gdb.dwarf2/dw2-const.exp index 865b67b42ad..ef8ce9fb45a 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-const.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-const.exp @@ -21,7 +21,7 @@ if {![dwarf2_support]} { standard_testfile .S -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile debug main.c debug $srcfile nodebug]]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp b/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp index 9022b80b093..6a9a4f2c2d1 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp @@ -27,7 +27,7 @@ if {![dwarf2_support]} { standard_testfile .S dw2-cp-infcall-ref-static-main.c -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile2 $srcfile] {}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp b/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp index b96f5d3e0bb..f21875f2a29 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp @@ -26,7 +26,7 @@ if {![dwarf2_support]} { standard_testfile .S -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile debug main.c debug $srcfile nodebug]]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp b/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp index e43f393301e..a7b4791c780 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp @@ -26,7 +26,7 @@ if {![istarget "x86_64-*-*"] || ![is_lp64_target]} { standard_testfile .S -if { [prepare_for_testing $testfile.exp $testfile $srcfile {nodebug}] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp b/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp index c01a50e99f6..b93a7ad89f9 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp @@ -19,7 +19,7 @@ if {![dwarf2_support]} { return 0 } -if { [prepare_for_testing dw2-entry-value.exp "dw2-entry-value" {dw2-entry-value-main.c dw2-entry-value.S} {nodebug}] } { +if { [prepare_for_testing "failed to prepare" "dw2-entry-value" {dw2-entry-value-main.c dw2-entry-value.S} {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp b/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp index a8a9eea2d6e..e4665ab6ee5 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp @@ -24,7 +24,7 @@ if {![dwarf2_support]} { standard_testfile .S .c -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp index 0897d4ea186..b771b2d85d5 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp @@ -62,7 +62,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp index 374ae3cbf38..dcfeeed9b86 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp @@ -32,7 +32,7 @@ set basename "inline-break" standard_testfile .S -if { [prepare_for_testing $testfile.exp $testfile $srcfile {nodebug}] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp index 93d30798cf0..725792cb969 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp @@ -21,7 +21,7 @@ if {![dwarf2_support]} { standard_testfile .S dw2-inline-param-main.c -if { [prepare_for_testing ${testfile}.exp "${testfile}" \ +if { [prepare_for_testing "failed to prepare" "${testfile}" \ [list $srcfile2 $srcfile] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp index 44d5c8db9a9..4b7e3c6f0b3 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp @@ -24,7 +24,7 @@ if {![dwarf2_support]} { standard_testfile .S set dwarf_srcfile "file1.txt" -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile debug main.c debug $srcfile nodebug]]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp index fce685e05ae..4b419d9d61e 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp @@ -24,7 +24,7 @@ if {![dwarf2_support]} { standard_testfile .S set dwarf_srcfile "file1.txt" -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile debug main.c debug $srcfile nodebug]]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp b/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp index d09f56b75ea..eb9a8acc169 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp @@ -65,7 +65,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile2 $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp b/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp index a4e22b49a69..1ca02eaa311 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp @@ -28,7 +28,7 @@ if {![dwarf2_support]} { standard_testfile .S set executable ${testfile} -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile c++ $testfile-main.cc {c++ debug} \ $srcfile {}]]} { return -1 diff --git a/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp b/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp index 14eaba53e85..33e4d2112d1 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp @@ -26,7 +26,7 @@ set additional_flags [gdb_target_symbol_prefix_flags_asm] standard_testfile .S -if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ ${additional_flags}] { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp index 932de2e6e88..3aa62bd324f 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp @@ -19,7 +19,7 @@ if {![dwarf2_support]} { return 0 } -if { [prepare_for_testing dw2-noloc.exp "dw2-noloc" {dw2-noloc-main.c dw2-noloc.S} {nodebug}] } { +if { [prepare_for_testing "failed to prepare" "dw2-noloc" {dw2-noloc-main.c dw2-noloc.S} {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp b/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp index 5c696a37e86..4756e9a5f72 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp @@ -23,7 +23,7 @@ if {![dwarf2_support]} { standard_testfile .S main.c -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp b/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp index 43f499268de..c07299aacbf 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp @@ -27,7 +27,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} { return 0 } -if { [prepare_for_testing "${test}.exp" "${test}" ${test}.S {nodebug}] } { +if { [prepare_for_testing "failed to prepare" "${test}" ${test}.S {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp b/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp index 44f1df13a86..044fd6f4d32 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp @@ -124,7 +124,7 @@ proc build_test_program {} { set sources "$srcfile $asm_file" if {[build_executable $testfile.exp $testfile $sources {nodebug}]} { - untested $testfile.exp + untested "failed to compile" return -1 } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp b/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp index d2148e3343d..1f64f0c1259 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp @@ -21,7 +21,7 @@ if {![dwarf2_support]} { standard_testfile .S dw2-param-error-main.c -if { [prepare_for_testing ${testfile}.exp "${testfile}" \ +if { [prepare_for_testing "failed to prepare" "${testfile}" \ [list $srcfile2 $srcfile] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp index 1538949862d..bd899c268e4 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp @@ -22,7 +22,7 @@ if {![dwarf2_support]} { standard_testfile .S set dwarf_srcfile "file1.txt" -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile debug main.c debug $srcfile nodebug]]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp index 3417a5c849c..4c34045682f 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp @@ -125,7 +125,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp b/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp index 5689d039dff..e0fad2b6c64 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp @@ -24,7 +24,7 @@ set srcfuncfile ${testfile}-func.c set srcmainfile ${testfile}-main.c set executable ${testfile} -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile {} $srcfile {} $srcfuncfile {} \ $srcmainfile debug]]} { return -1 diff --git a/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp b/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp index f103198d35b..a33c49516ae 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp @@ -26,7 +26,7 @@ if {![istarget "x86_64-*-*"] || ![is_lp64_target]} { standard_testfile .S -if { [prepare_for_testing $testfile.exp $testfile $srcfile {nodebug}] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp b/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp index e117c2ec8c8..7f634cfb593 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp @@ -59,7 +59,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile2 $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-restore.exp b/gdb/testsuite/gdb.dwarf2/dw2-restore.exp index f1052c664e4..22820e78338 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-restore.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-restore.exp @@ -21,7 +21,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} { } standard_testfile .S -if {[prepare_for_testing $testfile.exp $testfile [list $srcfile] \ +if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile] \ [list {additional_flags=-nostdlib}]]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp b/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp index bbbfb802086..5b6ef49a1f4 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp @@ -27,7 +27,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} { standard_testfile .S -if {[prepare_for_testing $testfile.exp $testfile $srcfile {nodebug}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp index a10c5fa5a71..f0f86f820f5 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp @@ -31,7 +31,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} { standard_testfile .S set csrcfile ${testfile}.c -if { [prepare_for_testing "${testfile}.exp" "${testfile}" $srcfile {nodebug}] } { +if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-strp.exp b/gdb/testsuite/gdb.dwarf2/dw2-strp.exp index 045c9986619..62b5fbce624 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-strp.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-strp.exp @@ -24,7 +24,7 @@ if {![dwarf2_support]} { standard_testfile .S -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile debug main.c debug $srcfile nodebug]]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp b/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp index c666584e5fa..356286c2077 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp @@ -26,7 +26,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} { return 0 } -if {[prepare_for_testing "$testfile.exp" "$testfile" $srcfile {nodebug}]} { +if {[prepare_for_testing "failed to prepare" "$testfile" $srcfile {nodebug}]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp b/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp index 84e2ee666f0..371f9f1eafb 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp @@ -22,7 +22,7 @@ if {![dwarf2_support]} { # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags_asm] -if { [prepare_for_testing dw2-unresolved.exp "dw2-unresolved" \ +if { [prepare_for_testing "failed to prepare" "dw2-unresolved" \ {dw2-unresolved-main.c dw2-unresolved.S} \ [list nodebug $additional_flags]] } { return -1 diff --git a/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp b/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp index 0e4bd743e20..a92f6bad730 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp @@ -21,7 +21,7 @@ if {![dwarf2_support]} { standard_testfile .S main.c -if [prepare_for_testing ${testfile}.exp ${testfile} \ +if [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2] {nodebug}] { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dw4-sig-types.exp b/gdb/testsuite/gdb.dwarf2/dw4-sig-types.exp index 225bfae8695..f87a9d6fa6b 100644 --- a/gdb/testsuite/gdb.dwarf2/dw4-sig-types.exp +++ b/gdb/testsuite/gdb.dwarf2/dw4-sig-types.exp @@ -21,7 +21,7 @@ standard_testfile .cc dw4-sig-types-b.cc # Since we pass an explicit -gdwarf-4 -fdebug-types-section to the compiler, # we let that be the test of whether the target supports it. -if { [prepare_for_testing "${testfile}.exp" "${testfile}" \ +if { [prepare_for_testing "failed to prepare" "${testfile}" \ [list $srcfile $srcfile2] \ {debug c++ additional_flags=-gdwarf-4 additional_flags=-fdebug-types-section}] } { return -1 diff --git a/gdb/testsuite/gdb.dwarf2/dwz.exp b/gdb/testsuite/gdb.dwarf2/dwz.exp index 6f57eb6c18f..e0885536f26 100644 --- a/gdb/testsuite/gdb.dwarf2/dwz.exp +++ b/gdb/testsuite/gdb.dwarf2/dwz.exp @@ -81,7 +81,7 @@ Dwarf::assemble $asm_file { } } -if [prepare_for_testing ${testfile}.exp $testfile "${asm_file} ${srcfile}" {}] { +if [prepare_for_testing "failed to prepare" $testfile "${asm_file} ${srcfile}" {}] { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/dynarr-ptr.exp b/gdb/testsuite/gdb.dwarf2/dynarr-ptr.exp index 94eed7c6204..8a05b2e3092 100644 --- a/gdb/testsuite/gdb.dwarf2/dynarr-ptr.exp +++ b/gdb/testsuite/gdb.dwarf2/dynarr-ptr.exp @@ -28,8 +28,7 @@ standard_testfile dynarr-ptr.c dynarr-ptr-dw.S # Any program would do, but since we already have dynarr-ptr.c # specifically for this testcase, might as well use that. -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } @@ -122,7 +121,7 @@ Dwarf::assemble $asm_file { # program using our debug info instead of the info generated by # the compiler. -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/enum-type.exp b/gdb/testsuite/gdb.dwarf2/enum-type.exp index dee6e015fce..6c6e0543617 100644 --- a/gdb/testsuite/gdb.dwarf2/enum-type.exp +++ b/gdb/testsuite/gdb.dwarf2/enum-type.exp @@ -67,7 +67,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/gdb-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-index.exp index 3f272d0fc23..fb14e4e9120 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-index.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-index.exp @@ -22,7 +22,7 @@ if {![dwarf2_support]} { standard_testfile main.c -if { [prepare_for_testing "${testfile}.exp" "${testfile}" \ +if { [prepare_for_testing "failed to prepare" "${testfile}" \ [list ${srcfile}]] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp b/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp index 2f2f6f2f064..44768c704e8 100644 --- a/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp +++ b/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp @@ -33,7 +33,7 @@ proc test { dwarf_version offset_size addr_size ref_addr_size two_cu } { set name "d${dwarf_version}o${offset_size}a${addr_size}r${ref_addr_size}t${two_cu}" set executable ${testfile}-${name} - if [prepare_for_testing ${testfile}.exp $executable "${srcfile} ${mainfile}" $opts] { + if [prepare_for_testing "failed to prepare" $executable "${srcfile} ${mainfile}" $opts] { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp b/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp index 5cbcdafa232..dc4c78ab674 100644 --- a/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp +++ b/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp @@ -80,7 +80,7 @@ Dwarf::assemble $asm_file { } } -if [prepare_for_testing ${testfile}.exp $executable "${asm_file} ${srcfile}" {}] { +if [prepare_for_testing "failed to prepare" $executable "${asm_file} ${srcfile}" {}] { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/implptr.exp b/gdb/testsuite/gdb.dwarf2/implptr.exp index 5282143b72b..587587d0f4a 100644 --- a/gdb/testsuite/gdb.dwarf2/implptr.exp +++ b/gdb/testsuite/gdb.dwarf2/implptr.exp @@ -34,7 +34,7 @@ if [info exists COMPILE] { return 0 } -if {[prepare_for_testing ${testfile}.exp ${testfile} $srcfile $opts]} { +if {[prepare_for_testing "failed to prepare" ${testfile} $srcfile $opts]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/implref-array.exp b/gdb/testsuite/gdb.dwarf2/implref-array.exp index b6127636d97..7195502b940 100644 --- a/gdb/testsuite/gdb.dwarf2/implref-array.exp +++ b/gdb/testsuite/gdb.dwarf2/implref-array.exp @@ -40,8 +40,7 @@ set asm_file [standard_output_file ${srcfile2}] # For that, we ask GDB by debugging our implref-array program. # Any program would do, but since we already have implref-array # specifically for this testcase, might as well use that. -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } @@ -114,7 +113,7 @@ Dwarf::assemble ${asm_file} { } } -if [prepare_for_testing ${testfile}.exp ${executable} [list ${asm_file} ${srcfile}] {}] { +if [prepare_for_testing "failed to prepare" ${executable} [list ${asm_file} ${srcfile}] {}] { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/implref-const.exp b/gdb/testsuite/gdb.dwarf2/implref-const.exp index 9b6d5fe6849..24fbed1b1fb 100644 --- a/gdb/testsuite/gdb.dwarf2/implref-const.exp +++ b/gdb/testsuite/gdb.dwarf2/implref-const.exp @@ -40,8 +40,7 @@ set asm_file [standard_output_file ${srcfile2}] # For that, we ask GDB by debugging our implref-const program. # Any program would do, but since we already have implref-const # specifically for this testcase, might as well use that. -if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] { - untested ${testfile}.exp +if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] { return -1 } @@ -97,7 +96,7 @@ Dwarf::assemble ${asm_file} { } } -if [prepare_for_testing ${testfile}.exp ${executable} [list ${asm_file} ${srcfile}] {}] { +if [prepare_for_testing "failed to prepare" ${executable} [list ${asm_file} ${srcfile}] {}] { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/implref-global.exp b/gdb/testsuite/gdb.dwarf2/implref-global.exp index 1f4cc055e81..de635ce3227 100644 --- a/gdb/testsuite/gdb.dwarf2/implref-global.exp +++ b/gdb/testsuite/gdb.dwarf2/implref-global.exp @@ -40,8 +40,7 @@ set asm_file [standard_output_file ${srcfile2}] # For that, we ask GDB by debugging our implref-global program. # Any program would do, but since we already have implref-global # specifically for this testcase, might as well use that. -if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] { - untested ${testfile}.exp +if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] { return -1 } @@ -95,7 +94,7 @@ Dwarf::assemble ${asm_file} { } } -if [prepare_for_testing ${testfile}.exp ${executable} [list ${asm_file} ${srcfile}] {}] { +if [prepare_for_testing "failed to prepare" ${executable} [list ${asm_file} ${srcfile}] {}] { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/implref-struct.exp b/gdb/testsuite/gdb.dwarf2/implref-struct.exp index 49967e37e6f..b82f5abda1c 100644 --- a/gdb/testsuite/gdb.dwarf2/implref-struct.exp +++ b/gdb/testsuite/gdb.dwarf2/implref-struct.exp @@ -40,8 +40,7 @@ set asm_file [standard_output_file ${srcfile2}] # For that, we ask GDB by debugging our implref-struct program. # Any program would do, but since we already have implref-struct # specifically for this testcase, might as well use that. -if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] { - untested ${testfile}.exp +if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] { return -1 } @@ -130,7 +129,7 @@ Dwarf::assemble ${asm_file} { } } -if [prepare_for_testing ${testfile}.exp ${executable} [list ${asm_file} ${srcfile}] {}] { +if [prepare_for_testing "failed to prepare" ${executable} [list ${asm_file} ${srcfile}] {}] { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/mac-fileno.exp b/gdb/testsuite/gdb.dwarf2/mac-fileno.exp index 58623fc81ba..9bea4dc7cc0 100644 --- a/gdb/testsuite/gdb.dwarf2/mac-fileno.exp +++ b/gdb/testsuite/gdb.dwarf2/mac-fileno.exp @@ -25,7 +25,7 @@ if {![dwarf2_support]} { standard_testfile .S set dwarf_srcfile "file1.txt" -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile debug main.c debug $srcfile nodebug]]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/main-subprogram.exp b/gdb/testsuite/gdb.dwarf2/main-subprogram.exp index 08c076b1096..06b553649ff 100644 --- a/gdb/testsuite/gdb.dwarf2/main-subprogram.exp +++ b/gdb/testsuite/gdb.dwarf2/main-subprogram.exp @@ -56,7 +56,7 @@ Dwarf::assemble $asm_file { } } -if {[prepare_for_testing ${testfile}.exp ${testfile} \ +if {[prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp index 4c4d69cb752..5c0d07716f5 100644 --- a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp +++ b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp @@ -24,7 +24,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .S if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" ${binfile} object {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/method-ptr.exp b/gdb/testsuite/gdb.dwarf2/method-ptr.exp index 66eb8965922..56ecd95ceb7 100644 --- a/gdb/testsuite/gdb.dwarf2/method-ptr.exp +++ b/gdb/testsuite/gdb.dwarf2/method-ptr.exp @@ -77,7 +77,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/missing-sig-type.exp b/gdb/testsuite/gdb.dwarf2/missing-sig-type.exp index 3526f6dd3f6..716dd195424 100644 --- a/gdb/testsuite/gdb.dwarf2/missing-sig-type.exp +++ b/gdb/testsuite/gdb.dwarf2/missing-sig-type.exp @@ -49,7 +49,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/nonvar-access.exp b/gdb/testsuite/gdb.dwarf2/nonvar-access.exp index 8910f6d7304..af431246e3f 100644 --- a/gdb/testsuite/gdb.dwarf2/nonvar-access.exp +++ b/gdb/testsuite/gdb.dwarf2/nonvar-access.exp @@ -119,7 +119,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp b/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp index 46bd0b6ffff..d9d0bfa49d0 100644 --- a/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp +++ b/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp @@ -188,7 +188,7 @@ Dwarf::assemble $asm_file { } } -if [prepare_for_testing ${testfile}.exp $testfile "${asm_file} ${srcfile} ${srcfile3}" {nodebug}] { +if [prepare_for_testing "failed to prepare" $testfile "${asm_file} ${srcfile} ${srcfile3}" {nodebug}] { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/pieces-optimized-out.exp b/gdb/testsuite/gdb.dwarf2/pieces-optimized-out.exp index eba3205e0db..9c3f3527cfc 100644 --- a/gdb/testsuite/gdb.dwarf2/pieces-optimized-out.exp +++ b/gdb/testsuite/gdb.dwarf2/pieces-optimized-out.exp @@ -27,7 +27,7 @@ if {![is_x86_like_target]} { standard_testfile .S set csrcfile ${testfile}.c -if {[prepare_for_testing ${testfile}.exp ${testfile} $srcfile]} { +if {[prepare_for_testing "failed to prepare" ${testfile} $srcfile]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/pieces.exp b/gdb/testsuite/gdb.dwarf2/pieces.exp index 57de9d4dacb..bff864e500c 100644 --- a/gdb/testsuite/gdb.dwarf2/pieces.exp +++ b/gdb/testsuite/gdb.dwarf2/pieces.exp @@ -27,7 +27,7 @@ if {![is_x86_like_target]} { standard_testfile .S set csrcfile ${testfile}.c -if {[prepare_for_testing ${testfile}.exp ${testfile} $srcfile]} { +if {[prepare_for_testing "failed to prepare" ${testfile} $srcfile]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/pr10770.exp b/gdb/testsuite/gdb.dwarf2/pr10770.exp index 889b0b7b4b2..47f002ad239 100644 --- a/gdb/testsuite/gdb.dwarf2/pr10770.exp +++ b/gdb/testsuite/gdb.dwarf2/pr10770.exp @@ -17,7 +17,7 @@ standard_testfile -if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}]} { +if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} { return 0 } diff --git a/gdb/testsuite/gdb.dwarf2/pr13961.exp b/gdb/testsuite/gdb.dwarf2/pr13961.exp index 635bceb4a94..a0c633b68ee 100644 --- a/gdb/testsuite/gdb.dwarf2/pr13961.exp +++ b/gdb/testsuite/gdb.dwarf2/pr13961.exp @@ -27,7 +27,7 @@ set additional_flags [gdb_target_symbol_prefix_flags_asm] standard_testfile .S -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ ${additional_flags}] == -1 } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/staticvirtual.exp b/gdb/testsuite/gdb.dwarf2/staticvirtual.exp index c038a67bf25..4b034e17636 100644 --- a/gdb/testsuite/gdb.dwarf2/staticvirtual.exp +++ b/gdb/testsuite/gdb.dwarf2/staticvirtual.exp @@ -45,7 +45,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/subrange.exp b/gdb/testsuite/gdb.dwarf2/subrange.exp index d5ba1142531..f94a4971b4c 100644 --- a/gdb/testsuite/gdb.dwarf2/subrange.exp +++ b/gdb/testsuite/gdb.dwarf2/subrange.exp @@ -60,7 +60,7 @@ Dwarf::assemble $asm_file { } } -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/symtab-producer.exp b/gdb/testsuite/gdb.dwarf2/symtab-producer.exp index 66dc7705b3d..8cc5b4993f2 100644 --- a/gdb/testsuite/gdb.dwarf2/symtab-producer.exp +++ b/gdb/testsuite/gdb.dwarf2/symtab-producer.exp @@ -81,7 +81,7 @@ Dwarf::assemble $asm_file { set saved_gdbflags $GDBFLAGS set GDBFLAGS "$GDBFLAGS -readnow" -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $asm_file] {nodebug}] } { set GDBFLAGS $saved_gdbflags return -1 diff --git a/gdb/testsuite/gdb.dwarf2/trace-crash.exp b/gdb/testsuite/gdb.dwarf2/trace-crash.exp index 481208cf65f..393553e2d70 100644 --- a/gdb/testsuite/gdb.dwarf2/trace-crash.exp +++ b/gdb/testsuite/gdb.dwarf2/trace-crash.exp @@ -28,7 +28,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} { standard_testfile .S -if {[prepare_for_testing "${testfile}.exp" "${testfile}" ${testfile}.S \ +if {[prepare_for_testing "failed to prepare" "${testfile}" ${testfile}.S \ nodebug]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/typeddwarf.exp b/gdb/testsuite/gdb.dwarf2/typeddwarf.exp index 7c39e390a8d..290c6da5d7c 100644 --- a/gdb/testsuite/gdb.dwarf2/typeddwarf.exp +++ b/gdb/testsuite/gdb.dwarf2/typeddwarf.exp @@ -31,7 +31,7 @@ if { [is_x86_like_target] } { return 0 } -if { [prepare_for_testing "${test}.exp" "${test}" ${sfile} {nodebug additional_flags=-nostdlib}] } { +if { [prepare_for_testing "failed to prepare" "${test}" ${sfile} {nodebug additional_flags=-nostdlib}] } { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/valop.exp b/gdb/testsuite/gdb.dwarf2/valop.exp index 373e4436e5c..13bc1e7dce1 100644 --- a/gdb/testsuite/gdb.dwarf2/valop.exp +++ b/gdb/testsuite/gdb.dwarf2/valop.exp @@ -27,7 +27,7 @@ if {![is_x86_like_target]} { standard_testfile .S -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile] [list {additional_flags=-nostdlib}]]} { return -1 } diff --git a/gdb/testsuite/gdb.dwarf2/watch-notconst.exp b/gdb/testsuite/gdb.dwarf2/watch-notconst.exp index 56d220863c7..9a0aa90a0d9 100644 --- a/gdb/testsuite/gdb.dwarf2/watch-notconst.exp +++ b/gdb/testsuite/gdb.dwarf2/watch-notconst.exp @@ -26,7 +26,7 @@ if { ![is_x86_like_target] } { return 0 } -if { [prepare_for_testing "${test}.exp" "${test}" \ +if { [prepare_for_testing "failed to prepare" "${test}" \ {watch-notconst.c watch-notconst2.S} {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/array-element.exp b/gdb/testsuite/gdb.fortran/array-element.exp index daa59c9e8cc..35f6f3ef559 100644 --- a/gdb/testsuite/gdb.fortran/array-element.exp +++ b/gdb/testsuite/gdb.fortran/array-element.exp @@ -22,7 +22,7 @@ if { [skip_fortran_tests] } { return -1 } standard_testfile .f -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} { return -1 } diff --git a/gdb/testsuite/gdb.fortran/charset.exp b/gdb/testsuite/gdb.fortran/charset.exp index f29f16a759c..15376b70d32 100644 --- a/gdb/testsuite/gdb.fortran/charset.exp +++ b/gdb/testsuite/gdb.fortran/charset.exp @@ -19,7 +19,7 @@ if { [skip_fortran_tests] } { return -1 } standard_testfile .f90 -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug additional_flags=-fbackslash f90}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug additional_flags=-fbackslash f90}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/common-block.exp b/gdb/testsuite/gdb.fortran/common-block.exp index 167e34d4e28..5c86c819fb0 100644 --- a/gdb/testsuite/gdb.fortran/common-block.exp +++ b/gdb/testsuite/gdb.fortran/common-block.exp @@ -23,7 +23,7 @@ if {[skip_fortran_tests]} { standard_testfile .f90 load_lib "fortran.exp" -if {[prepare_for_testing ${testfile}.exp ${testfile} \ +if {[prepare_for_testing "failed to prepare" ${testfile} \ $srcfile {debug f90 quiet}]} { return -1 } diff --git a/gdb/testsuite/gdb.fortran/complex.exp b/gdb/testsuite/gdb.fortran/complex.exp index 961e4276043..7e48085ef9a 100644 --- a/gdb/testsuite/gdb.fortran/complex.exp +++ b/gdb/testsuite/gdb.fortran/complex.exp @@ -15,8 +15,7 @@ standard_testfile .f -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90 quiet}]} { - untested "failed to compile" +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90 quiet}]} { return -1 } diff --git a/gdb/testsuite/gdb.fortran/derived-type-function.exp b/gdb/testsuite/gdb.fortran/derived-type-function.exp index 2a9353b5638..84009f0e6df 100644 --- a/gdb/testsuite/gdb.fortran/derived-type-function.exp +++ b/gdb/testsuite/gdb.fortran/derived-type-function.exp @@ -22,7 +22,7 @@ if { [skip_fortran_tests] } { return -1 } standard_testfile .f90 -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} { return -1 } diff --git a/gdb/testsuite/gdb.fortran/derived-type.exp b/gdb/testsuite/gdb.fortran/derived-type.exp index 278185068d9..807f1c7fbaf 100644 --- a/gdb/testsuite/gdb.fortran/derived-type.exp +++ b/gdb/testsuite/gdb.fortran/derived-type.exp @@ -23,7 +23,7 @@ if { [skip_fortran_tests] } { return -1 } standard_testfile .f90 load_lib "fortran.exp" -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} { return -1 } diff --git a/gdb/testsuite/gdb.fortran/logical.exp b/gdb/testsuite/gdb.fortran/logical.exp index b030b703657..18833d7fd09 100644 --- a/gdb/testsuite/gdb.fortran/logical.exp +++ b/gdb/testsuite/gdb.fortran/logical.exp @@ -18,7 +18,7 @@ standard_testfile .f90 -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90 quiet}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90 quiet}]} { return -1 } diff --git a/gdb/testsuite/gdb.fortran/module.exp b/gdb/testsuite/gdb.fortran/module.exp index 60c3420adbd..cd0d38c18e5 100644 --- a/gdb/testsuite/gdb.fortran/module.exp +++ b/gdb/testsuite/gdb.fortran/module.exp @@ -15,7 +15,7 @@ standard_testfile .f90 -if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/multi-dim.exp b/gdb/testsuite/gdb.fortran/multi-dim.exp index e448f30ee77..c3a8719d7c4 100644 --- a/gdb/testsuite/gdb.fortran/multi-dim.exp +++ b/gdb/testsuite/gdb.fortran/multi-dim.exp @@ -21,7 +21,7 @@ if { [skip_fortran_tests] } { return -1 } standard_testfile .f90 load_lib "fortran.exp" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug f90}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/nested-funcs.exp b/gdb/testsuite/gdb.fortran/nested-funcs.exp index 976aa22a05b..2456e4390b3 100755 --- a/gdb/testsuite/gdb.fortran/nested-funcs.exp +++ b/gdb/testsuite/gdb.fortran/nested-funcs.exp @@ -21,7 +21,7 @@ if { [skip_fortran_tests] } { return -1 } standard_testfile .f90
load_lib "fortran.exp"
-if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
return -1
}
diff --git a/gdb/testsuite/gdb.fortran/print-formatted.exp b/gdb/testsuite/gdb.fortran/print-formatted.exp index 9e069948dd3..504d7539930 100644 --- a/gdb/testsuite/gdb.fortran/print-formatted.exp +++ b/gdb/testsuite/gdb.fortran/print-formatted.exp @@ -21,7 +21,7 @@ if { [skip_fortran_tests] } { standard_testfile .f90 -if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/subarray.exp b/gdb/testsuite/gdb.fortran/subarray.exp index 045f5e6cd33..ab84d2e9443 100644 --- a/gdb/testsuite/gdb.fortran/subarray.exp +++ b/gdb/testsuite/gdb.fortran/subarray.exp @@ -22,7 +22,7 @@ if { [skip_fortran_tests] } { return -1 } standard_testfile .f -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} { return -1 } diff --git a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp index 4d84a218033..e25cd35fc06 100644 --- a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp +++ b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp @@ -15,7 +15,7 @@ standard_testfile "vla.f90" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/vla-datatypes.exp b/gdb/testsuite/gdb.fortran/vla-datatypes.exp index 26bf0a23c4b..e8333bb0257 100644 --- a/gdb/testsuite/gdb.fortran/vla-datatypes.exp +++ b/gdb/testsuite/gdb.fortran/vla-datatypes.exp @@ -16,7 +16,7 @@ standard_testfile ".f90" load_lib "fortran.exp" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/vla-history.exp b/gdb/testsuite/gdb.fortran/vla-history.exp index 20129619547..3ea18c58c7d 100644 --- a/gdb/testsuite/gdb.fortran/vla-history.exp +++ b/gdb/testsuite/gdb.fortran/vla-history.exp @@ -15,7 +15,7 @@ standard_testfile "vla.f90" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp index 95acc83d28d..0e13df71d1b 100644 --- a/gdb/testsuite/gdb.fortran/vla-ptr-info.exp +++ b/gdb/testsuite/gdb.fortran/vla-ptr-info.exp @@ -15,7 +15,7 @@ standard_testfile "vla.f90" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp b/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp index e7a0a7ec1f4..fac97ca652e 100644 --- a/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp +++ b/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp @@ -16,7 +16,7 @@ standard_testfile "vla-sub.f90" load_lib "fortran.exp" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/vla-ptype.exp b/gdb/testsuite/gdb.fortran/vla-ptype.exp index 175661fa7d2..be467633cdc 100644 --- a/gdb/testsuite/gdb.fortran/vla-ptype.exp +++ b/gdb/testsuite/gdb.fortran/vla-ptype.exp @@ -16,7 +16,7 @@ standard_testfile "vla.f90" load_lib "fortran.exp" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/vla-sizeof.exp b/gdb/testsuite/gdb.fortran/vla-sizeof.exp index 8010c0a6a18..e5efc80bbc0 100644 --- a/gdb/testsuite/gdb.fortran/vla-sizeof.exp +++ b/gdb/testsuite/gdb.fortran/vla-sizeof.exp @@ -15,7 +15,7 @@ standard_testfile "vla.f90" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/vla-type.exp b/gdb/testsuite/gdb.fortran/vla-type.exp index 401782b3e5a..74c42eb3094 100755 --- a/gdb/testsuite/gdb.fortran/vla-type.exp +++ b/gdb/testsuite/gdb.fortran/vla-type.exp @@ -16,7 +16,7 @@ standard_testfile ".f90" load_lib "fortran.exp" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp b/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp index ce33d701af3..28ec2e267d9 100644 --- a/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp +++ b/gdb/testsuite/gdb.fortran/vla-value-sub-arbitrary.exp @@ -15,7 +15,7 @@ standard_testfile "vla-sub.f90" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp b/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp index fde6c9f00ab..c18f1a409b3 100644 --- a/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp +++ b/gdb/testsuite/gdb.fortran/vla-value-sub-finish.exp @@ -15,7 +15,7 @@ standard_testfile "vla-sub.f90" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub.exp b/gdb/testsuite/gdb.fortran/vla-value-sub.exp index 179683d85a5..febf6756b01 100644 --- a/gdb/testsuite/gdb.fortran/vla-value-sub.exp +++ b/gdb/testsuite/gdb.fortran/vla-value-sub.exp @@ -15,7 +15,7 @@ standard_testfile "vla-sub.f90" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/vla-value.exp b/gdb/testsuite/gdb.fortran/vla-value.exp index 0945181649d..e642160c294 100644 --- a/gdb/testsuite/gdb.fortran/vla-value.exp +++ b/gdb/testsuite/gdb.fortran/vla-value.exp @@ -15,7 +15,7 @@ standard_testfile "vla.f90" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ {debug f90 quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.fortran/whatis_type.exp b/gdb/testsuite/gdb.fortran/whatis_type.exp index 6ebcb52c1ed..0aa510f7d5e 100644 --- a/gdb/testsuite/gdb.fortran/whatis_type.exp +++ b/gdb/testsuite/gdb.fortran/whatis_type.exp @@ -18,7 +18,7 @@ if { [skip_fortran_tests] } { continue } standard_testfile type.f90 load_lib "fortran.exp" -if { [prepare_for_testing ${testfile}.exp ${testfile} \ +if { [prepare_for_testing "failed to prepare" ${testfile} \ ${srcfile} {debug f90}] } { return -1 } diff --git a/gdb/testsuite/gdb.go/chan.exp b/gdb/testsuite/gdb.go/chan.exp index be903a8207f..42960521171 100644 --- a/gdb/testsuite/gdb.go/chan.exp +++ b/gdb/testsuite/gdb.go/chan.exp @@ -24,7 +24,7 @@ if { [skip_go_tests] } { continue } standard_testfile .go -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } { return -1 } @@ -32,7 +32,7 @@ set bp_location1 [gdb_get_line_number "set breakpoint 1 here"] set bp_location2 [gdb_get_line_number "set breakpoint 2 here"] if { [go_runto_main] < 0 } { - untested $testfile + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.go/handcall.exp b/gdb/testsuite/gdb.go/handcall.exp index 9f46479e340..ed7e6457b9f 100644 --- a/gdb/testsuite/gdb.go/handcall.exp +++ b/gdb/testsuite/gdb.go/handcall.exp @@ -23,12 +23,12 @@ if { [skip_go_tests] } { continue } standard_testfile .go -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } { return -1 } if { [go_runto_main] < 0 } { - untested $testfile + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.go/hello.exp b/gdb/testsuite/gdb.go/hello.exp index 192d035a14d..42aa09ee112 100644 --- a/gdb/testsuite/gdb.go/hello.exp +++ b/gdb/testsuite/gdb.go/hello.exp @@ -23,14 +23,14 @@ if { [skip_go_tests] } { continue } standard_testfile .go -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } { return -1 } set bp_location1 [gdb_get_line_number "set breakpoint 1 here"] if { [go_runto_main] < 0 } { - untested $testfile + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.go/integers.exp b/gdb/testsuite/gdb.go/integers.exp index d242addf3ed..a42cc4db9b5 100644 --- a/gdb/testsuite/gdb.go/integers.exp +++ b/gdb/testsuite/gdb.go/integers.exp @@ -23,7 +23,7 @@ if { [skip_go_tests] } { continue } standard_testfile .go -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } { return -1 } @@ -31,7 +31,7 @@ set bp_location1 [gdb_get_line_number "set breakpoint 1 here"] set bp_location2 [gdb_get_line_number "set breakpoint 2 here"] if { [go_runto_main] < 0 } { - untested $testfile + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.go/methods.exp b/gdb/testsuite/gdb.go/methods.exp index cb7f55a86c7..0f9bace3c70 100644 --- a/gdb/testsuite/gdb.go/methods.exp +++ b/gdb/testsuite/gdb.go/methods.exp @@ -23,7 +23,7 @@ if { [skip_go_tests] } { continue } standard_testfile .go -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } { return -1 } @@ -32,7 +32,7 @@ set bp_location2 {(*main.T).Bar} set bp_location2_regexp {\(*main.T\).Bar} if { [go_runto_main] < 0 } { - untested $testfile + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.go/package.exp b/gdb/testsuite/gdb.go/package.exp index fc5f85dba69..eddf4087a6b 100644 --- a/gdb/testsuite/gdb.go/package.exp +++ b/gdb/testsuite/gdb.go/package.exp @@ -24,12 +24,12 @@ if { [skip_go_tests] } { continue } standard_testfile package1.go package2.go if { [gdb_compile "${srcdir}/${subdir}/${testfile}2.go" "${binfile}2.o" object {debug go}] != "" } { - untested $testfile + untested "failed to compile" return -1 } if { [gdb_compile "${srcdir}/${subdir}/${testfile}1.go ${binfile}2.o" "${binfile}" executable "debug go libdir=[standard_output_file {}]"] != "" } { - untested $testfile + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.go/strings.exp b/gdb/testsuite/gdb.go/strings.exp index f9edd97f304..30cb48891c2 100644 --- a/gdb/testsuite/gdb.go/strings.exp +++ b/gdb/testsuite/gdb.go/strings.exp @@ -21,12 +21,12 @@ if { [skip_go_tests] } { continue } standard_testfile .go -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } { return -1 } if { [go_runto_main] < 0 } { - untested $testfile + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.go/types.exp b/gdb/testsuite/gdb.go/types.exp index d2b33cb0247..8bbb4c22dac 100644 --- a/gdb/testsuite/gdb.go/types.exp +++ b/gdb/testsuite/gdb.go/types.exp @@ -23,12 +23,12 @@ if { [skip_go_tests] } { continue } standard_testfile .go -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } { return -1 } if { [go_runto_main] < 0 } { - untested $testfile + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.go/unsafe.exp b/gdb/testsuite/gdb.go/unsafe.exp index 17f003fccb9..ed133e1d3cc 100644 --- a/gdb/testsuite/gdb.go/unsafe.exp +++ b/gdb/testsuite/gdb.go/unsafe.exp @@ -23,12 +23,12 @@ if { [skip_go_tests] } { continue } standard_testfile .go -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } { return -1 } if { [go_runto_main] < 0 } { - untested $testfile + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.guile/scm-arch.exp b/gdb/testsuite/gdb.guile/scm-arch.exp index 9bd2136e76c..1bd76fd7720 100644 --- a/gdb/testsuite/gdb.guile/scm-arch.exp +++ b/gdb/testsuite/gdb.guile/scm-arch.exp @@ -17,7 +17,7 @@ load_lib gdb-guile.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return } diff --git a/gdb/testsuite/gdb.guile/scm-block.exp b/gdb/testsuite/gdb.guile/scm-block.exp index 7a2a8f44df6..64d256283d4 100644 --- a/gdb/testsuite/gdb.guile/scm-block.exp +++ b/gdb/testsuite/gdb.guile/scm-block.exp @@ -20,7 +20,7 @@ load_lib gdb-guile.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.guile/scm-breakpoint.exp b/gdb/testsuite/gdb.guile/scm-breakpoint.exp index 33edf86b7f6..0a5c2d56305 100644 --- a/gdb/testsuite/gdb.guile/scm-breakpoint.exp +++ b/gdb/testsuite/gdb.guile/scm-breakpoint.exp @@ -20,7 +20,7 @@ load_lib gdb-guile.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.guile/scm-cmd.exp b/gdb/testsuite/gdb.guile/scm-cmd.exp index 5b1174c1384..95c6a24efeb 100644 --- a/gdb/testsuite/gdb.guile/scm-cmd.exp +++ b/gdb/testsuite/gdb.guile/scm-cmd.exp @@ -20,7 +20,7 @@ load_lib gdb-guile.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return } diff --git a/gdb/testsuite/gdb.guile/scm-disasm.exp b/gdb/testsuite/gdb.guile/scm-disasm.exp index 9ba7f60868a..78656b482b5 100644 --- a/gdb/testsuite/gdb.guile/scm-disasm.exp +++ b/gdb/testsuite/gdb.guile/scm-disasm.exp @@ -17,7 +17,7 @@ load_lib gdb-guile.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return } diff --git a/gdb/testsuite/gdb.guile/scm-equal.exp b/gdb/testsuite/gdb.guile/scm-equal.exp index e0ced8ffb10..1b93bc3a607 100644 --- a/gdb/testsuite/gdb.guile/scm-equal.exp +++ b/gdb/testsuite/gdb.guile/scm-equal.exp @@ -20,7 +20,7 @@ load_lib gdb-guile.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return } diff --git a/gdb/testsuite/gdb.guile/scm-frame-args.exp b/gdb/testsuite/gdb.guile/scm-frame-args.exp index 91703f751db..513d2b0aaf2 100644 --- a/gdb/testsuite/gdb.guile/scm-frame-args.exp +++ b/gdb/testsuite/gdb.guile/scm-frame-args.exp @@ -17,7 +17,7 @@ load_lib gdb-guile.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return } diff --git a/gdb/testsuite/gdb.guile/scm-frame-inline.exp b/gdb/testsuite/gdb.guile/scm-frame-inline.exp index f1d58ed65c5..77d99ed700d 100644 --- a/gdb/testsuite/gdb.guile/scm-frame-inline.exp +++ b/gdb/testsuite/gdb.guile/scm-frame-inline.exp @@ -17,7 +17,7 @@ load_lib gdb-guile.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return } diff --git a/gdb/testsuite/gdb.guile/scm-frame.exp b/gdb/testsuite/gdb.guile/scm-frame.exp index afcc88732cf..1488679ada6 100644 --- a/gdb/testsuite/gdb.guile/scm-frame.exp +++ b/gdb/testsuite/gdb.guile/scm-frame.exp @@ -20,7 +20,7 @@ load_lib gdb-guile.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.guile/scm-iterator.exp b/gdb/testsuite/gdb.guile/scm-iterator.exp index 13540d28449..7bb23b68539 100644 --- a/gdb/testsuite/gdb.guile/scm-iterator.exp +++ b/gdb/testsuite/gdb.guile/scm-iterator.exp @@ -20,7 +20,7 @@ load_lib gdb-guile.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.guile/scm-math.exp b/gdb/testsuite/gdb.guile/scm-math.exp index b3f2953a3f6..bad872eaec7 100644 --- a/gdb/testsuite/gdb.guile/scm-math.exp +++ b/gdb/testsuite/gdb.guile/scm-math.exp @@ -292,7 +292,7 @@ proc test_value_compare {} { "#t" "greater or equal, greater" } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c}]} { return } diff --git a/gdb/testsuite/gdb.guile/scm-objfile.exp b/gdb/testsuite/gdb.guile/scm-objfile.exp index d99a519516c..e00239b0559 100644 --- a/gdb/testsuite/gdb.guile/scm-objfile.exp +++ b/gdb/testsuite/gdb.guile/scm-objfile.exp @@ -20,7 +20,7 @@ load_lib gdb-guile.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return } diff --git a/gdb/testsuite/gdb.guile/scm-ports.exp b/gdb/testsuite/gdb.guile/scm-ports.exp index c3c558338fc..31e4520d126 100644 --- a/gdb/testsuite/gdb.guile/scm-ports.exp +++ b/gdb/testsuite/gdb.guile/scm-ports.exp @@ -20,7 +20,7 @@ load_lib gdb-guile.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return } diff --git a/gdb/testsuite/gdb.guile/scm-symbol.exp b/gdb/testsuite/gdb.guile/scm-symbol.exp index 3a7476df51c..c449eabfff5 100644 --- a/gdb/testsuite/gdb.guile/scm-symbol.exp +++ b/gdb/testsuite/gdb.guile/scm-symbol.exp @@ -20,7 +20,7 @@ load_lib gdb-guile.exp standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.guile/scm-symtab.exp b/gdb/testsuite/gdb.guile/scm-symtab.exp index 3b139d3936d..35f6e0abf58 100644 --- a/gdb/testsuite/gdb.guile/scm-symtab.exp +++ b/gdb/testsuite/gdb.guile/scm-symtab.exp @@ -20,7 +20,7 @@ load_lib gdb-guile.exp standard_testfile scm-symtab.c scm-symtab-2.c -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] debug]} { return } diff --git a/gdb/testsuite/gdb.guile/scm-value-cc.exp b/gdb/testsuite/gdb.guile/scm-value-cc.exp index 4d9279999e3..25756552da7 100644 --- a/gdb/testsuite/gdb.guile/scm-value-cc.exp +++ b/gdb/testsuite/gdb.guile/scm-value-cc.exp @@ -22,7 +22,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return } diff --git a/gdb/testsuite/gdb.guile/types-module.exp b/gdb/testsuite/gdb.guile/types-module.exp index 7a1c20d2a78..772d4365949 100644 --- a/gdb/testsuite/gdb.guile/types-module.exp +++ b/gdb/testsuite/gdb.guile/types-module.exp @@ -20,7 +20,7 @@ load_lib gdb-guile.exp standard_testfile .cc -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.linespec/break-ask.exp b/gdb/testsuite/gdb.linespec/break-ask.exp index 24f92705761..86518de8472 100644 --- a/gdb/testsuite/gdb.linespec/break-ask.exp +++ b/gdb/testsuite/gdb.linespec/break-ask.exp @@ -16,7 +16,7 @@ standard_testfile lspec.cc if {[skip_cplus_tests]} { - unsupported ${testfile}.exp + unsupported "skipping C++ tests" return } diff --git a/gdb/testsuite/gdb.linespec/cpexplicit.exp b/gdb/testsuite/gdb.linespec/cpexplicit.exp index e786332436c..8385d314c68 100644 --- a/gdb/testsuite/gdb.linespec/cpexplicit.exp +++ b/gdb/testsuite/gdb.linespec/cpexplicit.exp @@ -23,7 +23,7 @@ if {[skip_cplus_tests]} { standard_testfile .cc set exefile $testfile -if {[prepare_for_testing $testfile $exefile $srcfile \ +if {[prepare_for_testing "failed to prepare" $exefile $srcfile \ {c++ debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.linespec/explicit.exp b/gdb/testsuite/gdb.linespec/explicit.exp index 326010c44cb..9ce7a86a5dd 100644 --- a/gdb/testsuite/gdb.linespec/explicit.exp +++ b/gdb/testsuite/gdb.linespec/explicit.exp @@ -18,7 +18,7 @@ standard_testfile explicit.c explicit2.c 3explicit.c set exefile $testfile -if {[prepare_for_testing $testfile $exefile \ +if {[prepare_for_testing "failed to prepare" $exefile \ [list $srcfile $srcfile2 $srcfile3] {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.linespec/keywords.exp b/gdb/testsuite/gdb.linespec/keywords.exp index 7baf641a5a4..b043d05cf17 100644 --- a/gdb/testsuite/gdb.linespec/keywords.exp +++ b/gdb/testsuite/gdb.linespec/keywords.exp @@ -18,7 +18,7 @@ standard_testfile set exefile $testfile -if {[prepare_for_testing $testfile $exefile $srcfile {debug}]} { +if {[prepare_for_testing "failed to prepare" $exefile $srcfile {debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.linespec/linespec.exp b/gdb/testsuite/gdb.linespec/linespec.exp index 223d7d7a5a6..5a8e95ffbf5 100644 --- a/gdb/testsuite/gdb.linespec/linespec.exp +++ b/gdb/testsuite/gdb.linespec/linespec.exp @@ -27,7 +27,7 @@ if {[skip_cplus_tests]} { return } -if {[prepare_for_testing ${testfile}.exp $exefile \ +if {[prepare_for_testing "failed to prepare" $exefile \ [list $srcfile $baseone $basetwo] \ {debug nowarnings c++}]} { return -1 diff --git a/gdb/testsuite/gdb.linespec/ls-dollar.exp b/gdb/testsuite/gdb.linespec/ls-dollar.exp index 70b704b3ef2..785a9dd10e1 100644 --- a/gdb/testsuite/gdb.linespec/ls-dollar.exp +++ b/gdb/testsuite/gdb.linespec/ls-dollar.exp @@ -23,7 +23,7 @@ if {[skip_cplus_tests]} { return } -if {[prepare_for_testing $testfile $exefile $srcfile \ +if {[prepare_for_testing "failed to prepare" $exefile $srcfile \ {debug nowarnings c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.linespec/ls-errs.exp b/gdb/testsuite/gdb.linespec/ls-errs.exp index 4276aa2c03f..79dc8e2382c 100644 --- a/gdb/testsuite/gdb.linespec/ls-errs.exp +++ b/gdb/testsuite/gdb.linespec/ls-errs.exp @@ -37,7 +37,7 @@ proc do_test {lang} { lappend options "c++" } - if {[prepare_for_testing $testfile $exefile $srcfile $options]} { + if {[prepare_for_testing "failed to prepare" $exefile $srcfile $options]} { return -1 } diff --git a/gdb/testsuite/gdb.linespec/skip-two.exp b/gdb/testsuite/gdb.linespec/skip-two.exp index 7a6bef9efc8..b967462bf17 100644 --- a/gdb/testsuite/gdb.linespec/skip-two.exp +++ b/gdb/testsuite/gdb.linespec/skip-two.exp @@ -21,11 +21,11 @@ set baseone base/one/thefile.cc set basetwo base/two/thefile.cc if {[skip_cplus_tests]} { - unsupported ${testfile}.exp + unsupported "skipping C++ tests" return } -if {[prepare_for_testing ${testfile}.exp $execfile \ +if {[prepare_for_testing "failed to prepare" $execfile \ [list $srcfile $baseone $basetwo] \ {debug nowarnings c++}]} { return -1 diff --git a/gdb/testsuite/gdb.linespec/thread.exp b/gdb/testsuite/gdb.linespec/thread.exp index a469f27ec88..d7fee7b6d63 100644 --- a/gdb/testsuite/gdb.linespec/thread.exp +++ b/gdb/testsuite/gdb.linespec/thread.exp @@ -19,7 +19,7 @@ standard_testfile set exefile $testfile -if {[prepare_for_testing $testfile $exefile $srcfile {debug}]} { +if {[prepare_for_testing "failed to prepare" $exefile $srcfile {debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-async.exp b/gdb/testsuite/gdb.mi/mi-async.exp index aa753d0a4f7..21e227cfb28 100644 --- a/gdb/testsuite/gdb.mi/mi-async.exp +++ b/gdb/testsuite/gdb.mi/mi-async.exp @@ -39,7 +39,7 @@ if [mi_gdb_start] { standard_testfile basics.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-async.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-basics.exp b/gdb/testsuite/gdb.mi/mi-basics.exp index 6b4c8d406ed..5fef94fc882 100644 --- a/gdb/testsuite/gdb.mi/mi-basics.exp +++ b/gdb/testsuite/gdb.mi/mi-basics.exp @@ -42,7 +42,7 @@ set testsubdir [standard_output_file ""] set envirodir [string_to_regexp $testsubdir] if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-basics.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-break.exp b/gdb/testsuite/gdb.mi/mi-break.exp index 00293d7f443..315f3c67c79 100644 --- a/gdb/testsuite/gdb.mi/mi-break.exp +++ b/gdb/testsuite/gdb.mi/mi-break.exp @@ -26,7 +26,7 @@ set MIFLAGS "-i=mi" standard_testfile basics.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-break.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-catch-load.exp b/gdb/testsuite/gdb.mi/mi-catch-load.exp index fe28afc3306..c503497bbd1 100644 --- a/gdb/testsuite/gdb.mi/mi-catch-load.exp +++ b/gdb/testsuite/gdb.mi/mi-catch-load.exp @@ -25,14 +25,14 @@ if [mi_gdb_start] { if {[get_compiler_info]} { warning "Could not get compiler info" - untested mi-catch-load.exp + untested "no compiler info" return -1 } standard_testfile mi-catch-load.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug shlib_load}] != "" } { - untested mi-catch-load.exp + untested "failed to compile" return -1 } @@ -41,7 +41,7 @@ set srcfile2 ${testfile2}.c set binfile2 [standard_output_file ${testfile2}.so] set binfile2_dlopen [shlib_target_file ${testfile2}.so] if { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" ${binfile2} {debug}] != "" } { - untested mi-catch-load.exp + untested "failed to compile shared library" return -1 } mi_run_to_main diff --git a/gdb/testsuite/gdb.mi/mi-cli.exp b/gdb/testsuite/gdb.mi/mi-cli.exp index 1ec8809f836..451f44e37ae 100644 --- a/gdb/testsuite/gdb.mi/mi-cli.exp +++ b/gdb/testsuite/gdb.mi/mi-cli.exp @@ -30,7 +30,7 @@ if [mi_gdb_start] { standard_testfile basics.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-cli.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp b/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp index e19f47184b6..96cebb91533 100644 --- a/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp +++ b/gdb/testsuite/gdb.mi/mi-cmd-param-changed.exp @@ -19,7 +19,7 @@ set MIFLAGS "-i=mi" standard_testfile basics.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-cmd-param-changed.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-console.exp b/gdb/testsuite/gdb.mi/mi-console.exp index 13ce931be72..7c89b7e443d 100644 --- a/gdb/testsuite/gdb.mi/mi-console.exp +++ b/gdb/testsuite/gdb.mi/mi-console.exp @@ -54,7 +54,7 @@ if [mi_gdb_start separate-inferior-tty] { standard_testfile if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-console.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-detach.exp b/gdb/testsuite/gdb.mi/mi-detach.exp index f264306e38f..a7ac80f67de 100644 --- a/gdb/testsuite/gdb.mi/mi-detach.exp +++ b/gdb/testsuite/gdb.mi/mi-detach.exp @@ -26,7 +26,7 @@ if [mi_gdb_start] { standard_testfile basics.c if {[build_executable $testfile.exp $testfile $srcfile {debug}] == -1} { - untested mi-detach.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-disassemble.exp b/gdb/testsuite/gdb.mi/mi-disassemble.exp index 9ae4437dc78..50b152f44f0 100644 --- a/gdb/testsuite/gdb.mi/mi-disassemble.exp +++ b/gdb/testsuite/gdb.mi/mi-disassemble.exp @@ -31,7 +31,7 @@ if [mi_gdb_start] { standard_testfile basics.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-disassemble.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-eval.exp b/gdb/testsuite/gdb.mi/mi-eval.exp index 56f157a8d37..a5cbe49a274 100644 --- a/gdb/testsuite/gdb.mi/mi-eval.exp +++ b/gdb/testsuite/gdb.mi/mi-eval.exp @@ -33,7 +33,7 @@ if [mi_gdb_start] { standard_testfile basics.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-eval.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-file-transfer.exp b/gdb/testsuite/gdb.mi/mi-file-transfer.exp index 7e4b18d7743..88bae7eafe8 100644 --- a/gdb/testsuite/gdb.mi/mi-file-transfer.exp +++ b/gdb/testsuite/gdb.mi/mi-file-transfer.exp @@ -27,7 +27,7 @@ if { [skip_gdbserver_tests] } { standard_testfile basics.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-file-transfer.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-file.exp b/gdb/testsuite/gdb.mi/mi-file.exp index 3ec43e0cce2..2a3422319b2 100644 --- a/gdb/testsuite/gdb.mi/mi-file.exp +++ b/gdb/testsuite/gdb.mi/mi-file.exp @@ -26,7 +26,7 @@ if [mi_gdb_start] { standard_testfile basics.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-file.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-fill-memory.exp b/gdb/testsuite/gdb.mi/mi-fill-memory.exp index a87bc6e2bad..a7590c76a3e 100644 --- a/gdb/testsuite/gdb.mi/mi-fill-memory.exp +++ b/gdb/testsuite/gdb.mi/mi-fill-memory.exp @@ -28,7 +28,7 @@ if [mi_gdb_start] { standard_testfile "mi-read-memory" if { [gdb_compile "${srcdir}/${subdir}/${srcfile}.c" "${binfile}" executable {debug}] != "" } { - untested mi-fill-memory.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp b/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp index 3c1a750ce9f..ac71d0ada58 100644 --- a/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp +++ b/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp @@ -30,7 +30,7 @@ if [get_compiler_info "c++"] { } if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable {debug c++}] != ""} { - untested mi-inheritance-syntax-error.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp b/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp index 34355082270..075225c9acd 100644 --- a/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp +++ b/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp @@ -27,7 +27,7 @@ set MIFLAGS "-i=mi" standard_testfile .cc set exefile $testfile -if {[prepare_for_testing $testfile $exefile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $exefile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-logging.exp b/gdb/testsuite/gdb.mi/mi-logging.exp index 8babed01caf..8e2ffd7f812 100644 --- a/gdb/testsuite/gdb.mi/mi-logging.exp +++ b/gdb/testsuite/gdb.mi/mi-logging.exp @@ -25,7 +25,7 @@ standard_testfile basics.c set opts {debug} if [build_executable $testfile.exp $testfile $srcfile $opts] { - untested mi-logging.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-memory-changed.exp b/gdb/testsuite/gdb.mi/mi-memory-changed.exp index 511f5d72edc..ff800f3e390 100644 --- a/gdb/testsuite/gdb.mi/mi-memory-changed.exp +++ b/gdb/testsuite/gdb.mi/mi-memory-changed.exp @@ -16,7 +16,7 @@ standard_testfile basics.c if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-read-memory.exp b/gdb/testsuite/gdb.mi/mi-read-memory.exp index 551c8dd82a8..83a120e135f 100644 --- a/gdb/testsuite/gdb.mi/mi-read-memory.exp +++ b/gdb/testsuite/gdb.mi/mi-read-memory.exp @@ -26,7 +26,7 @@ if [mi_gdb_start] { standard_testfile if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-read-memory.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-record-changed.exp b/gdb/testsuite/gdb.mi/mi-record-changed.exp index 22cf076ee50..ec72ff3e3a0 100644 --- a/gdb/testsuite/gdb.mi/mi-record-changed.exp +++ b/gdb/testsuite/gdb.mi/mi-record-changed.exp @@ -20,7 +20,7 @@ if ![supports_process_record] { standard_testfile basics.c if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] != "" } { - untested mi-record-changed.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-reg-undefined.exp b/gdb/testsuite/gdb.mi/mi-reg-undefined.exp index 2ec35d567b3..b26b216b6cb 100644 --- a/gdb/testsuite/gdb.mi/mi-reg-undefined.exp +++ b/gdb/testsuite/gdb.mi/mi-reg-undefined.exp @@ -34,7 +34,7 @@ if [mi_gdb_start] { standard_testfile .S if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-reg-undefined.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-regs.exp b/gdb/testsuite/gdb.mi/mi-regs.exp index f66b9049bde..2803ff1b63b 100644 --- a/gdb/testsuite/gdb.mi/mi-regs.exp +++ b/gdb/testsuite/gdb.mi/mi-regs.exp @@ -33,7 +33,7 @@ if [mi_gdb_start] { standard_testfile basics.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-regs.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-return.exp b/gdb/testsuite/gdb.mi/mi-return.exp index c6e4d0e654f..0d634c7bedd 100644 --- a/gdb/testsuite/gdb.mi/mi-return.exp +++ b/gdb/testsuite/gdb.mi/mi-return.exp @@ -32,7 +32,7 @@ if [mi_gdb_start] { standard_testfile basics.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-return.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-reverse.exp b/gdb/testsuite/gdb.mi/mi-reverse.exp index 5afeececb68..0a2d4ed7c24 100644 --- a/gdb/testsuite/gdb.mi/mi-reverse.exp +++ b/gdb/testsuite/gdb.mi/mi-reverse.exp @@ -42,7 +42,7 @@ if [mi_gdb_start] { standard_testfile basics.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-simplerun.exp b/gdb/testsuite/gdb.mi/mi-simplerun.exp index 50eea1b6972..d8f0058421b 100644 --- a/gdb/testsuite/gdb.mi/mi-simplerun.exp +++ b/gdb/testsuite/gdb.mi/mi-simplerun.exp @@ -35,7 +35,7 @@ if [mi_gdb_start] { standard_testfile basics.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-simplerun.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-solib.exp b/gdb/testsuite/gdb.mi/mi-solib.exp index e4936c4c521..1902de6562f 100644 --- a/gdb/testsuite/gdb.mi/mi-solib.exp +++ b/gdb/testsuite/gdb.mi/mi-solib.exp @@ -17,7 +17,7 @@ load_lib mi-support.exp set MIFLAGS "-i=mi2" if {[skip_shlib_tests]} { - untested mi-solib.exp + untested "skipping shared library tests" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-stack.exp b/gdb/testsuite/gdb.mi/mi-stack.exp index e0d032c91ad..f2d6fcbbd6b 100644 --- a/gdb/testsuite/gdb.mi/mi-stack.exp +++ b/gdb/testsuite/gdb.mi/mi-stack.exp @@ -33,7 +33,7 @@ if [mi_gdb_start] { standard_testfile if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-stack.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-stepi.exp b/gdb/testsuite/gdb.mi/mi-stepi.exp index b09f9bbb516..1f4dfbf7f7c 100644 --- a/gdb/testsuite/gdb.mi/mi-stepi.exp +++ b/gdb/testsuite/gdb.mi/mi-stepi.exp @@ -31,7 +31,7 @@ if [mi_gdb_start] { standard_testfile basics.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-stepi.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-syn-frame.exp b/gdb/testsuite/gdb.mi/mi-syn-frame.exp index 3984d030f62..5b403d90f53 100644 --- a/gdb/testsuite/gdb.mi/mi-syn-frame.exp +++ b/gdb/testsuite/gdb.mi/mi-syn-frame.exp @@ -27,7 +27,7 @@ set MIFLAGS "-i=mi" standard_testfile if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-syn-frame.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-until.exp b/gdb/testsuite/gdb.mi/mi-until.exp index d2edc412965..e59b033f493 100644 --- a/gdb/testsuite/gdb.mi/mi-until.exp +++ b/gdb/testsuite/gdb.mi/mi-until.exp @@ -32,7 +32,7 @@ if [mi_gdb_start] { standard_testfile until.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-until.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-var-block.exp b/gdb/testsuite/gdb.mi/mi-var-block.exp index 2ee9c0cd6b3..7b433ba57fb 100644 --- a/gdb/testsuite/gdb.mi/mi-var-block.exp +++ b/gdb/testsuite/gdb.mi/mi-var-block.exp @@ -30,7 +30,7 @@ if [mi_gdb_start] { standard_testfile var-cmd.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-var-block.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-var-child.exp b/gdb/testsuite/gdb.mi/mi-var-child.exp index 0a8c4043e66..b1bdbc46b12 100644 --- a/gdb/testsuite/gdb.mi/mi-var-child.exp +++ b/gdb/testsuite/gdb.mi/mi-var-child.exp @@ -30,7 +30,7 @@ if [mi_gdb_start] { standard_testfile if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-var-child.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp index 558cd6c5654..47f8ff9f221 100644 --- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp +++ b/gdb/testsuite/gdb.mi/mi-var-cmd.exp @@ -30,7 +30,7 @@ if [mi_gdb_start] { standard_testfile var-cmd.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-var-cmd.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-var-cp.exp b/gdb/testsuite/gdb.mi/mi-var-cp.exp index 7260a8241d8..571f302d512 100644 --- a/gdb/testsuite/gdb.mi/mi-var-cp.exp +++ b/gdb/testsuite/gdb.mi/mi-var-cp.exp @@ -30,7 +30,7 @@ if [get_compiler_info "c++"] { } if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable {debug c++}] != ""} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp index 8b238cac6fb..dfd1765cd80 100644 --- a/gdb/testsuite/gdb.mi/mi-var-display.exp +++ b/gdb/testsuite/gdb.mi/mi-var-display.exp @@ -30,7 +30,7 @@ if [mi_gdb_start] { standard_testfile var-cmd.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-var-display.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp index 0eda5e53af7..5ce901d8d75 100644 --- a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp +++ b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp @@ -31,13 +31,13 @@ if [mi_gdb_start] { standard_testfile var-cmd.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-var-invalidate.exp + untested "failed to compile" return -1 } # Just change the output binary. set binfile_bis [standard_output_file mi-var-invalidate_bis] if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile_bis}" executable {debug}] != "" } { - untested mi-var-invalidate.exp + untested "failed to compile" return -1 } @@ -45,7 +45,7 @@ set testfile2 "basics" set srcfile2 ${testfile2}.c set binfile2 [standard_output_file ${testfile2}] if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } { - untested mi-var-invalidate.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp b/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp index daaaadd4bc1..c179b96c0ca 100644 --- a/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp +++ b/gdb/testsuite/gdb.mi/mi-var-list-children-invalid-grandchild.exp @@ -27,7 +27,7 @@ if [mi_gdb_start] { standard_testfile if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-var-list-children-invalid-grandchild.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp index 333b71aeb30..5ee867b68a4 100644 --- a/gdb/testsuite/gdb.mi/mi-vla-fortran.exp +++ b/gdb/testsuite/gdb.mi/mi-vla-fortran.exp @@ -28,7 +28,7 @@ standard_testfile vla.f90 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \ {debug f90}] != "" } { - untested mi-vla-fortran.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-watch.exp b/gdb/testsuite/gdb.mi/mi-watch.exp index 29fc4716def..0886d2c9b1f 100644 --- a/gdb/testsuite/gdb.mi/mi-watch.exp +++ b/gdb/testsuite/gdb.mi/mi-watch.exp @@ -28,7 +28,7 @@ gdb_exit standard_testfile basics.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-watch.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi2-var-child.exp b/gdb/testsuite/gdb.mi/mi2-var-child.exp index 3c516ceee08..1ad1d185148 100644 --- a/gdb/testsuite/gdb.mi/mi2-var-child.exp +++ b/gdb/testsuite/gdb.mi/mi2-var-child.exp @@ -30,7 +30,7 @@ if [mi_gdb_start] { standard_testfile var-cmd.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi2-var-child.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp index 8c9e4e054a4..85604829266 100644 --- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp +++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp @@ -36,7 +36,7 @@ standard_testfile # Multiple inferiors are needed, therefore only native gdb and extended # gdbserver modes are supported. if [use_gdb_stub] { - untested ${testfile}.exp + untested "using gdb stub" return } diff --git a/gdb/testsuite/gdb.modula2/unbounded-array.exp b/gdb/testsuite/gdb.modula2/unbounded-array.exp index 19dafcc0a47..550b8533fbe 100644 --- a/gdb/testsuite/gdb.modula2/unbounded-array.exp +++ b/gdb/testsuite/gdb.modula2/unbounded-array.exp @@ -19,8 +19,7 @@ standard_testfile unbounded1.c -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug quiet}]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug quiet}]} { return -1 } diff --git a/gdb/testsuite/gdb.multi/dummy-frame-restore.exp b/gdb/testsuite/gdb.multi/dummy-frame-restore.exp index e0b7c419cfd..0970a84b11a 100644 --- a/gdb/testsuite/gdb.multi/dummy-frame-restore.exp +++ b/gdb/testsuite/gdb.multi/dummy-frame-restore.exp @@ -21,7 +21,7 @@ if [target_info exists use_gdb_stub] { return } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.multi/multi-arch-exec.exp b/gdb/testsuite/gdb.multi/multi-arch-exec.exp index 7b6b8188a7b..6546d146fc1 100644 --- a/gdb/testsuite/gdb.multi/multi-arch-exec.exp +++ b/gdb/testsuite/gdb.multi/multi-arch-exec.exp @@ -52,7 +52,7 @@ if [istarget "s390*-*-*"] { set march2 "-m32" } -if { [prepare_for_testing ${testfile}.exp ${exec1} "${srcfile1}" \ +if { [prepare_for_testing "failed to prepare" ${exec1} "${srcfile1}" \ [list debug \ additional_flags=${march1}]] } { return -1 @@ -71,7 +71,7 @@ if { [istarget "aarch64*-*-*"] } { lappend options "additional_flags=${march2}" } -if { [prepare_for_testing ${testfile}.exp ${exec2} "${srcfile2}" \ +if { [prepare_for_testing "failed to prepare" ${exec2} "${srcfile2}" \ $options] } { return -1 } diff --git a/gdb/testsuite/gdb.multi/multi-arch.exp b/gdb/testsuite/gdb.multi/multi-arch.exp index b114a2ff74d..f9fe794b802 100644 --- a/gdb/testsuite/gdb.multi/multi-arch.exp +++ b/gdb/testsuite/gdb.multi/multi-arch.exp @@ -52,7 +52,7 @@ if [istarget "s390*-*-*"] { set march2 "-m32" } -if { [prepare_for_testing ${testfile}.exp ${exec1} "${srcfile1}" \ +if { [prepare_for_testing "failed to prepare" ${exec1} "${srcfile1}" \ [list debug additional_flags=${march1}]] } { return -1 } @@ -70,7 +70,7 @@ if [istarget "aarch64*-*-*"] { lappend options "additional_flags=${march2}" } -if { [prepare_for_testing ${testfile}.exp ${exec2} "${srcfile2}" \ +if { [prepare_for_testing "failed to prepare" ${exec2} "${srcfile2}" \ $options]} { return -1 } diff --git a/gdb/testsuite/gdb.multi/tids.exp b/gdb/testsuite/gdb.multi/tids.exp index 12ce98ab0c2..42512317e17 100644 --- a/gdb/testsuite/gdb.multi/tids.exp +++ b/gdb/testsuite/gdb.multi/tids.exp @@ -23,7 +23,7 @@ standard_testfile # gdbserver modes are supported. Only non-extended gdbserver is not # supported. if [target_info exists use_gdb_stub] { - untested ${testfile}.exp + untested "using gdb stub" return } diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi.exp b/gdb/testsuite/gdb.multi/watchpoint-multi.exp index 7c671d2da3c..28f4dadee5e 100644 --- a/gdb/testsuite/gdb.multi/watchpoint-multi.exp +++ b/gdb/testsuite/gdb.multi/watchpoint-multi.exp @@ -19,7 +19,7 @@ set executable ${testfile} # Multiple inferiors are needed, therefore both native and extended gdbserver # modes are supported. Only non-extended gdbserver is not supported. if [target_info exists use_gdb_stub] { - untested ${testfile}.exp + untested "using gdb stub" return } @@ -31,7 +31,7 @@ if [skip_hw_watchpoint_access_tests] { } if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.opencl/callfuncs.exp b/gdb/testsuite/gdb.opencl/callfuncs.exp index 0496b143315..8f5ef92bfbb 100644 --- a/gdb/testsuite/gdb.opencl/callfuncs.exp +++ b/gdb/testsuite/gdb.opencl/callfuncs.exp @@ -28,7 +28,7 @@ set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] # Compile the generic OpenCL host app if { [gdb_compile_opencl_hostapp "${clprogram}" "${testfile}" "" ] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.opencl/convs_casts.exp b/gdb/testsuite/gdb.opencl/convs_casts.exp index e80206264a4..324ffc65c6d 100644 --- a/gdb/testsuite/gdb.opencl/convs_casts.exp +++ b/gdb/testsuite/gdb.opencl/convs_casts.exp @@ -28,7 +28,7 @@ set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] # Compile the generic OpenCL host app if { [gdb_compile_opencl_hostapp "${clprogram}" "${testfile}" "" ] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.opencl/datatypes.exp b/gdb/testsuite/gdb.opencl/datatypes.exp index 5beb74aa6bf..85796df3f93 100644 --- a/gdb/testsuite/gdb.opencl/datatypes.exp +++ b/gdb/testsuite/gdb.opencl/datatypes.exp @@ -28,7 +28,7 @@ set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] # Compile the generic OpenCL host app if { [gdb_compile_opencl_hostapp "${clprogram}" "${testfile}" "" ] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.opencl/operators.exp b/gdb/testsuite/gdb.opencl/operators.exp index 77f230d8c38..c684b71cf7b 100644 --- a/gdb/testsuite/gdb.opencl/operators.exp +++ b/gdb/testsuite/gdb.opencl/operators.exp @@ -28,7 +28,7 @@ set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] # Compile the generic OpenCL host app if { [gdb_compile_opencl_hostapp "${clprogram}" "${testfile}" "" ] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.opencl/vec_comps.exp b/gdb/testsuite/gdb.opencl/vec_comps.exp index ef91e8adcfd..80964037e24 100644 --- a/gdb/testsuite/gdb.opencl/vec_comps.exp +++ b/gdb/testsuite/gdb.opencl/vec_comps.exp @@ -28,7 +28,7 @@ set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] # Compile the generic OpenCL host app if { [gdb_compile_opencl_hostapp "${clprogram}" "${testfile}" "" ] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp index e33f1b581f7..38e736bde09 100644 --- a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp +++ b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp @@ -26,7 +26,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ {debug optimize=-O2 nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.opt/inline-break.exp b/gdb/testsuite/gdb.opt/inline-break.exp index ac56b04da8d..96ea8771d00 100644 --- a/gdb/testsuite/gdb.opt/inline-break.exp +++ b/gdb/testsuite/gdb.opt/inline-break.exp @@ -19,7 +19,7 @@ standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile \ +if { [prepare_for_testing "failed to prepare" $testfile $srcfile \ {debug additional_flags=-Winline}] } { return -1 } diff --git a/gdb/testsuite/gdb.opt/inline-bt.exp b/gdb/testsuite/gdb.opt/inline-bt.exp index 13c69933a28..aba97fc6cac 100644 --- a/gdb/testsuite/gdb.opt/inline-bt.exp +++ b/gdb/testsuite/gdb.opt/inline-bt.exp @@ -15,7 +15,7 @@ standard_testfile .c inline-markers.c -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] \ {debug additional_flags=-Winline}]} { return -1 @@ -26,7 +26,7 @@ runto_main get_compiler_info get_debug_format if { [skip_inline_frame_tests] } { - untested inline-bt.exp + untested "skipping inline frame tests" return } diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp index 6c84848f3e1..090cb2c04ac 100644 --- a/gdb/testsuite/gdb.opt/inline-cmds.exp +++ b/gdb/testsuite/gdb.opt/inline-cmds.exp @@ -18,7 +18,7 @@ set MIFLAGS "-i=mi" standard_testfile .c inline-markers.c -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug additional_flags=-Winline}]} { return -1 } @@ -30,7 +30,7 @@ runto_main get_compiler_info get_debug_format if { [skip_inline_frame_tests] } { - untested inline-cmds.exp + untested "skipping inline frame tests" return } diff --git a/gdb/testsuite/gdb.opt/inline-locals.exp b/gdb/testsuite/gdb.opt/inline-locals.exp index 36f7ed2d74f..2723ff9b5c7 100644 --- a/gdb/testsuite/gdb.opt/inline-locals.exp +++ b/gdb/testsuite/gdb.opt/inline-locals.exp @@ -15,7 +15,7 @@ standard_testfile .c inline-markers.c -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug additional_flags=-Winline}]} { return -1 } diff --git a/gdb/testsuite/gdb.pascal/case-insensitive-symbols.exp b/gdb/testsuite/gdb.pascal/case-insensitive-symbols.exp index b6e2a42be97..a2713e4e5d1 100644 --- a/gdb/testsuite/gdb.pascal/case-insensitive-symbols.exp +++ b/gdb/testsuite/gdb.pascal/case-insensitive-symbols.exp @@ -18,7 +18,7 @@ load_lib "pascal.exp" standard_testfile .pas if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug class]] != "" } { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.pascal/floats.exp b/gdb/testsuite/gdb.pascal/floats.exp index bd2794728fa..9e582721665 100644 --- a/gdb/testsuite/gdb.pascal/floats.exp +++ b/gdb/testsuite/gdb.pascal/floats.exp @@ -18,7 +18,7 @@ load_lib "pascal.exp" standard_testfile .pas if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.pascal/gdb11492.exp b/gdb/testsuite/gdb.pascal/gdb11492.exp index 38c942a8f8f..837c0825a42 100644 --- a/gdb/testsuite/gdb.pascal/gdb11492.exp +++ b/gdb/testsuite/gdb.pascal/gdb11492.exp @@ -18,7 +18,7 @@ load_lib "pascal.exp" standard_testfile .pas if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.python/lib-types.exp b/gdb/testsuite/gdb.python/lib-types.exp index f09571887d8..42014cb294d 100644 --- a/gdb/testsuite/gdb.python/lib-types.exp +++ b/gdb/testsuite/gdb.python/lib-types.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.python/py-arch.exp b/gdb/testsuite/gdb.python/py-arch.exp index 1551b123251..c8c5941fc05 100644 --- a/gdb/testsuite/gdb.python/py-arch.exp +++ b/gdb/testsuite/gdb.python/py-arch.exp @@ -15,7 +15,7 @@ load_lib gdb-python.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-as-string.exp b/gdb/testsuite/gdb.python/py-as-string.exp index 2b48501e0a5..0894a74c75b 100644 --- a/gdb/testsuite/gdb.python/py-as-string.exp +++ b/gdb/testsuite/gdb.python/py-as-string.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-bad-printers.exp b/gdb/testsuite/gdb.python/py-bad-printers.exp index 14498204113..e171503dd48 100644 --- a/gdb/testsuite/gdb.python/py-bad-printers.exp +++ b/gdb/testsuite/gdb.python/py-bad-printers.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp index 88de4a96e20..33433c8e6c6 100644 --- a/gdb/testsuite/gdb.python/py-block.exp +++ b/gdb/testsuite/gdb.python/py-block.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp b/gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp index 354a91e89fd..fb566389ef2 100644 --- a/gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp +++ b/gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp index e7b2948b96a..1d0e5b5f2da 100644 --- a/gdb/testsuite/gdb.python/py-breakpoint.exp +++ b/gdb/testsuite/gdb.python/py-breakpoint.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-caller-is.exp b/gdb/testsuite/gdb.python/py-caller-is.exp index 2a0fe5cc16f..10086f71281 100644 --- a/gdb/testsuite/gdb.python/py-caller-is.exp +++ b/gdb/testsuite/gdb.python/py-caller-is.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-cmd.exp b/gdb/testsuite/gdb.python/py-cmd.exp index f42fcaca144..9a2463bc9b9 100644 --- a/gdb/testsuite/gdb.python/py-cmd.exp +++ b/gdb/testsuite/gdb.python/py-cmd.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-explore-cc.exp b/gdb/testsuite/gdb.python/py-explore-cc.exp index f3546e03978..9ae852e2157 100644 --- a/gdb/testsuite/gdb.python/py-explore-cc.exp +++ b/gdb/testsuite/gdb.python/py-explore-cc.exp @@ -20,7 +20,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile py-explore.cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.python/py-explore.exp b/gdb/testsuite/gdb.python/py-explore.exp index aa6f8a794c8..f219eea7e54 100644 --- a/gdb/testsuite/gdb.python/py-explore.exp +++ b/gdb/testsuite/gdb.python/py-explore.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp index 03341f57d07..290822c690b 100644 --- a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp +++ b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp @@ -17,7 +17,7 @@ # exposing values to Python. if {[skip_shlib_tests]} { - untested py-finish-breakpoint.exp + untested "skipping shared library tests" return 0 } @@ -49,7 +49,7 @@ if { [skip_python_tests] } { continue } if { $gdb_py_is_py24 == 1 } { # Python 2.4, 2.5 do not support the "ValueError as e" syntax used in # the py-finish-breakpoint.py script. - untested py-finish-breakpoint.exp + untested "missing support on Python 2.4 and 2.5" return 0 } diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp index 8859d71d1d9..3534e694bad 100644 --- a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp +++ b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.python/py-frame-args.exp b/gdb/testsuite/gdb.python/py-frame-args.exp index 8edabf8334a..ed6945c0566 100644 --- a/gdb/testsuite/gdb.python/py-frame-args.exp +++ b/gdb/testsuite/gdb.python/py-frame-args.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-frame-inline.exp b/gdb/testsuite/gdb.python/py-frame-inline.exp index 98d349d9820..fb0f49f5e11 100644 --- a/gdb/testsuite/gdb.python/py-frame-inline.exp +++ b/gdb/testsuite/gdb.python/py-frame-inline.exp @@ -17,7 +17,7 @@ load_lib gdb-python.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp index f2a99078107..ba799fa39bd 100644 --- a/gdb/testsuite/gdb.python/py-frame.exp +++ b/gdb/testsuite/gdb.python/py-frame.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-framefilter-mi.exp b/gdb/testsuite/gdb.python/py-framefilter-mi.exp index 8ee4faa927b..7049e917571 100644 --- a/gdb/testsuite/gdb.python/py-framefilter-mi.exp +++ b/gdb/testsuite/gdb.python/py-framefilter-mi.exp @@ -29,7 +29,7 @@ standard_testfile py-framefilter-mi.c set pyfile py-framefilter.py if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DMI}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.python/py-infthread.exp b/gdb/testsuite/gdb.python/py-infthread.exp index 9292d2833fa..ded385a3a73 100644 --- a/gdb/testsuite/gdb.python/py-infthread.exp +++ b/gdb/testsuite/gdb.python/py-infthread.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-lazy-string.exp b/gdb/testsuite/gdb.python/py-lazy-string.exp index f57a4825e65..ca4b3ab2dcd 100644 --- a/gdb/testsuite/gdb.python/py-lazy-string.exp +++ b/gdb/testsuite/gdb.python/py-lazy-string.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.python/py-linetable.exp b/gdb/testsuite/gdb.python/py-linetable.exp index b65f46d85a5..45c7155fad7 100644 --- a/gdb/testsuite/gdb.python/py-linetable.exp +++ b/gdb/testsuite/gdb.python/py-linetable.exp @@ -26,7 +26,7 @@ if [info exists COMPILE] { return } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-mi-events.exp b/gdb/testsuite/gdb.python/py-mi-events.exp index d20ae985d9d..676b241ff59 100644 --- a/gdb/testsuite/gdb.python/py-mi-events.exp +++ b/gdb/testsuite/gdb.python/py-mi-events.exp @@ -27,7 +27,7 @@ standard_testfile set pyfile ${testfile}-gdb.py if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.python/py-mi-objfile.exp b/gdb/testsuite/gdb.python/py-mi-objfile.exp index bfa43a215e7..d3cbf8b6c1b 100644 --- a/gdb/testsuite/gdb.python/py-mi-objfile.exp +++ b/gdb/testsuite/gdb.python/py-mi-objfile.exp @@ -27,7 +27,7 @@ standard_testfile set pyfile ${testfile}-gdb.py if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.python/py-mi.exp b/gdb/testsuite/gdb.python/py-mi.exp index 3272f21f63a..6eb7cf75f45 100644 --- a/gdb/testsuite/gdb.python/py-mi.exp +++ b/gdb/testsuite/gdb.python/py-mi.exp @@ -27,7 +27,7 @@ if [mi_gdb_start] { standard_testfile py-prettyprint.c set pyfile py-prettyprint.py if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DMI}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.python/py-objfile.exp b/gdb/testsuite/gdb.python/py-objfile.exp index 9f7ded9d139..8831ef1aaf7 100644 --- a/gdb/testsuite/gdb.python/py-objfile.exp +++ b/gdb/testsuite/gdb.python/py-objfile.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } @@ -99,7 +99,7 @@ gdb_test "python print(objfile.username)" "None" \ # Now build another copy of the testcase, this time without debug info. -if { [prepare_for_testing ${testfile}.exp ${testfile}2 ${srcfile} {nodebug ldflags=-Wl,--strip-debug}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}2 ${srcfile} {nodebug ldflags=-Wl,--strip-debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-pp-integral.exp b/gdb/testsuite/gdb.python/py-pp-integral.exp index c2644cbbd1b..2a5773c5fbb 100644 --- a/gdb/testsuite/gdb.python/py-pp-integral.exp +++ b/gdb/testsuite/gdb.python/py-pp-integral.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-pp-maint.exp b/gdb/testsuite/gdb.python/py-pp-maint.exp index 5bddfa2dda4..fb347489b86 100644 --- a/gdb/testsuite/gdb.python/py-pp-maint.exp +++ b/gdb/testsuite/gdb.python/py-pp-maint.exp @@ -25,7 +25,7 @@ load_lib gdb-python.exp standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.python/py-pp-re-notag.exp b/gdb/testsuite/gdb.python/py-pp-re-notag.exp index c2644cbbd1b..2a5773c5fbb 100644 --- a/gdb/testsuite/gdb.python/py-pp-re-notag.exp +++ b/gdb/testsuite/gdb.python/py-pp-re-notag.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-pp-registration.exp b/gdb/testsuite/gdb.python/py-pp-registration.exp index 2a8796cab6c..20e8cdc586d 100644 --- a/gdb/testsuite/gdb.python/py-pp-registration.exp +++ b/gdb/testsuite/gdb.python/py-pp-registration.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.python/py-recurse-unwind.exp b/gdb/testsuite/gdb.python/py-recurse-unwind.exp index d611c90528b..56b3d8b0964 100644 --- a/gdb/testsuite/gdb.python/py-recurse-unwind.exp +++ b/gdb/testsuite/gdb.python/py-recurse-unwind.exp @@ -26,7 +26,7 @@ load_lib gdb-python.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-strfns.exp b/gdb/testsuite/gdb.python/py-strfns.exp index f6d1d5c4cc5..620c646d41f 100644 --- a/gdb/testsuite/gdb.python/py-strfns.exp +++ b/gdb/testsuite/gdb.python/py-strfns.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-symbol.exp b/gdb/testsuite/gdb.python/py-symbol.exp index 79abe646ca9..b89e3bc3ea3 100644 --- a/gdb/testsuite/gdb.python/py-symbol.exp +++ b/gdb/testsuite/gdb.python/py-symbol.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.python/py-symtab.exp b/gdb/testsuite/gdb.python/py-symtab.exp index f6225eba60e..eaf50f6a51c 100644 --- a/gdb/testsuite/gdb.python/py-symtab.exp +++ b/gdb/testsuite/gdb.python/py-symtab.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile py-symbol.c -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.python/py-sync-interp.exp b/gdb/testsuite/gdb.python/py-sync-interp.exp index 328f1a54536..e8987008aa6 100644 --- a/gdb/testsuite/gdb.python/py-sync-interp.exp +++ b/gdb/testsuite/gdb.python/py-sync-interp.exp @@ -36,7 +36,7 @@ gdb_reinitialize_dir $srcdir/$subdir if { [skip_python_tests] } { continue } gdb_exit -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-typeprint.exp b/gdb/testsuite/gdb.python/py-typeprint.exp index 29f4eaa0f18..85487eb83c3 100644 --- a/gdb/testsuite/gdb.python/py-typeprint.exp +++ b/gdb/testsuite/gdb.python/py-typeprint.exp @@ -20,7 +20,7 @@ load_lib cp-support.exp standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.python/py-unwind-maint.exp b/gdb/testsuite/gdb.python/py-unwind-maint.exp index cf78236564b..bf67f75b31f 100644 --- a/gdb/testsuite/gdb.python/py-unwind-maint.exp +++ b/gdb/testsuite/gdb.python/py-unwind-maint.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-unwind.exp b/gdb/testsuite/gdb.python/py-unwind.exp index 80ee6809322..5fb661532e7 100644 --- a/gdb/testsuite/gdb.python/py-unwind.exp +++ b/gdb/testsuite/gdb.python/py-unwind.exp @@ -20,7 +20,7 @@ load_lib gdb-python.exp standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.python/py-value-cc.exp b/gdb/testsuite/gdb.python/py-value-cc.exp index d7c5e0b3c7e..df57d9b015f 100644 --- a/gdb/testsuite/gdb.python/py-value-cc.exp +++ b/gdb/testsuite/gdb.python/py-value-cc.exp @@ -20,7 +20,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.python/py-xmethods.exp b/gdb/testsuite/gdb.python/py-xmethods.exp index cdb374f18c7..9248f3175ed 100644 --- a/gdb/testsuite/gdb.python/py-xmethods.exp +++ b/gdb/testsuite/gdb.python/py-xmethods.exp @@ -22,7 +22,7 @@ if { [skip_cplus_tests] } { continue } standard_testfile py-xmethods.cc -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.reverse/amd64-tailcall-reverse.exp b/gdb/testsuite/gdb.reverse/amd64-tailcall-reverse.exp index abf4fbe2bd5..07899e7ff7b 100644 --- a/gdb/testsuite/gdb.reverse/amd64-tailcall-reverse.exp +++ b/gdb/testsuite/gdb.reverse/amd64-tailcall-reverse.exp @@ -29,7 +29,7 @@ if [info exists COMPILE] { return } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/break-precsave.exp b/gdb/testsuite/gdb.reverse/break-precsave.exp index 348234d6a17..c7731a9186f 100644 --- a/gdb/testsuite/gdb.reverse/break-precsave.exp +++ b/gdb/testsuite/gdb.reverse/break-precsave.exp @@ -24,7 +24,7 @@ if ![supports_process_record] { standard_testfile break-reverse.c set precsave [standard_output_file break.precsave] -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/break-reverse.exp b/gdb/testsuite/gdb.reverse/break-reverse.exp index 33fe6e9a756..5fd44edc03d 100644 --- a/gdb/testsuite/gdb.reverse/break-reverse.exp +++ b/gdb/testsuite/gdb.reverse/break-reverse.exp @@ -22,7 +22,7 @@ if ![supports_reverse] { standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp index f019dde2f03..1537dcbbcf2 100644 --- a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp +++ b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp @@ -24,7 +24,7 @@ if ![supports_process_record] { standard_testfile consecutive-reverse.c set precsave [standard_output_file consecutive.precsave] -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/consecutive-reverse.exp b/gdb/testsuite/gdb.reverse/consecutive-reverse.exp index 0d5aadbc0b6..6740649457e 100644 --- a/gdb/testsuite/gdb.reverse/consecutive-reverse.exp +++ b/gdb/testsuite/gdb.reverse/consecutive-reverse.exp @@ -22,7 +22,7 @@ if ![supports_reverse] { standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/finish-precsave.exp b/gdb/testsuite/gdb.reverse/finish-precsave.exp index efb319cff84..a124c29a810 100644 --- a/gdb/testsuite/gdb.reverse/finish-precsave.exp +++ b/gdb/testsuite/gdb.reverse/finish-precsave.exp @@ -23,7 +23,7 @@ if ![supports_reverse] { standard_testfile finish-reverse.c set precsave [standard_output_file finish.precsave] -if { [prepare_for_testing $testfile.exp "$testfile" $srcfile] } { +if { [prepare_for_testing "failed to prepare" "$testfile" $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp index f5e3772d57e..279425f140f 100644 --- a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp +++ b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp @@ -25,7 +25,7 @@ if ![supports_reverse] { standard_testfile finish-reverse.c -if { [prepare_for_testing $testfile.exp "$testfile" $srcfile] } { +if { [prepare_for_testing "failed to prepare" "$testfile" $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/finish-reverse.exp b/gdb/testsuite/gdb.reverse/finish-reverse.exp index 6760b3acf77..61df04388dd 100644 --- a/gdb/testsuite/gdb.reverse/finish-reverse.exp +++ b/gdb/testsuite/gdb.reverse/finish-reverse.exp @@ -22,7 +22,7 @@ if ![supports_reverse] { standard_testfile -if { [prepare_for_testing $testfile.exp "$testfile" $srcfile] } { +if { [prepare_for_testing "failed to prepare" "$testfile" $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/fstatat-reverse.exp b/gdb/testsuite/gdb.reverse/fstatat-reverse.exp index 3d1c4fdea33..5de033272dd 100644 --- a/gdb/testsuite/gdb.reverse/fstatat-reverse.exp +++ b/gdb/testsuite/gdb.reverse/fstatat-reverse.exp @@ -25,7 +25,7 @@ if ![supports_reverse] { standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/getresuid-reverse.exp b/gdb/testsuite/gdb.reverse/getresuid-reverse.exp index 330efafae40..9561c7769ee 100644 --- a/gdb/testsuite/gdb.reverse/getresuid-reverse.exp +++ b/gdb/testsuite/gdb.reverse/getresuid-reverse.exp @@ -25,7 +25,7 @@ if ![supports_reverse] { standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/i386-precsave.exp b/gdb/testsuite/gdb.reverse/i386-precsave.exp index c83c2f3c3c3..4e78dd7087f 100644 --- a/gdb/testsuite/gdb.reverse/i386-precsave.exp +++ b/gdb/testsuite/gdb.reverse/i386-precsave.exp @@ -36,7 +36,7 @@ set precsave [standard_output_file i386.precsave] # some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ [list debug $additional_flags]]} { return -1 } diff --git a/gdb/testsuite/gdb.reverse/i386-reverse.exp b/gdb/testsuite/gdb.reverse/i386-reverse.exp index 0c6b16d67f4..2679e379928 100644 --- a/gdb/testsuite/gdb.reverse/i386-reverse.exp +++ b/gdb/testsuite/gdb.reverse/i386-reverse.exp @@ -34,7 +34,7 @@ standard_testfile # some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ [list debug $additional_flags]]} { return -1 } diff --git a/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp b/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp index eff39110591..aae3c414008 100644 --- a/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp +++ b/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp @@ -34,7 +34,7 @@ standard_testfile # some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ [list debug $additional_flags]]} { return -1 } diff --git a/gdb/testsuite/gdb.reverse/i387-env-reverse.exp b/gdb/testsuite/gdb.reverse/i387-env-reverse.exp index cf3ec515f1d..1bbdf0ea313 100644 --- a/gdb/testsuite/gdb.reverse/i387-env-reverse.exp +++ b/gdb/testsuite/gdb.reverse/i387-env-reverse.exp @@ -26,7 +26,7 @@ standard_testfile # some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ [list debug $additional_flags]]} { return -1 } diff --git a/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp b/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp index 2bae54c9cba..c8ee617e7f6 100644 --- a/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp +++ b/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp @@ -26,7 +26,7 @@ standard_testfile # some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ [list debug $additional_flags]]} { return -1 } diff --git a/gdb/testsuite/gdb.reverse/insn-reverse.exp b/gdb/testsuite/gdb.reverse/insn-reverse.exp index 3b8957e9991..926bbe17a4e 100644 --- a/gdb/testsuite/gdb.reverse/insn-reverse.exp +++ b/gdb/testsuite/gdb.reverse/insn-reverse.exp @@ -19,9 +19,8 @@ if ![supports_reverse] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ [list debug]]} { - untested ${testfile}.exp return -1 } if { ![runto main] } then { diff --git a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp index d3ca6496493..da09785dc9e 100644 --- a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp +++ b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp @@ -43,7 +43,7 @@ if ![supports_process_record] { standard_testfile machinestate.c ms1.c set precsave [standard_output_file machinestate.precsave] -if { [prepare_for_testing $testfile.exp $testfile \ +if { [prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2]] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/machinestate.exp b/gdb/testsuite/gdb.reverse/machinestate.exp index ab94c9495f6..3b4750d842b 100644 --- a/gdb/testsuite/gdb.reverse/machinestate.exp +++ b/gdb/testsuite/gdb.reverse/machinestate.exp @@ -41,7 +41,7 @@ if ![supports_reverse] { standard_testfile .c ms1.c -if { [prepare_for_testing $testfile.exp $testfile \ +if { [prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2]] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp b/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp index 2b8dffa2d42..b2106e8f105 100644 --- a/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp +++ b/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp @@ -29,7 +29,7 @@ if ![supports_reverse] { standard_testfile step-reverse.c -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/pipe-reverse.exp b/gdb/testsuite/gdb.reverse/pipe-reverse.exp index 0257851e532..06e54417f41 100644 --- a/gdb/testsuite/gdb.reverse/pipe-reverse.exp +++ b/gdb/testsuite/gdb.reverse/pipe-reverse.exp @@ -25,7 +25,7 @@ if ![supports_reverse] { standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/readv-reverse.exp b/gdb/testsuite/gdb.reverse/readv-reverse.exp index 0f60fb6a7ef..4e12082adba 100644 --- a/gdb/testsuite/gdb.reverse/readv-reverse.exp +++ b/gdb/testsuite/gdb.reverse/readv-reverse.exp @@ -25,7 +25,7 @@ if ![supports_reverse] { standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp b/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp index 0a02950e69b..6a5c0d704fe 100644 --- a/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp +++ b/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp @@ -25,7 +25,7 @@ if ![supports_reverse] { standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/rerun-prec.exp b/gdb/testsuite/gdb.reverse/rerun-prec.exp index a72e9a0ccb8..961d1fae41f 100644 --- a/gdb/testsuite/gdb.reverse/rerun-prec.exp +++ b/gdb/testsuite/gdb.reverse/rerun-prec.exp @@ -19,7 +19,7 @@ if {![supports_reverse] || ![supports_process_record]} { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile [list $srcfile]]} { +if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile]]} { return -1 } diff --git a/gdb/testsuite/gdb.reverse/s390-mvcle.exp b/gdb/testsuite/gdb.reverse/s390-mvcle.exp index 2effc82cd32..ad5c931911d 100644 --- a/gdb/testsuite/gdb.reverse/s390-mvcle.exp +++ b/gdb/testsuite/gdb.reverse/s390-mvcle.exp @@ -28,7 +28,7 @@ if { ! [istarget "s390*-*-*"] } { standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/step-precsave.exp b/gdb/testsuite/gdb.reverse/step-precsave.exp index 4741a59ed2b..0c50cdc4f79 100644 --- a/gdb/testsuite/gdb.reverse/step-precsave.exp +++ b/gdb/testsuite/gdb.reverse/step-precsave.exp @@ -28,7 +28,7 @@ if ![supports_process_record] { standard_testfile step-reverse.c set precsave [standard_output_file step.precsave] -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/step-reverse.exp b/gdb/testsuite/gdb.reverse/step-reverse.exp index c88223c1fe1..e85df3d5055 100644 --- a/gdb/testsuite/gdb.reverse/step-reverse.exp +++ b/gdb/testsuite/gdb.reverse/step-reverse.exp @@ -26,7 +26,7 @@ if ![supports_reverse] { standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/time-reverse.exp b/gdb/testsuite/gdb.reverse/time-reverse.exp index 78d990cda38..93763da79c4 100644 --- a/gdb/testsuite/gdb.reverse/time-reverse.exp +++ b/gdb/testsuite/gdb.reverse/time-reverse.exp @@ -25,7 +25,7 @@ if ![supports_reverse] { standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/until-precsave.exp b/gdb/testsuite/gdb.reverse/until-precsave.exp index 2934e6a5a0b..606d4fc2f82 100644 --- a/gdb/testsuite/gdb.reverse/until-precsave.exp +++ b/gdb/testsuite/gdb.reverse/until-precsave.exp @@ -24,7 +24,7 @@ if ![supports_process_record] { standard_testfile until-reverse.c ur1.c set precsave [standard_output_file until.precsave] -if { [prepare_for_testing $testfile.exp $testfile \ +if { [prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2]] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/until-reverse.exp b/gdb/testsuite/gdb.reverse/until-reverse.exp index 5e2ca04c1db..5a8b1566a50 100644 --- a/gdb/testsuite/gdb.reverse/until-reverse.exp +++ b/gdb/testsuite/gdb.reverse/until-reverse.exp @@ -22,7 +22,7 @@ if ![supports_reverse] { standard_testfile .c ur1.c -if { [prepare_for_testing $testfile.exp $testfile \ +if { [prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2]] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/waitpid-reverse.exp b/gdb/testsuite/gdb.reverse/waitpid-reverse.exp index ab999cdf993..ba60babad91 100644 --- a/gdb/testsuite/gdb.reverse/waitpid-reverse.exp +++ b/gdb/testsuite/gdb.reverse/waitpid-reverse.exp @@ -27,7 +27,7 @@ if ![supports_reverse] { standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/watch-precsave.exp b/gdb/testsuite/gdb.reverse/watch-precsave.exp index 25f6a425af1..793e47e68ab 100644 --- a/gdb/testsuite/gdb.reverse/watch-precsave.exp +++ b/gdb/testsuite/gdb.reverse/watch-precsave.exp @@ -25,7 +25,7 @@ if ![supports_process_record] { standard_testfile watch-reverse.c set precsave [standard_output_file watch.precsave] -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.reverse/watch-reverse.exp b/gdb/testsuite/gdb.reverse/watch-reverse.exp index 5887e766432..6b7515ccbb0 100644 --- a/gdb/testsuite/gdb.reverse/watch-reverse.exp +++ b/gdb/testsuite/gdb.reverse/watch-reverse.exp @@ -24,7 +24,7 @@ if ![supports_reverse] { standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.rust/generics.exp b/gdb/testsuite/gdb.rust/generics.exp index 27601cc9439..65eaf6e7605 100644 --- a/gdb/testsuite/gdb.rust/generics.exp +++ b/gdb/testsuite/gdb.rust/generics.exp @@ -21,13 +21,13 @@ if {[skip_rust_tests]} { } standard_testfile .rs -if {[prepare_for_testing ${testfile}.exp $testfile $srcfile {debug rust}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { return -1 } set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { - untested $testfile + untested "could not run to breakpoint" return -1 } diff --git a/gdb/testsuite/gdb.rust/methods.exp b/gdb/testsuite/gdb.rust/methods.exp index 4a53b709a46..1996bb9583f 100644 --- a/gdb/testsuite/gdb.rust/methods.exp +++ b/gdb/testsuite/gdb.rust/methods.exp @@ -21,13 +21,13 @@ if {[skip_rust_tests]} { } standard_testfile .rs -if {[prepare_for_testing ${testfile}.exp $testfile $srcfile {debug rust}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { return -1 } set line [gdb_get_line_number "set breakpoint 1 here"] if {![runto ${srcfile}:$line]} { - untested $testfile + untested "could not run to breakpoint" return -1 } diff --git a/gdb/testsuite/gdb.rust/modules.exp b/gdb/testsuite/gdb.rust/modules.exp index 0678f037325..c8db7d70da3 100644 --- a/gdb/testsuite/gdb.rust/modules.exp +++ b/gdb/testsuite/gdb.rust/modules.exp @@ -21,13 +21,13 @@ if {[skip_rust_tests]} { } standard_testfile .rs -if {[prepare_for_testing ${testfile}.exp $testfile $srcfile {debug rust}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { return -1 } set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { - untested $testfile + untested "could not run to breakpoint" return -1 } diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp index 4b9a979968e..66d7acf5094 100644 --- a/gdb/testsuite/gdb.rust/simple.exp +++ b/gdb/testsuite/gdb.rust/simple.exp @@ -21,13 +21,13 @@ if {[skip_rust_tests]} { } standard_testfile .rs -if {[prepare_for_testing ${testfile}.exp $testfile $srcfile {debug rust}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { return -1 } set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { - untested $testfile + untested "could not run to breakpoint" return -1 } diff --git a/gdb/testsuite/gdb.server/connect-with-no-symbol-file.exp b/gdb/testsuite/gdb.server/connect-with-no-symbol-file.exp index f99e1af6c01..2cfdc59a013 100644 --- a/gdb/testsuite/gdb.server/connect-with-no-symbol-file.exp +++ b/gdb/testsuite/gdb.server/connect-with-no-symbol-file.exp @@ -29,7 +29,7 @@ if { [skip_gdbserver_tests] } { return 0 } -if { [prepare_for_testing $testfile.exp $testfile $srcfile debug] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } { return -1 } diff --git a/gdb/testsuite/gdb.server/ext-attach.exp b/gdb/testsuite/gdb.server/ext-attach.exp index 1187de4a71e..476dce7b703 100644 --- a/gdb/testsuite/gdb.server/ext-attach.exp +++ b/gdb/testsuite/gdb.server/ext-attach.exp @@ -30,7 +30,7 @@ if {![can_spawn_for_attach]} { return 0 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.server/ext-restart.exp b/gdb/testsuite/gdb.server/ext-restart.exp index b21c7c52175..3edacc626d9 100644 --- a/gdb/testsuite/gdb.server/ext-restart.exp +++ b/gdb/testsuite/gdb.server/ext-restart.exp @@ -25,7 +25,7 @@ if { [skip_gdbserver_tests] } { return 0 } -if { [prepare_for_testing $testfile.exp $testfile $srcfile debug] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } { return -1 } diff --git a/gdb/testsuite/gdb.server/ext-wrapper.exp b/gdb/testsuite/gdb.server/ext-wrapper.exp index f3aa0e4cd80..b3ab5fb03ef 100644 --- a/gdb/testsuite/gdb.server/ext-wrapper.exp +++ b/gdb/testsuite/gdb.server/ext-wrapper.exp @@ -27,7 +27,7 @@ if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.server/file-transfer.exp b/gdb/testsuite/gdb.server/file-transfer.exp index 48c4277c085..d96dbcd3258 100644 --- a/gdb/testsuite/gdb.server/file-transfer.exp +++ b/gdb/testsuite/gdb.server/file-transfer.exp @@ -24,7 +24,7 @@ if { [skip_gdbserver_tests] } { return 0 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.server/server-exec-info.exp b/gdb/testsuite/gdb.server/server-exec-info.exp index daacf610c9f..db94e23432a 100644 --- a/gdb/testsuite/gdb.server/server-exec-info.exp +++ b/gdb/testsuite/gdb.server/server-exec-info.exp @@ -23,7 +23,7 @@ if {[skip_gdbserver_tests] || [skip_shlib_tests]} { } standard_testfile server.c -if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] { +if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] { return -1 } diff --git a/gdb/testsuite/gdb.server/server-kill.exp b/gdb/testsuite/gdb.server/server-kill.exp index 9a880650377..03a28511eb9 100644 --- a/gdb/testsuite/gdb.server/server-kill.exp +++ b/gdb/testsuite/gdb.server/server-kill.exp @@ -23,7 +23,7 @@ if {[skip_gdbserver_tests]} { return 0 } -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.server/server-mon.exp b/gdb/testsuite/gdb.server/server-mon.exp index 80ca591481d..3e293eba6d3 100644 --- a/gdb/testsuite/gdb.server/server-mon.exp +++ b/gdb/testsuite/gdb.server/server-mon.exp @@ -25,7 +25,7 @@ if { [skip_gdbserver_tests] } { return 0 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.server/wrapper.exp b/gdb/testsuite/gdb.server/wrapper.exp index 8329a4ac5a3..9c49efbee4d 100644 --- a/gdb/testsuite/gdb.server/wrapper.exp +++ b/gdb/testsuite/gdb.server/wrapper.exp @@ -31,7 +31,7 @@ if { [istarget *-*-mingw*] return -1 } -if { [prepare_for_testing $testfile.exp $testfile $srcfile debug] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } { return -1 } diff --git a/gdb/testsuite/gdb.stabs/exclfwd.exp b/gdb/testsuite/gdb.stabs/exclfwd.exp index 48b23a4767e..39def87fdb0 100644 --- a/gdb/testsuite/gdb.stabs/exclfwd.exp +++ b/gdb/testsuite/gdb.stabs/exclfwd.exp @@ -22,7 +22,7 @@ standard_testfile exclfwd1.c exclfwd2.c -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] debug]} { return -1 } diff --git a/gdb/testsuite/gdb.stabs/gdb11479.exp b/gdb/testsuite/gdb.stabs/gdb11479.exp index f395f108691..74222ead072 100644 --- a/gdb/testsuite/gdb.stabs/gdb11479.exp +++ b/gdb/testsuite/gdb.stabs/gdb11479.exp @@ -40,7 +40,7 @@ proc do_test {version} { gdb_test "print sizeof (*e)" "= \[1-9\]*" "sizeof (*e) in test $version" } -if { [prepare_for_testing $testfile.exp $testfile $testfile.c {debug additional_flags=-gstabs}] == 0 } { +if { [prepare_for_testing "failed to prepare" $testfile $testfile.c {debug additional_flags=-gstabs}] == 0 } { do_test forced_stabs } @@ -48,7 +48,7 @@ if { [prepare_for_testing $testfile.exp $testfile $testfile.c {debug additional_ # by GDB which can generate a compilation failure. gdb_exit -if { [prepare_for_testing $testfile.exp $testfile $testfile.c {debug}] == 0 } { +if { [prepare_for_testing "failed to prepare" $testfile $testfile.c {debug}] == 0 } { do_test natural_debug_format } diff --git a/gdb/testsuite/gdb.threads/clone-new-thread-event.exp b/gdb/testsuite/gdb.threads/clone-new-thread-event.exp index f7ca41ec3fc..a43acc1b29c 100644 --- a/gdb/testsuite/gdb.threads/clone-new-thread-event.exp +++ b/gdb/testsuite/gdb.threads/clone-new-thread-event.exp @@ -20,7 +20,7 @@ if ![istarget *-*-linux*] then { return } -if { [prepare_for_testing clone-new-thread-event.exp clone-new-thread-event] } { +if { [prepare_for_testing "failed to prepare" clone-new-thread-event] } { return -1 } diff --git a/gdb/testsuite/gdb.threads/corethreads.exp b/gdb/testsuite/gdb.threads/corethreads.exp index d337e6ea7f8..68238dc41eb 100644 --- a/gdb/testsuite/gdb.threads/corethreads.exp +++ b/gdb/testsuite/gdb.threads/corethreads.exp @@ -22,7 +22,7 @@ if {![isnative] || ![istarget "*-*-linux*"]} { standard_testfile set executable ${testfile} if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.threads/current-lwp-dead.exp b/gdb/testsuite/gdb.threads/current-lwp-dead.exp index 5a9e57d851e..bf1f9cd450b 100644 --- a/gdb/testsuite/gdb.threads/current-lwp-dead.exp +++ b/gdb/testsuite/gdb.threads/current-lwp-dead.exp @@ -23,12 +23,12 @@ if ![istarget *-*-linux*] then { return } -if { [prepare_for_testing current-lwp-dead.exp current-lwp-dead] } { +if { [prepare_for_testing "failed to prepare" current-lwp-dead] } { return -1 } if {[runto_main] <= 0} { - untested current-lwp-dead.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.threads/dlopen-libpthread.exp b/gdb/testsuite/gdb.threads/dlopen-libpthread.exp index 8ad9acdd7a0..0fbd3266363 100644 --- a/gdb/testsuite/gdb.threads/dlopen-libpthread.exp +++ b/gdb/testsuite/gdb.threads/dlopen-libpthread.exp @@ -31,7 +31,7 @@ set lib_dlopen [shlib_target_file ${executable}.so] set relink_args [build_executable_own_libs ${testfile}.exp ${executable}.so $srclibfile {debug shlib_pthreads} no] if {$relink_args == "" || ![prelink_no $relink_args] - || [prepare_for_testing ${testfile}.exp ${executable} ${srcmainfile} {debug shlib_load}] } { + || [prepare_for_testing "failed to prepare" ${executable} ${srcmainfile} {debug shlib_load}] } { return -1 } gdb_load_shlib $binfile_lib @@ -47,7 +47,7 @@ gdb_test_multiple $test $test { } -re "No probes matched\\.\r\n$gdb_prompt $" { xfail $test - untested ${testfile}.exp + untested "no matching probes" return } } diff --git a/gdb/testsuite/gdb.threads/gcore-thread.exp b/gdb/testsuite/gdb.threads/gcore-thread.exp index f74f147cd3e..7c057f0a67a 100644 --- a/gdb/testsuite/gdb.threads/gcore-thread.exp +++ b/gdb/testsuite/gdb.threads/gcore-thread.exp @@ -56,7 +56,7 @@ set nl "\[\r\n\]+" set timeout 30 if { ! [ runto_main ] } then { - untested gcore-thread.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.threads/sigstep-threads.exp b/gdb/testsuite/gdb.threads/sigstep-threads.exp index 99bd133d1cd..a2f299848aa 100644 --- a/gdb/testsuite/gdb.threads/sigstep-threads.exp +++ b/gdb/testsuite/gdb.threads/sigstep-threads.exp @@ -17,7 +17,7 @@ standard_testfile set executable ${testfile} if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.threads/watchpoint-fork.exp b/gdb/testsuite/gdb.threads/watchpoint-fork.exp index a21cf76a5ec..771e92d9e8d 100644 --- a/gdb/testsuite/gdb.threads/watchpoint-fork.exp +++ b/gdb/testsuite/gdb.threads/watchpoint-fork.exp @@ -89,7 +89,7 @@ proc test {type symbol} { set executable ${testfile}-${type}-mt set srcfile_main ${srcdir}/${subdir}/${testfile}-mt.c if { [gdb_compile_pthreads "${srcfile_main} ${srcfile_type}" [standard_output_file ${executable}] executable [list debug "additional_flags=-D$symbol -DTHREAD"]] != "" } { - untested ${testfile}.exp + untested "failed to compile" return } clean_restart $executable diff --git a/gdb/testsuite/gdb.trace/actions-changed.exp b/gdb/testsuite/gdb.trace/actions-changed.exp index 3b8e6bab7fa..0e15c10214c 100644 --- a/gdb/testsuite/gdb.trace/actions-changed.exp +++ b/gdb/testsuite/gdb.trace/actions-changed.exp @@ -17,7 +17,7 @@ load_lib trace-support.exp standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp index bdebc2e745a..6f11adaae55 100644 --- a/gdb/testsuite/gdb.trace/backtrace.exp +++ b/gdb/testsuite/gdb.trace/backtrace.exp @@ -21,9 +21,8 @@ standard_testfile actions.c set executable $testfile set expfile $testfile.exp -if [prepare_for_testing $expfile $executable $srcfile \ +if [prepare_for_testing "failed to prepare" $executable $srcfile \ [list debug nowarnings]] { - untested "failed to prepare for trace tests" return -1 } diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp index e57930153ac..097aedc1eec 100644 --- a/gdb/testsuite/gdb.trace/change-loc.exp +++ b/gdb/testsuite/gdb.trace/change-loc.exp @@ -358,7 +358,7 @@ gdb_load_shlib $libipa if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable \ [list debug nowarnings shlib=$libipa shlib=$lib_sl1 shlib_load] ] != "" } { - untested change-loc.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp index 42b7ca07029..980df5b866e 100644 --- a/gdb/testsuite/gdb.trace/circ.exp +++ b/gdb/testsuite/gdb.trace/circ.exp @@ -17,7 +17,7 @@ load_lib "trace-support.exp" standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp index c2f2b5c0bed..aa79a146ee6 100644 --- a/gdb/testsuite/gdb.trace/collection.exp +++ b/gdb/testsuite/gdb.trace/collection.exp @@ -19,7 +19,7 @@ load_lib "trace-support.exp" standard_testfile set executable $testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.trace/disconnected-tracing.exp b/gdb/testsuite/gdb.trace/disconnected-tracing.exp index 5c45021d744..273ade5d752 100644 --- a/gdb/testsuite/gdb.trace/disconnected-tracing.exp +++ b/gdb/testsuite/gdb.trace/disconnected-tracing.exp @@ -27,9 +27,8 @@ if { [info proc gdb_reconnect] == "" } { return -1 } -if [prepare_for_testing $expfile $executable $srcfile \ +if [prepare_for_testing "failed to prepare" $executable $srcfile \ {debug nowarnings}] { - untested "failed to prepare for trace tests" return -1 } diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp index 97dff8c2d87..2ffdd19c0fb 100644 --- a/gdb/testsuite/gdb.trace/ftrace.exp +++ b/gdb/testsuite/gdb.trace/ftrace.exp @@ -21,9 +21,8 @@ set expfile $testfile.exp # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] -if [prepare_for_testing $expfile $executable $srcfile \ +if [prepare_for_testing "failed to prepare" $executable $srcfile \ [list debug $additional_flags]] { - untested "failed to prepare for trace tests" return -1 } diff --git a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp index 3e2aff7c2e5..8ecf80a464a 100644 --- a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp +++ b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp @@ -17,7 +17,7 @@ load_lib trace-support.exp standard_testfile actions.c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp index 3236d7c46f8..f7907a32155 100644 --- a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp +++ b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp @@ -17,7 +17,7 @@ load_lib trace-support.exp standard_testfile trace-unavailable.c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp index 3d57623424d..c9c3d5e82e8 100644 --- a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp +++ b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp @@ -35,7 +35,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ [list debug nowarnings \ "additional_flags=-DTFILE_DIR=\"$tfile_dir\""]] \ != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } @@ -101,7 +101,7 @@ set executable $testfile if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ executable {debug nowarnings}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp index 1e0e866a079..810a9678871 100644 --- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp +++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp @@ -19,7 +19,7 @@ load_lib mi-support.exp standard_testfile actions.c if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] != "" } { - untested mi-tsv-changed.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.trace/no-attach-trace.exp b/gdb/testsuite/gdb.trace/no-attach-trace.exp index 06d86e6d038..4ff01c48e69 100644 --- a/gdb/testsuite/gdb.trace/no-attach-trace.exp +++ b/gdb/testsuite/gdb.trace/no-attach-trace.exp @@ -21,7 +21,7 @@ load_lib trace-support.exp standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp index d8d68ecf0a0..839bc3c5e8e 100644 --- a/gdb/testsuite/gdb.trace/passc-dyn.exp +++ b/gdb/testsuite/gdb.trace/passc-dyn.exp @@ -23,7 +23,7 @@ gdb_start standard_testfile actions.c if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] != "" } { - untested passc-dyn.exp + untested "failed to compile" return -1 } gdb_load $binfile @@ -94,37 +94,37 @@ gdb_test "tstop" ".*" "" gdb_test "tfind none" ".*" "" if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x -1 x" ""] { - untested passc-dyn.exp + untested "skipping further tests due to print failure" return -1 } gdb_test "tfind tracepoint $tdp2" ".*" "" if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 0 x" ""] { - untested passc-dyn.exp + untested "skipping further tests due to print failure" return -1 } gdb_test "tfind tracepoint $tdp3" ".*" "" if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 1 x" ""] { - untested passc-dyn.exp + untested "skipping further tests due to print failure" return -1 } gdb_test "tfind tracepoint $tdp4" ".*" "" if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 2 x" ""] { - untested passc-dyn.exp + untested "skipping further tests due to print failure" return -1 } gdb_test "tfind tracepoint $tdp2" ".*" "" if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 3 x" ""] { - untested passc-dyn.exp + untested "skipping further tests due to print failure" return -1 } gdb_test "tfind tracepoint $tdp3" ".*" "" if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 4 x" ""] { - untested passc-dyn.exp + untested "skipping further tests due to print failure" return -1 } diff --git a/gdb/testsuite/gdb.trace/qtro.exp b/gdb/testsuite/gdb.trace/qtro.exp index 444b453141b..fd7ef732310 100644 --- a/gdb/testsuite/gdb.trace/qtro.exp +++ b/gdb/testsuite/gdb.trace/qtro.exp @@ -22,7 +22,7 @@ load_lib trace-support.exp standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } clean_restart $testfile diff --git a/gdb/testsuite/gdb.trace/range-stepping.exp b/gdb/testsuite/gdb.trace/range-stepping.exp index 88aa3ff21fe..346641eadbb 100644 --- a/gdb/testsuite/gdb.trace/range-stepping.exp +++ b/gdb/testsuite/gdb.trace/range-stepping.exp @@ -19,7 +19,7 @@ load_lib "range-stepping-support.exp" standard_testfile set executable $testfile -if [prepare_for_testing $testfile.exp $executable $srcfile \ +if [prepare_for_testing "failed to prepare" $executable $srcfile \ {debug nowarnings}] { return -1 } diff --git a/gdb/testsuite/gdb.trace/read-memory.exp b/gdb/testsuite/gdb.trace/read-memory.exp index b82967d68b8..d31b2401c38 100644 --- a/gdb/testsuite/gdb.trace/read-memory.exp +++ b/gdb/testsuite/gdb.trace/read-memory.exp @@ -17,8 +17,7 @@ load_lib "trace-support.exp" standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp index dfbbdca461b..bf5e55ec760 100644 --- a/gdb/testsuite/gdb.trace/save-trace.exp +++ b/gdb/testsuite/gdb.trace/save-trace.exp @@ -24,7 +24,7 @@ gdb_start standard_testfile actions.c if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] != "" } { - untested save-trace.exp + untested "failed to compile" return -1 } gdb_reinitialize_dir $srcdir/$subdir diff --git a/gdb/testsuite/gdb.trace/signal.exp b/gdb/testsuite/gdb.trace/signal.exp index f36133a542e..c04bf051cd0 100644 --- a/gdb/testsuite/gdb.trace/signal.exp +++ b/gdb/testsuite/gdb.trace/signal.exp @@ -30,8 +30,7 @@ load_lib "trace-support.exp" standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp index d6ce4ce1ccd..e02ecb5c9e2 100644 --- a/gdb/testsuite/gdb.trace/status-stop.exp +++ b/gdb/testsuite/gdb.trace/status-stop.exp @@ -19,9 +19,8 @@ set executable $testfile set expfile $testfile.exp -if [prepare_for_testing $expfile $executable $srcfile \ +if [prepare_for_testing "failed to prepare" $executable $srcfile \ {debug nowarnings}] { - untested "failed to prepare for trace tests" return -1 } diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp index 9f89d3d0eb9..91e8aa1df21 100644 --- a/gdb/testsuite/gdb.trace/tfile.exp +++ b/gdb/testsuite/gdb.trace/tfile.exp @@ -40,7 +40,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ [list debug \ "additional_flags=-DTFILE_DIR=\"$tfile_dir\""]] \ != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp index facf0618edd..4b32ed38b8f 100644 --- a/gdb/testsuite/gdb.trace/trace-break.exp +++ b/gdb/testsuite/gdb.trace/trace-break.exp @@ -21,9 +21,8 @@ set expfile $testfile.exp # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] -if [prepare_for_testing $expfile $executable $srcfile \ +if [prepare_for_testing "failed to prepare" $executable $srcfile \ [list debug $additional_flags]] { - untested "failed to prepare for trace tests" return -1 } diff --git a/gdb/testsuite/gdb.trace/trace-buffer-size.exp b/gdb/testsuite/gdb.trace/trace-buffer-size.exp index 694c5b32317..8e10f577dd1 100644 --- a/gdb/testsuite/gdb.trace/trace-buffer-size.exp +++ b/gdb/testsuite/gdb.trace/trace-buffer-size.exp @@ -17,9 +17,8 @@ load_lib "trace-support.exp" standard_testfile -if [prepare_for_testing ${testfile}.exp $testfile $srcfile \ +if [prepare_for_testing "failed to prepare" $testfile $srcfile \ {debug nowarnings}] { - untested "failed to prepare for trace tests" return -1 } diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gdb.trace/trace-condition.exp index 02a0c0c8705..892772857f6 100644 --- a/gdb/testsuite/gdb.trace/trace-condition.exp +++ b/gdb/testsuite/gdb.trace/trace-condition.exp @@ -21,9 +21,8 @@ set expfile $testfile.exp # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] -if [prepare_for_testing $expfile $executable $srcfile \ +if [prepare_for_testing "failed to prepare" $executable $srcfile \ [list debug $additional_flags]] { - untested "failed to prepare for trace tests" return -1 } diff --git a/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp index 52735d31e73..bcf2a0e7daf 100644 --- a/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp +++ b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp @@ -21,7 +21,7 @@ load_lib "trace-support.exp" standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ [list debug additional_flags=-mavx]]} { return -1 } diff --git a/gdb/testsuite/gdb.trace/tstatus.exp b/gdb/testsuite/gdb.trace/tstatus.exp index c3957c2d31d..62d98cc318f 100644 --- a/gdb/testsuite/gdb.trace/tstatus.exp +++ b/gdb/testsuite/gdb.trace/tstatus.exp @@ -18,9 +18,8 @@ standard_testfile actions.c set executable $testfile set expfile tstatus.exp -if [prepare_for_testing $expfile $executable $srcfile \ +if [prepare_for_testing "failed to prepare" $executable $srcfile \ [list debug]] { - untested "failed to prepare for trace tests" return -1 } diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp index d7cf0202f60..d92854e93f1 100644 --- a/gdb/testsuite/gdb.trace/unavailable.exp +++ b/gdb/testsuite/gdb.trace/unavailable.exp @@ -18,7 +18,7 @@ load_lib "trace-support.exp" standard_testfile unavailable.cc set executable $testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ {debug nowarnings c++}]} { return -1 } diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp index b090f76e06e..7faaa092729 100644 --- a/gdb/testsuite/gdb.trace/while-dyn.exp +++ b/gdb/testsuite/gdb.trace/while-dyn.exp @@ -25,7 +25,7 @@ standard_testfile actions.c set executable $testfile if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable {debug nowarnings}] != "" } { - untested while-dyn.exp + untested "failed to compile" return -1 } gdb_load $binfile diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp index 2705852ab7e..0cd18966c94 100644 --- a/gdb/testsuite/gdb.trace/while-stepping.exp +++ b/gdb/testsuite/gdb.trace/while-stepping.exp @@ -24,7 +24,7 @@ gdb_start standard_testfile actions.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \ executable {debug nowarnings}] != "" } { - untested while-stepping.exp + untested "failed to compile" return -1 } gdb_reinitialize_dir $srcdir/$subdir |