From b60f089831eca7b76afeb3c1d95369f8abcdcc98 Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@gnat.com>
Date: Thu, 10 Aug 2006 05:27:22 +0000
Subject: [PATCH] 	* gdb.arch/altivec-abi.exp: Replace
 gdb_suppress_entire_file with 	untested followed by return combination. 
 * gdb.arch/altivec-regs.exp: Likewise. 	* gdb.arch/e500-abi.exp:
 Likewise. 	* gdb.arch/e500-regs.exp: Likewise. 	*
 gdb.arch/gdb1291.exp: Likewise. 	* gdb.arch/gdb1431.exp: Likewise. 
 * gdb.arch/gdb1558.exp: Likewise. 	* gdb.arch/i386-prologue.exp:
 Likewise. 	* gdb.arch/i386-unwind.exp: Likewise. 	*
 gdb.asm/asm-source.exp: Likewise. 	* gdb.base/a2-run.exp: Likewise. 
 * gdb.base/advance.exp: Likewise. 	* gdb.base/all-bin.exp: Likewise. 
 * gdb.base/annota1.exp: Likewise. 	* gdb.base/annota3.exp: Likewise. 
 * gdb.base/args.exp: Likewise. 	* gdb.base/arithmet.exp: Likewise. 
 * gdb.base/assign.exp: Likewise. 	* gdb.base/async.exp: Likewise. 
 * gdb.base/attach.exp: Likewise. 	* gdb.base/bang.exp: Likewise. 	*
 gdb.base/bigcore.exp: Likewise. 	* gdb.base/bitfields.exp: Likewise. 
 * gdb.base/bitfields2.exp: Likewise. 	* gdb.base/break.exp: Likewise. 
 * gdb.base/call-sc.exp: Likewise. 	* gdb.base/call-strs.exp: Likewise. 
 * gdb.base/callfuncs.exp: Likewise. 	* gdb.base/checkpoint.exp: Likewise. 
 * gdb.base/chng-syms.exp: Likewise. 	* gdb.base/code-expr.exp: Likewise. 
 * gdb.base/commands.exp: Likewise. 	* gdb.base/completion.exp: Likewise. 
 * gdb.base/cond-expr.exp: Likewise. 	* gdb.base/condbreak.exp: Likewise. 
 * gdb.base/consecutive.exp: Likewise. 	* gdb.base/constvars.exp: Likewise. 
 * gdb.base/corefile.exp: Likewise. 	* gdb.base/cvexpr.exp: Likewise. 
 * gdb.base/dbx.exp: Likewise. 	* gdb.base/define.exp: Likewise. 	*
 gdb.base/detach.exp: Likewise. 	* gdb.base/display.exp: Likewise. 
 * gdb.base/dump.exp: Likewise. 	* gdb.base/ena-dis-br.exp: Likewise. 
 * gdb.base/ending-run.exp: Likewise. 	* gdb.base/environ.exp: Likewise. 
 * gdb.base/eval-skip.exp: Likewise. 	* gdb.base/exprs.exp: Likewise. 
 * gdb.base/fileio.exp: Likewise. 	* gdb.base/finish.exp: Likewise. 
 * gdb.base/float.exp: Likewise. 	* gdb.base/foll-exec.exp: Likewise. 
 * gdb.base/foll-fork.exp: Likewise. 	* gdb.base/foll-vfork.exp: Likewise. 
 * gdb.base/freebpcmd.exp: Likewise. 	* gdb.base/funcargs.exp: Likewise. 
 * gdb.base/gcore.exp: Likewise. 	* gdb.base/gdb1090.exp: Likewise. 
 * gdb.base/gdb1250.exp: Likewise. 	* gdb.base/huge.exp: Likewise. 	*
 gdb.base/info-proc.exp: Likewise. 	* gdb.base/interrupt.exp: Likewise. 
 * gdb.base/jump.exp: Likewise. 	* gdb.base/langs.exp: Likewise. 
 * gdb.base/lineinc.exp: Likewise. 	* gdb.base/list.exp: Likewise. 	*
 gdb.base/logical.exp: Likewise. 	* gdb.base/long_long.exp: Likewise. 
 * gdb.base/macscp.exp: Likewise. 	* gdb.base/maint.exp: Likewise. 
 * gdb.base/mips_pro.exp: Likewise. 	* gdb.base/miscexprs.exp: Likewise. 
 * gdb.base/multi-forks.exp: Likewise. 	* gdb.base/opaque.exp: Likewise. 
 * gdb.base/overlays.exp: Likewise. 	* gdb.base/pc-fp.exp: Likewise. 
 * gdb.base/pointers.exp: Likewise. 	* gdb.base/printcmds.exp: Likewise. 
 * gdb.base/psymtab.exp: Likewise. 	* gdb.base/ptype.exp: Likewise. 
 * gdb.base/recurse.exp: Likewise. 	* gdb.base/relational.exp: Likewise. 
 * gdb.base/relocate.exp: Likewise. 	* gdb.base/remote.exp: Likewise. 
 * gdb.base/reread.exp: Likewise. 	* gdb.base/restore.exp: Likewise. 
 * gdb.base/return.exp: Likewise. 	* gdb.base/return2.exp: Likewise. 
 * gdb.base/scope.exp: Likewise. 	* gdb.base/sect-cmd.exp: Likewise. 
 * gdb.base/sep.exp: Likewise. 	* gdb.base/sepdebug.exp: Likewise. 	*
 gdb.base/setshow.exp: Likewise. 	* gdb.base/setvar.exp: Likewise. 
 * gdb.base/sigall.exp: Likewise. 	* gdb.base/sigbpt.exp: Likewise. 
 * gdb.base/signals.exp: Likewise. 	* gdb.base/signull.exp: Likewise. 
 * gdb.base/sizeof.exp: Likewise. 	* gdb.base/solib.exp: Likewise. 
 * gdb.base/step-line.exp: Likewise. 	* gdb.base/step-test.exp: Likewise. 
 * gdb.base/structs.exp: Likewise. 	* gdb.base/structs2.exp: Likewise. 
 * gdb.base/term.exp: Likewise. 	* gdb.base/twice.exp: Likewise. 
 * gdb.base/until.exp: Likewise. 	* gdb.base/varargs.exp: Likewise. 
 * gdb.base/volatile.exp: Likewise. 	* gdb.base/watchpoint.exp: Likewise. 
 * gdb.base/whatis-exp.exp: Likewise. 	* gdb.base/whatis.exp: Likewise. 
 * gdb.cp/ambiguous.exp: Likewise. 	* gdb.cp/annota2.exp: Likewise. 
 * gdb.cp/annota3.exp: Likewise. 	* gdb.cp/bool.exp: Likewise. 	*
 gdb.cp/breakpoint.exp: Likewise. 	* gdb.cp/casts.exp: Likewise. 	*
 gdb.cp/class2.exp: Likewise. 	* gdb.cp/classes.exp: Likewise. 	*
 gdb.cp/cplusfuncs.exp: Likewise. 	* gdb.cp/ctti.exp: Likewise. 	*
 gdb.cp/derivation.exp: Likewise. 	* gdb.cp/exception.exp: Likewise. 
 * gdb.cp/gdb1355.exp: Likewise. 	* gdb.cp/hang.exp: Likewise. 	*
 gdb.cp/inherit.exp: Likewise. 	* gdb.cp/local.exp: Likewise. 	*
 gdb.cp/m-data.exp: Likewise. 	* gdb.cp/m-static.exp: Likewise. 	*
 gdb.cp/member-ptr.exp: Likewise. 	* gdb.cp/method.exp: Likewise. 	*
 gdb.cp/misc.exp: Likewise. 	* gdb.cp/namespace.exp: Likewise. 	*
 gdb.cp/overload.exp: Likewise. 	* gdb.cp/ovldbreak.exp: Likewise. 
 * gdb.cp/pr-1023.exp: Likewise. 	* gdb.cp/pr-1210.exp: Likewise. 
 * gdb.cp/pr-574.exp: Likewise. 	* gdb.cp/printmethod.exp: Likewise. 
 * gdb.cp/psmang.exp: Likewise. 	* gdb.cp/ref-params.exp: Likewise. 
 * gdb.cp/ref-types.exp: Likewise. 	* gdb.cp/rtti.exp: Likewise. 	*
 gdb.cp/templates.exp: Likewise. 	* gdb.cp/try_catch.exp: Likewise. 
 * gdb.cp/userdef.exp: Likewise. 	* gdb.cp/virtfunc.exp: Likewise. 
 * gdb.disasm/am33.exp: Likewise. 	* gdb.disasm/h8300s.exp: Likewise. 
 * gdb.disasm/mn10300.exp: Likewise. 	* gdb.disasm/sh3.exp: Likewise. 
 * gdb.disasm/t01_mov.exp: Likewise. 	* gdb.disasm/t02_mova.exp: Likewise. 
 * gdb.disasm/t03_add.exp: Likewise. 	* gdb.disasm/t04_sub.exp: Likewise. 
 * gdb.disasm/t05_cmp.exp: Likewise. 	* gdb.disasm/t06_ari2.exp: Likewise. 
 * gdb.disasm/t07_ari3.exp: Likewise. 	* gdb.disasm/t08_or.exp: Likewise. 
 * gdb.disasm/t09_xor.exp: Likewise. 	* gdb.disasm/t10_and.exp: Likewise. 
 * gdb.disasm/t11_logs.exp: Likewise. 	* gdb.disasm/t12_bit.exp: Likewise. 
 * gdb.disasm/t13_otr.exp: Likewise. 	* gdb.hp/gdb.aCC/optimize.exp:
 Likewise. 	* gdb.hp/gdb.aCC/watch-cmd.exp: Likewise. 	*
 gdb.hp/gdb.base-hp/callfwmall.exp: Likewise. 	*
 gdb.hp/gdb.base-hp/dollar.exp: Likewise. 	*
 gdb.hp/gdb.base-hp/hwwatchbus.exp: Likewise. 	* gdb.hp/gdb.base-hp/pxdb.exp:
 Likewise. 	* gdb.hp/gdb.base-hp/reg-pa64.exp: Likewise. 	*
 gdb.hp/gdb.base-hp/reg.exp: Likewise. 	* gdb.hp/gdb.base-hp/sized-enum.exp:
 Likewise. 	* gdb.hp/gdb.compat/xdb1.exp: Likewise. 	*
 gdb.hp/gdb.compat/xdb3.exp: Likewise. 	* gdb.hp/gdb.objdbg/objdbg01.exp:
 Likewise. 	* gdb.hp/gdb.objdbg/objdbg02.exp: Likewise. 	*
 gdb.hp/gdb.objdbg/objdbg03.exp: Likewise. 	*
 gdb.hp/gdb.objdbg/objdbg04.exp: Likewise. 	* gdb.mi/gdb701.exp: Likewise.
 	* gdb.mi/gdb792.exp: Likewise. 	* gdb.mi/mi-basics.exp: Likewise. 
 * gdb.mi/mi-break.exp: Likewise. 	* gdb.mi/mi-cli.exp: Likewise. 	*
 gdb.mi/mi-console.exp: Likewise. 	* gdb.mi/mi-disassemble.exp: Likewise.
 	* gdb.mi/mi-eval.exp: Likewise. 	* gdb.mi/mi-file.exp:
 Likewise. 	* gdb.mi/mi-read-memory.exp: Likewise. 	* gdb.mi/mi-regs.exp:
 Likewise. 	* gdb.mi/mi-return.exp: Likewise. 	*
 gdb.mi/mi-simplerun.exp: Likewise. 	* gdb.mi/mi-stack.exp: Likewise. 
 * gdb.mi/mi-stepi.exp: Likewise. 	* gdb.mi/mi-syn-frame.exp: Likewise. 
 * gdb.mi/mi-until.exp: Likewise. 	* gdb.mi/mi-var-block.exp: Likewise. 
 * gdb.mi/mi-var-child.exp: Likewise. 	* gdb.mi/mi-var-cmd.exp: Likewise. 
 * gdb.mi/mi-var-display.exp: Likewise. 	* gdb.mi/mi-watch.exp:
 Likewise. 	* gdb.mi/mi2-basics.exp: Likewise. 	*
 gdb.mi/mi2-break.exp: Likewise. 	* gdb.mi/mi2-cli.exp: Likewise. 
 * gdb.mi/mi2-console.exp: Likewise. 	* gdb.mi/mi2-disassemble.exp:
 Likewise. 	* gdb.mi/mi2-eval.exp: Likewise. 	* gdb.mi/mi2-file.exp:
 Likewise. 	* gdb.mi/mi2-read-memory.exp: Likewise. 	*
 gdb.mi/mi2-regs.exp: Likewise. 	* gdb.mi/mi2-return.exp: Likewise. 
 * gdb.mi/mi2-simplerun.exp: Likewise. 	* gdb.mi/mi2-stack.exp: Likewise. 
 * gdb.mi/mi2-stepi.exp: Likewise. 	* gdb.mi/mi2-syn-frame.exp: Likewise. 
 * gdb.mi/mi2-until.exp: Likewise. 	* gdb.mi/mi2-var-block.exp: Likewise. 
 * gdb.mi/mi2-var-child.exp: Likewise. 	* gdb.mi/mi2-var-cmd.exp: Likewise. 
 * gdb.mi/mi2-var-display.exp: Likewise. 	* gdb.mi/mi2-watch.exp:
 Likewise. 	* gdb.stabs/exclfwd.exp: Likewise. 	* gdb.stabs/weird.exp:
 Likewise. 	* gdb.threads/gcore-thread.exp: Likewise. 	*
 gdb.trace/actions.exp: Likewise. 	* gdb.trace/backtrace.exp: Likewise. 
 * gdb.trace/circ.exp: Likewise. 	* gdb.trace/collection.exp: Likewise. 
 * gdb.trace/deltrace.exp: Likewise. 	* gdb.trace/infotrace.exp: Likewise. 
 * gdb.trace/limits.exp: Likewise. 	* gdb.trace/packetlen.exp: Likewise. 
 * gdb.trace/passc-dyn.exp: Likewise. 	* gdb.trace/passcount.exp: Likewise. 
 * gdb.trace/report.exp: Likewise. 	* gdb.trace/save-trace.exp: Likewise. 
 * gdb.trace/tfind.exp: Likewise. 	* gdb.trace/tracecmd.exp: Likewise. 
 * gdb.trace/while-dyn.exp: Likewise. 	* gdb.trace/while-stepping.exp:
 Likewise.

---
 gdb/testsuite/ChangeLog                       | 246 ++++++++++++++++++
 gdb/testsuite/gdb.arch/altivec-abi.exp        |   3 +-
 gdb/testsuite/gdb.arch/altivec-regs.exp       |   3 +-
 gdb/testsuite/gdb.arch/e500-abi.exp           |   3 +-
 gdb/testsuite/gdb.arch/e500-regs.exp          |   3 +-
 gdb/testsuite/gdb.arch/gdb1291.exp            |   3 +-
 gdb/testsuite/gdb.arch/gdb1431.exp            |   3 +-
 gdb/testsuite/gdb.arch/gdb1558.exp            |   3 +-
 gdb/testsuite/gdb.arch/i386-prologue.exp      |   3 +-
 gdb/testsuite/gdb.arch/i386-unwind.exp        |   3 +-
 gdb/testsuite/gdb.asm/asm-source.exp          |  15 +-
 gdb/testsuite/gdb.base/a2-run.exp             |   3 +-
 gdb/testsuite/gdb.base/advance.exp            |   3 +-
 gdb/testsuite/gdb.base/all-bin.exp            |   3 +-
 gdb/testsuite/gdb.base/annota1.exp            |   3 +-
 gdb/testsuite/gdb.base/annota3.exp            |   3 +-
 gdb/testsuite/gdb.base/args.exp               |   3 +-
 gdb/testsuite/gdb.base/arithmet.exp           |   3 +-
 gdb/testsuite/gdb.base/assign.exp             |   3 +-
 gdb/testsuite/gdb.base/async.exp              |   3 +-
 gdb/testsuite/gdb.base/attach.exp             |   6 +-
 gdb/testsuite/gdb.base/bang.exp               |   3 +-
 gdb/testsuite/gdb.base/bigcore.exp            |   3 +-
 gdb/testsuite/gdb.base/bitfields.exp          |   3 +-
 gdb/testsuite/gdb.base/bitfields2.exp         |   3 +-
 gdb/testsuite/gdb.base/break.exp              |  18 +-
 gdb/testsuite/gdb.base/call-sc.exp            |   3 +-
 gdb/testsuite/gdb.base/call-strs.exp          |   3 +-
 gdb/testsuite/gdb.base/callfuncs.exp          |   3 +-
 gdb/testsuite/gdb.base/checkpoint.exp         |   3 +-
 gdb/testsuite/gdb.base/chng-syms.exp          |   3 +-
 gdb/testsuite/gdb.base/code-expr.exp          |   3 +-
 gdb/testsuite/gdb.base/commands.exp           |   3 +-
 gdb/testsuite/gdb.base/completion.exp         |   9 +-
 gdb/testsuite/gdb.base/cond-expr.exp          |   3 +-
 gdb/testsuite/gdb.base/condbreak.exp          |   9 +-
 gdb/testsuite/gdb.base/consecutive.exp        |   3 +-
 gdb/testsuite/gdb.base/constvars.exp          |   3 +-
 gdb/testsuite/gdb.base/corefile.exp           |   3 +-
 gdb/testsuite/gdb.base/cvexpr.exp             |   3 +-
 gdb/testsuite/gdb.base/dbx.exp                |   9 +-
 gdb/testsuite/gdb.base/define.exp             |   9 +-
 gdb/testsuite/gdb.base/detach.exp             |   3 +-
 gdb/testsuite/gdb.base/display.exp            |   3 +-
 gdb/testsuite/gdb.base/dump.exp               |   9 +-
 gdb/testsuite/gdb.base/ena-dis-br.exp         |   9 +-
 gdb/testsuite/gdb.base/ending-run.exp         |   3 +-
 gdb/testsuite/gdb.base/environ.exp            |   9 +-
 gdb/testsuite/gdb.base/eval-skip.exp          |   3 +-
 gdb/testsuite/gdb.base/exprs.exp              |   3 +-
 gdb/testsuite/gdb.base/fileio.exp             |   3 +-
 gdb/testsuite/gdb.base/finish.exp             |   6 +-
 gdb/testsuite/gdb.base/float.exp              |   3 +-
 gdb/testsuite/gdb.base/foll-exec.exp          |   6 +-
 gdb/testsuite/gdb.base/foll-fork.exp          |   3 +-
 gdb/testsuite/gdb.base/foll-vfork.exp         |   6 +-
 gdb/testsuite/gdb.base/freebpcmd.exp          |   3 +-
 gdb/testsuite/gdb.base/funcargs.exp           |   3 +-
 gdb/testsuite/gdb.base/gcore.exp              |   6 +-
 gdb/testsuite/gdb.base/gdb1090.exp            |   3 +-
 gdb/testsuite/gdb.base/gdb1250.exp            |   3 +-
 gdb/testsuite/gdb.base/huge.exp               |   6 +-
 gdb/testsuite/gdb.base/info-proc.exp          |  12 +-
 gdb/testsuite/gdb.base/interrupt.exp          |   3 +-
 gdb/testsuite/gdb.base/jump.exp               |   3 +-
 gdb/testsuite/gdb.base/langs.exp              |  12 +-
 gdb/testsuite/gdb.base/lineinc.exp            |   3 +-
 gdb/testsuite/gdb.base/list.exp               |   9 +-
 gdb/testsuite/gdb.base/logical.exp            |   3 +-
 gdb/testsuite/gdb.base/long_long.exp          |   3 +-
 gdb/testsuite/gdb.base/macscp.exp             |   3 +-
 gdb/testsuite/gdb.base/maint.exp              |   9 +-
 gdb/testsuite/gdb.base/mips_pro.exp           |   6 +-
 gdb/testsuite/gdb.base/miscexprs.exp          |   3 +-
 gdb/testsuite/gdb.base/multi-forks.exp        |   3 +-
 gdb/testsuite/gdb.base/opaque.exp             |   9 +-
 gdb/testsuite/gdb.base/overlays.exp           |  21 +-
 gdb/testsuite/gdb.base/pc-fp.exp              |   3 +-
 gdb/testsuite/gdb.base/pointers.exp           |   3 +-
 gdb/testsuite/gdb.base/printcmds.exp          |   3 +-
 gdb/testsuite/gdb.base/psymtab.exp            |   9 +-
 gdb/testsuite/gdb.base/ptype.exp              |   9 +-
 gdb/testsuite/gdb.base/recurse.exp            |   3 +-
 gdb/testsuite/gdb.base/relational.exp         |   3 +-
 gdb/testsuite/gdb.base/relocate.exp           |   3 +-
 gdb/testsuite/gdb.base/remote.exp             |   3 +-
 gdb/testsuite/gdb.base/reread.exp             |   6 +-
 gdb/testsuite/gdb.base/restore.exp            |   3 +-
 gdb/testsuite/gdb.base/return.exp             |   3 +-
 gdb/testsuite/gdb.base/return2.exp            |   6 +-
 gdb/testsuite/gdb.base/scope.exp              |   9 +-
 gdb/testsuite/gdb.base/sect-cmd.exp           |   9 +-
 gdb/testsuite/gdb.base/sep.exp                |   3 +-
 gdb/testsuite/gdb.base/sepdebug.exp           |   3 +-
 gdb/testsuite/gdb.base/setshow.exp            |   3 +-
 gdb/testsuite/gdb.base/setvar.exp             |   3 +-
 gdb/testsuite/gdb.base/sigall.exp             |   3 +-
 gdb/testsuite/gdb.base/sigbpt.exp             |   3 +-
 gdb/testsuite/gdb.base/signals.exp            |   3 +-
 gdb/testsuite/gdb.base/signull.exp            |   3 +-
 gdb/testsuite/gdb.base/sizeof.exp             |   3 +-
 gdb/testsuite/gdb.base/solib.exp              |   6 +-
 gdb/testsuite/gdb.base/step-line.exp          |   3 +-
 gdb/testsuite/gdb.base/step-test.exp          |   3 +-
 gdb/testsuite/gdb.base/structs.exp            |   3 +-
 gdb/testsuite/gdb.base/structs2.exp           |   3 +-
 gdb/testsuite/gdb.base/term.exp               |   3 +-
 gdb/testsuite/gdb.base/twice.exp              |   3 +-
 gdb/testsuite/gdb.base/until.exp              |   9 +-
 gdb/testsuite/gdb.base/varargs.exp            |   3 +-
 gdb/testsuite/gdb.base/volatile.exp           |   3 +-
 gdb/testsuite/gdb.base/watchpoint.exp         |   3 +-
 gdb/testsuite/gdb.base/whatis-exp.exp         |   3 +-
 gdb/testsuite/gdb.base/whatis.exp             |   3 +-
 gdb/testsuite/gdb.cp/ambiguous.exp            |   3 +-
 gdb/testsuite/gdb.cp/annota2.exp              |   3 +-
 gdb/testsuite/gdb.cp/annota3.exp              |   3 +-
 gdb/testsuite/gdb.cp/bool.exp                 |   3 +-
 gdb/testsuite/gdb.cp/breakpoint.exp           |   3 +-
 gdb/testsuite/gdb.cp/casts.exp                |   3 +-
 gdb/testsuite/gdb.cp/class2.exp               |   3 +-
 gdb/testsuite/gdb.cp/classes.exp              |   3 +-
 gdb/testsuite/gdb.cp/cplusfuncs.exp           |   3 +-
 gdb/testsuite/gdb.cp/ctti.exp                 |  15 +-
 gdb/testsuite/gdb.cp/derivation.exp           |   3 +-
 gdb/testsuite/gdb.cp/exception.exp            |   3 +-
 gdb/testsuite/gdb.cp/gdb1355.exp              |   3 +-
 gdb/testsuite/gdb.cp/hang.exp                 |   6 +-
 gdb/testsuite/gdb.cp/inherit.exp              |   3 +-
 gdb/testsuite/gdb.cp/local.exp                |   3 +-
 gdb/testsuite/gdb.cp/m-data.exp               |   3 +-
 gdb/testsuite/gdb.cp/m-static.exp             |   9 +-
 gdb/testsuite/gdb.cp/member-ptr.exp           |   3 +-
 gdb/testsuite/gdb.cp/method.exp               |   3 +-
 gdb/testsuite/gdb.cp/misc.exp                 |   3 +-
 gdb/testsuite/gdb.cp/namespace.exp            |   9 +-
 gdb/testsuite/gdb.cp/overload.exp             |   3 +-
 gdb/testsuite/gdb.cp/ovldbreak.exp            |   3 +-
 gdb/testsuite/gdb.cp/pr-1023.exp              |   3 +-
 gdb/testsuite/gdb.cp/pr-1210.exp              |   3 +-
 gdb/testsuite/gdb.cp/pr-574.exp               |   3 +-
 gdb/testsuite/gdb.cp/printmethod.exp          |   3 +-
 gdb/testsuite/gdb.cp/psmang.exp               |   9 +-
 gdb/testsuite/gdb.cp/ref-params.exp           |   3 +-
 gdb/testsuite/gdb.cp/ref-types.exp            |   3 +-
 gdb/testsuite/gdb.cp/rtti.exp                 |   9 +-
 gdb/testsuite/gdb.cp/templates.exp            |   3 +-
 gdb/testsuite/gdb.cp/try_catch.exp            |   3 +-
 gdb/testsuite/gdb.cp/userdef.exp              |   3 +-
 gdb/testsuite/gdb.cp/virtfunc.exp             |   3 +-
 gdb/testsuite/gdb.disasm/am33.exp             |   3 +-
 gdb/testsuite/gdb.disasm/h8300s.exp           |   3 +-
 gdb/testsuite/gdb.disasm/mn10300.exp          |   3 +-
 gdb/testsuite/gdb.disasm/sh3.exp              |   3 +-
 gdb/testsuite/gdb.disasm/t01_mov.exp          |   6 +-
 gdb/testsuite/gdb.disasm/t02_mova.exp         |   6 +-
 gdb/testsuite/gdb.disasm/t03_add.exp          |   6 +-
 gdb/testsuite/gdb.disasm/t04_sub.exp          |   6 +-
 gdb/testsuite/gdb.disasm/t05_cmp.exp          |   6 +-
 gdb/testsuite/gdb.disasm/t06_ari2.exp         |   6 +-
 gdb/testsuite/gdb.disasm/t07_ari3.exp         |   6 +-
 gdb/testsuite/gdb.disasm/t08_or.exp           |   6 +-
 gdb/testsuite/gdb.disasm/t09_xor.exp          |   6 +-
 gdb/testsuite/gdb.disasm/t10_and.exp          |   6 +-
 gdb/testsuite/gdb.disasm/t11_logs.exp         |   6 +-
 gdb/testsuite/gdb.disasm/t12_bit.exp          |   6 +-
 gdb/testsuite/gdb.disasm/t13_otr.exp          |   6 +-
 gdb/testsuite/gdb.hp/gdb.aCC/optimize.exp     |   6 +-
 gdb/testsuite/gdb.hp/gdb.aCC/watch-cmd.exp    |   3 +-
 .../gdb.hp/gdb.base-hp/callfwmall.exp         |   3 +-
 gdb/testsuite/gdb.hp/gdb.base-hp/dollar.exp   |   3 +-
 .../gdb.hp/gdb.base-hp/hwwatchbus.exp         |   3 +-
 gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp     |   3 +-
 gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.exp |   3 +-
 gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp      |   3 +-
 .../gdb.hp/gdb.base-hp/sized-enum.exp         |   3 +-
 gdb/testsuite/gdb.hp/gdb.compat/xdb1.exp      |   3 +-
 gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp      |   9 +-
 gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp  |   3 +-
 gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp  |   3 +-
 gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp  |   3 +-
 gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04.exp  |   3 +-
 gdb/testsuite/gdb.mi/gdb701.exp               |   3 +-
 gdb/testsuite/gdb.mi/gdb792.exp               |   3 +-
 gdb/testsuite/gdb.mi/mi-basics.exp            |   3 +-
 gdb/testsuite/gdb.mi/mi-break.exp             |   3 +-
 gdb/testsuite/gdb.mi/mi-cli.exp               |   3 +-
 gdb/testsuite/gdb.mi/mi-console.exp           |   3 +-
 gdb/testsuite/gdb.mi/mi-disassemble.exp       |   3 +-
 gdb/testsuite/gdb.mi/mi-eval.exp              |   3 +-
 gdb/testsuite/gdb.mi/mi-file.exp              |   3 +-
 gdb/testsuite/gdb.mi/mi-read-memory.exp       |   3 +-
 gdb/testsuite/gdb.mi/mi-regs.exp              |   3 +-
 gdb/testsuite/gdb.mi/mi-return.exp            |   3 +-
 gdb/testsuite/gdb.mi/mi-simplerun.exp         |   3 +-
 gdb/testsuite/gdb.mi/mi-stack.exp             |   3 +-
 gdb/testsuite/gdb.mi/mi-stepi.exp             |   3 +-
 gdb/testsuite/gdb.mi/mi-syn-frame.exp         |   3 +-
 gdb/testsuite/gdb.mi/mi-until.exp             |   3 +-
 gdb/testsuite/gdb.mi/mi-var-block.exp         |   3 +-
 gdb/testsuite/gdb.mi/mi-var-child.exp         |   3 +-
 gdb/testsuite/gdb.mi/mi-var-cmd.exp           |   3 +-
 gdb/testsuite/gdb.mi/mi-var-display.exp       |   3 +-
 gdb/testsuite/gdb.mi/mi-watch.exp             |   3 +-
 gdb/testsuite/gdb.mi/mi2-basics.exp           |   3 +-
 gdb/testsuite/gdb.mi/mi2-break.exp            |   3 +-
 gdb/testsuite/gdb.mi/mi2-cli.exp              |   3 +-
 gdb/testsuite/gdb.mi/mi2-console.exp          |   3 +-
 gdb/testsuite/gdb.mi/mi2-disassemble.exp      |   3 +-
 gdb/testsuite/gdb.mi/mi2-eval.exp             |   3 +-
 gdb/testsuite/gdb.mi/mi2-file.exp             |   3 +-
 gdb/testsuite/gdb.mi/mi2-read-memory.exp      |   3 +-
 gdb/testsuite/gdb.mi/mi2-regs.exp             |   3 +-
 gdb/testsuite/gdb.mi/mi2-return.exp           |   3 +-
 gdb/testsuite/gdb.mi/mi2-simplerun.exp        |   3 +-
 gdb/testsuite/gdb.mi/mi2-stack.exp            |   3 +-
 gdb/testsuite/gdb.mi/mi2-stepi.exp            |   3 +-
 gdb/testsuite/gdb.mi/mi2-syn-frame.exp        |   3 +-
 gdb/testsuite/gdb.mi/mi2-until.exp            |   3 +-
 gdb/testsuite/gdb.mi/mi2-var-block.exp        |   3 +-
 gdb/testsuite/gdb.mi/mi2-var-child.exp        |   3 +-
 gdb/testsuite/gdb.mi/mi2-var-cmd.exp          |   3 +-
 gdb/testsuite/gdb.mi/mi2-var-display.exp      |   3 +-
 gdb/testsuite/gdb.mi/mi2-watch.exp            |   3 +-
 gdb/testsuite/gdb.stabs/exclfwd.exp           |   6 +-
 gdb/testsuite/gdb.stabs/weird.exp             |   3 +-
 gdb/testsuite/gdb.threads/gcore-thread.exp    |   3 +-
 gdb/testsuite/gdb.trace/actions.exp           |   3 +-
 gdb/testsuite/gdb.trace/backtrace.exp         |  12 +-
 gdb/testsuite/gdb.trace/circ.exp              |   3 +-
 gdb/testsuite/gdb.trace/collection.exp        |   3 +-
 gdb/testsuite/gdb.trace/deltrace.exp          |   3 +-
 gdb/testsuite/gdb.trace/infotrace.exp         |   3 +-
 gdb/testsuite/gdb.trace/limits.exp            |   3 +-
 gdb/testsuite/gdb.trace/packetlen.exp         |   6 +-
 gdb/testsuite/gdb.trace/passc-dyn.exp         |  24 +-
 gdb/testsuite/gdb.trace/passcount.exp         |   3 +-
 gdb/testsuite/gdb.trace/report.exp            |  12 +-
 gdb/testsuite/gdb.trace/save-trace.exp        |   3 +-
 gdb/testsuite/gdb.trace/tfind.exp             |   6 +-
 gdb/testsuite/gdb.trace/tracecmd.exp          |   3 +-
 gdb/testsuite/gdb.trace/while-dyn.exp         |   6 +-
 gdb/testsuite/gdb.trace/while-stepping.exp    |   3 +-
 243 files changed, 944 insertions(+), 349 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b0decfb2d0..73a0d8cae7 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,249 @@
+2006-08-09  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.arch/altivec-abi.exp: Replace gdb_suppress_entire_file with
+	untested followed by return combination.
+	* gdb.arch/altivec-regs.exp: Likewise.
+	* gdb.arch/e500-abi.exp: Likewise.
+	* gdb.arch/e500-regs.exp: Likewise.
+	* gdb.arch/gdb1291.exp: Likewise.
+	* gdb.arch/gdb1431.exp: Likewise.
+	* gdb.arch/gdb1558.exp: Likewise.
+	* gdb.arch/i386-prologue.exp: Likewise.
+	* gdb.arch/i386-unwind.exp: Likewise.
+	* gdb.asm/asm-source.exp: Likewise.
+	* gdb.base/a2-run.exp: Likewise.
+	* gdb.base/advance.exp: Likewise.
+	* gdb.base/all-bin.exp: Likewise.
+	* gdb.base/annota1.exp: Likewise.
+	* gdb.base/annota3.exp: Likewise.
+	* gdb.base/args.exp: Likewise.
+	* gdb.base/arithmet.exp: Likewise.
+	* gdb.base/assign.exp: Likewise.
+	* gdb.base/async.exp: Likewise.
+	* gdb.base/attach.exp: Likewise.
+	* gdb.base/bang.exp: Likewise.
+	* gdb.base/bigcore.exp: Likewise.
+	* gdb.base/bitfields.exp: Likewise.
+	* gdb.base/bitfields2.exp: Likewise.
+	* gdb.base/break.exp: Likewise.
+	* gdb.base/call-sc.exp: Likewise.
+	* gdb.base/call-strs.exp: Likewise.
+	* gdb.base/callfuncs.exp: Likewise.
+	* gdb.base/checkpoint.exp: Likewise.
+	* gdb.base/chng-syms.exp: Likewise.
+	* gdb.base/code-expr.exp: Likewise.
+	* gdb.base/commands.exp: Likewise.
+	* gdb.base/completion.exp: Likewise.
+	* gdb.base/cond-expr.exp: Likewise.
+	* gdb.base/condbreak.exp: Likewise.
+	* gdb.base/consecutive.exp: Likewise.
+	* gdb.base/constvars.exp: Likewise.
+	* gdb.base/corefile.exp: Likewise.
+	* gdb.base/cvexpr.exp: Likewise.
+	* gdb.base/dbx.exp: Likewise.
+	* gdb.base/define.exp: Likewise.
+	* gdb.base/detach.exp: Likewise.
+	* gdb.base/display.exp: Likewise.
+	* gdb.base/dump.exp: Likewise.
+	* gdb.base/ena-dis-br.exp: Likewise.
+	* gdb.base/ending-run.exp: Likewise.
+	* gdb.base/environ.exp: Likewise.
+	* gdb.base/eval-skip.exp: Likewise.
+	* gdb.base/exprs.exp: Likewise.
+	* gdb.base/fileio.exp: Likewise.
+	* gdb.base/finish.exp: Likewise.
+	* gdb.base/float.exp: Likewise.
+	* gdb.base/foll-exec.exp: Likewise.
+	* gdb.base/foll-fork.exp: Likewise.
+	* gdb.base/foll-vfork.exp: Likewise.
+	* gdb.base/freebpcmd.exp: Likewise.
+	* gdb.base/funcargs.exp: Likewise.
+	* gdb.base/gcore.exp: Likewise.
+	* gdb.base/gdb1090.exp: Likewise.
+	* gdb.base/gdb1250.exp: Likewise.
+	* gdb.base/huge.exp: Likewise.
+	* gdb.base/info-proc.exp: Likewise.
+	* gdb.base/interrupt.exp: Likewise.
+	* gdb.base/jump.exp: Likewise.
+	* gdb.base/langs.exp: Likewise.
+	* gdb.base/lineinc.exp: Likewise.
+	* gdb.base/list.exp: Likewise.
+	* gdb.base/logical.exp: Likewise.
+	* gdb.base/long_long.exp: Likewise.
+	* gdb.base/macscp.exp: Likewise.
+	* gdb.base/maint.exp: Likewise.
+	* gdb.base/mips_pro.exp: Likewise.
+	* gdb.base/miscexprs.exp: Likewise.
+	* gdb.base/multi-forks.exp: Likewise.
+	* gdb.base/opaque.exp: Likewise.
+	* gdb.base/overlays.exp: Likewise.
+	* gdb.base/pc-fp.exp: Likewise.
+	* gdb.base/pointers.exp: Likewise.
+	* gdb.base/printcmds.exp: Likewise.
+	* gdb.base/psymtab.exp: Likewise.
+	* gdb.base/ptype.exp: Likewise.
+	* gdb.base/recurse.exp: Likewise.
+	* gdb.base/relational.exp: Likewise.
+	* gdb.base/relocate.exp: Likewise.
+	* gdb.base/remote.exp: Likewise.
+	* gdb.base/reread.exp: Likewise.
+	* gdb.base/restore.exp: Likewise.
+	* gdb.base/return.exp: Likewise.
+	* gdb.base/return2.exp: Likewise.
+	* gdb.base/scope.exp: Likewise.
+	* gdb.base/sect-cmd.exp: Likewise.
+	* gdb.base/sep.exp: Likewise.
+	* gdb.base/sepdebug.exp: Likewise.
+	* gdb.base/setshow.exp: Likewise.
+	* gdb.base/setvar.exp: Likewise.
+	* gdb.base/sigall.exp: Likewise.
+	* gdb.base/sigbpt.exp: Likewise.
+	* gdb.base/signals.exp: Likewise.
+	* gdb.base/signull.exp: Likewise.
+	* gdb.base/sizeof.exp: Likewise.
+	* gdb.base/solib.exp: Likewise.
+	* gdb.base/step-line.exp: Likewise.
+	* gdb.base/step-test.exp: Likewise.
+	* gdb.base/structs.exp: Likewise.
+	* gdb.base/structs2.exp: Likewise.
+	* gdb.base/term.exp: Likewise.
+	* gdb.base/twice.exp: Likewise.
+	* gdb.base/until.exp: Likewise.
+	* gdb.base/varargs.exp: Likewise.
+	* gdb.base/volatile.exp: Likewise.
+	* gdb.base/watchpoint.exp: Likewise.
+	* gdb.base/whatis-exp.exp: Likewise.
+	* gdb.base/whatis.exp: Likewise.
+	* gdb.cp/ambiguous.exp: Likewise.
+	* gdb.cp/annota2.exp: Likewise.
+	* gdb.cp/annota3.exp: Likewise.
+	* gdb.cp/bool.exp: Likewise.
+	* gdb.cp/breakpoint.exp: Likewise.
+	* gdb.cp/casts.exp: Likewise.
+	* gdb.cp/class2.exp: Likewise.
+	* gdb.cp/classes.exp: Likewise.
+	* gdb.cp/cplusfuncs.exp: Likewise.
+	* gdb.cp/ctti.exp: Likewise.
+	* gdb.cp/derivation.exp: Likewise.
+	* gdb.cp/exception.exp: Likewise.
+	* gdb.cp/gdb1355.exp: Likewise.
+	* gdb.cp/hang.exp: Likewise.
+	* gdb.cp/inherit.exp: Likewise.
+	* gdb.cp/local.exp: Likewise.
+	* gdb.cp/m-data.exp: Likewise.
+	* gdb.cp/m-static.exp: Likewise.
+	* gdb.cp/member-ptr.exp: Likewise.
+	* gdb.cp/method.exp: Likewise.
+	* gdb.cp/misc.exp: Likewise.
+	* gdb.cp/namespace.exp: Likewise.
+	* gdb.cp/overload.exp: Likewise.
+	* gdb.cp/ovldbreak.exp: Likewise.
+	* gdb.cp/pr-1023.exp: Likewise.
+	* gdb.cp/pr-1210.exp: Likewise.
+	* gdb.cp/pr-574.exp: Likewise.
+	* gdb.cp/printmethod.exp: Likewise.
+	* gdb.cp/psmang.exp: Likewise.
+	* gdb.cp/ref-params.exp: Likewise.
+	* gdb.cp/ref-types.exp: Likewise.
+	* gdb.cp/rtti.exp: Likewise.
+	* gdb.cp/templates.exp: Likewise.
+	* gdb.cp/try_catch.exp: Likewise.
+	* gdb.cp/userdef.exp: Likewise.
+	* gdb.cp/virtfunc.exp: Likewise.
+	* gdb.disasm/am33.exp: Likewise.
+	* gdb.disasm/h8300s.exp: Likewise.
+	* gdb.disasm/mn10300.exp: Likewise.
+	* gdb.disasm/sh3.exp: Likewise.
+	* gdb.disasm/t01_mov.exp: Likewise.
+	* gdb.disasm/t02_mova.exp: Likewise.
+	* gdb.disasm/t03_add.exp: Likewise.
+	* gdb.disasm/t04_sub.exp: Likewise.
+	* gdb.disasm/t05_cmp.exp: Likewise.
+	* gdb.disasm/t06_ari2.exp: Likewise.
+	* gdb.disasm/t07_ari3.exp: Likewise.
+	* gdb.disasm/t08_or.exp: Likewise.
+	* gdb.disasm/t09_xor.exp: Likewise.
+	* gdb.disasm/t10_and.exp: Likewise.
+	* gdb.disasm/t11_logs.exp: Likewise.
+	* gdb.disasm/t12_bit.exp: Likewise.
+	* gdb.disasm/t13_otr.exp: Likewise.
+	* gdb.hp/gdb.aCC/optimize.exp: Likewise.
+	* gdb.hp/gdb.aCC/watch-cmd.exp: Likewise.
+	* gdb.hp/gdb.base-hp/callfwmall.exp: Likewise.
+	* gdb.hp/gdb.base-hp/dollar.exp: Likewise.
+	* gdb.hp/gdb.base-hp/hwwatchbus.exp: Likewise.
+	* gdb.hp/gdb.base-hp/pxdb.exp: Likewise.
+	* gdb.hp/gdb.base-hp/reg-pa64.exp: Likewise.
+	* gdb.hp/gdb.base-hp/reg.exp: Likewise.
+	* gdb.hp/gdb.base-hp/sized-enum.exp: Likewise.
+	* gdb.hp/gdb.compat/xdb1.exp: Likewise.
+	* gdb.hp/gdb.compat/xdb3.exp: Likewise.
+	* gdb.hp/gdb.objdbg/objdbg01.exp: Likewise.
+	* gdb.hp/gdb.objdbg/objdbg02.exp: Likewise.
+	* gdb.hp/gdb.objdbg/objdbg03.exp: Likewise.
+	* gdb.hp/gdb.objdbg/objdbg04.exp: Likewise.
+	* gdb.mi/gdb701.exp: Likewise.
+	* gdb.mi/gdb792.exp: Likewise.
+	* gdb.mi/mi-basics.exp: Likewise.
+	* gdb.mi/mi-break.exp: Likewise.
+	* gdb.mi/mi-cli.exp: Likewise.
+	* gdb.mi/mi-console.exp: Likewise.
+	* gdb.mi/mi-disassemble.exp: Likewise.
+	* gdb.mi/mi-eval.exp: Likewise.
+	* gdb.mi/mi-file.exp: Likewise.
+	* gdb.mi/mi-read-memory.exp: Likewise.
+	* gdb.mi/mi-regs.exp: Likewise.
+	* gdb.mi/mi-return.exp: Likewise.
+	* gdb.mi/mi-simplerun.exp: Likewise.
+	* gdb.mi/mi-stack.exp: Likewise.
+	* gdb.mi/mi-stepi.exp: Likewise.
+	* gdb.mi/mi-syn-frame.exp: Likewise.
+	* gdb.mi/mi-until.exp: Likewise.
+	* gdb.mi/mi-var-block.exp: Likewise.
+	* gdb.mi/mi-var-child.exp: Likewise.
+	* gdb.mi/mi-var-cmd.exp: Likewise.
+	* gdb.mi/mi-var-display.exp: Likewise.
+	* gdb.mi/mi-watch.exp: Likewise.
+	* gdb.mi/mi2-basics.exp: Likewise.
+	* gdb.mi/mi2-break.exp: Likewise.
+	* gdb.mi/mi2-cli.exp: Likewise.
+	* gdb.mi/mi2-console.exp: Likewise.
+	* gdb.mi/mi2-disassemble.exp: Likewise.
+	* gdb.mi/mi2-eval.exp: Likewise.
+	* gdb.mi/mi2-file.exp: Likewise.
+	* gdb.mi/mi2-read-memory.exp: Likewise.
+	* gdb.mi/mi2-regs.exp: Likewise.
+	* gdb.mi/mi2-return.exp: Likewise.
+	* gdb.mi/mi2-simplerun.exp: Likewise.
+	* gdb.mi/mi2-stack.exp: Likewise.
+	* gdb.mi/mi2-stepi.exp: Likewise.
+	* gdb.mi/mi2-syn-frame.exp: Likewise.
+	* gdb.mi/mi2-until.exp: Likewise.
+	* gdb.mi/mi2-var-block.exp: Likewise.
+	* gdb.mi/mi2-var-child.exp: Likewise.
+	* gdb.mi/mi2-var-cmd.exp: Likewise.
+	* gdb.mi/mi2-var-display.exp: Likewise.
+	* gdb.mi/mi2-watch.exp: Likewise.
+	* gdb.stabs/exclfwd.exp: Likewise.
+	* gdb.stabs/weird.exp: Likewise.
+	* gdb.threads/gcore-thread.exp: Likewise.
+	* gdb.trace/actions.exp: Likewise.
+	* gdb.trace/backtrace.exp: Likewise.
+	* gdb.trace/circ.exp: Likewise.
+	* gdb.trace/collection.exp: Likewise.
+	* gdb.trace/deltrace.exp: Likewise.
+	* gdb.trace/infotrace.exp: Likewise.
+	* gdb.trace/limits.exp: Likewise.
+	* gdb.trace/packetlen.exp: Likewise.
+	* gdb.trace/passc-dyn.exp: Likewise.
+	* gdb.trace/passcount.exp: Likewise.
+	* gdb.trace/report.exp: Likewise.
+	* gdb.trace/save-trace.exp: Likewise.
+	* gdb.trace/tfind.exp: Likewise.
+	* gdb.trace/tracecmd.exp: Likewise.
+	* gdb.trace/while-dyn.exp: Likewise.
+	* gdb.trace/while-stepping.exp: Likewise.
+
 2006-08-08  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.base/step-bt.c: New file.
diff --git a/gdb/testsuite/gdb.arch/altivec-abi.exp b/gdb/testsuite/gdb.arch/altivec-abi.exp
index 766af42804..dd90dcf9a4 100644
--- a/gdb/testsuite/gdb.arch/altivec-abi.exp
+++ b/gdb/testsuite/gdb.arch/altivec-abi.exp
@@ -58,7 +58,8 @@ if [test_compiler_info gcc*] {
 }
 
 if  { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $compile_flags] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested altivec-abi.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.arch/altivec-regs.exp b/gdb/testsuite/gdb.arch/altivec-regs.exp
index e4f535d729..97ca871db1 100644
--- a/gdb/testsuite/gdb.arch/altivec-regs.exp
+++ b/gdb/testsuite/gdb.arch/altivec-regs.exp
@@ -58,7 +58,8 @@ if [test_compiler_info gcc*] {
 }
 
 if  { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $compile_flags] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested altivec-regs.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.arch/e500-abi.exp b/gdb/testsuite/gdb.arch/e500-abi.exp
index a634954d5c..e60f3aa01e 100644
--- a/gdb/testsuite/gdb.arch/e500-abi.exp
+++ b/gdb/testsuite/gdb.arch/e500-abi.exp
@@ -43,7 +43,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 set src1 ${srcdir}/${subdir}/${testfile}.c
 
 if  { [gdb_compile ${src1} ${binfile} executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested e500-abi.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.arch/e500-regs.exp b/gdb/testsuite/gdb.arch/e500-regs.exp
index d17cdc6506..66d3b140bc 100644
--- a/gdb/testsuite/gdb.arch/e500-regs.exp
+++ b/gdb/testsuite/gdb.arch/e500-regs.exp
@@ -42,7 +42,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 set src1 ${srcdir}/${subdir}/${testfile}.c
 
 if  { [gdb_compile ${src1} ${binfile} executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested e500-regs.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.arch/gdb1291.exp b/gdb/testsuite/gdb.arch/gdb1291.exp
index 4264d6c01b..3f53d61b36 100644
--- a/gdb/testsuite/gdb.arch/gdb1291.exp
+++ b/gdb/testsuite/gdb.arch/gdb1291.exp
@@ -40,7 +40,8 @@ set testfile "gdb1291"
 set srcfile ${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ""] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested gdb1291.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.arch/gdb1431.exp b/gdb/testsuite/gdb.arch/gdb1431.exp
index 697c9f89b2..4b6e00548b 100644
--- a/gdb/testsuite/gdb.arch/gdb1431.exp
+++ b/gdb/testsuite/gdb.arch/gdb1431.exp
@@ -42,7 +42,8 @@ set testfile "gdb1431"
 set srcfile ${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ""] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested gdb1431.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.arch/gdb1558.exp b/gdb/testsuite/gdb.arch/gdb1558.exp
index 1ad2169485..6217420d57 100644
--- a/gdb/testsuite/gdb.arch/gdb1558.exp
+++ b/gdb/testsuite/gdb.arch/gdb1558.exp
@@ -39,7 +39,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 # Note we have to compile WITH optimization and WITHOUT debugging information to expose the bug.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {"additional_flags=-O2"}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested gdb1558.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp
index 39f2a6dfd9..04a1b2ebf1 100644
--- a/gdb/testsuite/gdb.arch/i386-prologue.exp
+++ b/gdb/testsuite/gdb.arch/i386-prologue.exp
@@ -47,7 +47,8 @@ if [istarget "i?86-*-cygwin*"] then {
 # 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]] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested i386-prologue.exp
+    return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.arch/i386-unwind.exp b/gdb/testsuite/gdb.arch/i386-unwind.exp
index 85fb9da62b..67b977cf72 100644
--- a/gdb/testsuite/gdb.arch/i386-unwind.exp
+++ b/gdb/testsuite/gdb.arch/i386-unwind.exp
@@ -45,7 +45,8 @@ if [istarget "i?86-*-cygwin*"] then {
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested i386-unwind.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp
index edb8b4306b..2de43c9838 100644
--- a/gdb/testsuite/gdb.asm/asm-source.exp
+++ b/gdb/testsuite/gdb.asm/asm-source.exp
@@ -157,7 +157,8 @@ switch -glob -- [istarget] {
 }
 
 if { "${asm-arch}" == "" } {
-    gdb_suppress_entire_file "Assembly source test -- not implemented for this target."
+    untested asm-source.exp
+    return -1
 }
 
 # On NetBSD/ELF we need a special NetBSD-identifying note section.
@@ -186,7 +187,8 @@ set dest [target_info name]
 if [board_info $dest exists multilib_flags] {
 	set multilib_flags [board_info $dest multilib_flags]
 	if { "${multilib_flags}" != "" } {
-	   gdb_suppress_entire_file "Assembly source test -- multilibs not supported by this test."
+	   untested asm-source.exp
+	   return -1
 	   return;
 	 }
 }
@@ -235,10 +237,12 @@ regsub "--" "-gstabs\[+\]" "${debug-flags}" "-gstabs" debug-flags
 regsub "--" "-g\[0-9\]" "${debug-flags}" "" debug-flags
 
 if {[target_assemble ${srcdir}/${subdir}/${srcfile1} asmsrc1.o "${asm-flags} ${debug-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested asm-source.exp
+     return -1
 }
 if {[target_assemble ${srcdir}/${subdir}/${srcfile2} asmsrc2.o "${asm-flags} ${debug-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested asm-source.exp
+     return -1
 }
 
 # We deliberately don't use gdb_compile here to link together the
@@ -248,7 +252,8 @@ if {[target_assemble ${srcdir}/${subdir}/${srcfile2} asmsrc2.o "${asm-flags} ${d
 # also avoids a lot of problems on many systems, most notably on
 # *-*-*bsd* and *-*-solaris2*.
 if {[target_link "asmsrc1.o asmsrc2.o" "${binfile}" ${link-flags}] != "" } then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested asm-source.exp
+     return -1
 }
 
 # Restore the target board linker script for HC11/HC12.
diff --git a/gdb/testsuite/gdb.base/a2-run.exp b/gdb/testsuite/gdb.base/a2-run.exp
index 5a6137d591..c8aae34736 100644
--- a/gdb/testsuite/gdb.base/a2-run.exp
+++ b/gdb/testsuite/gdb.base/a2-run.exp
@@ -39,7 +39,8 @@ set testfile "run"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested a2-run.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/advance.exp b/gdb/testsuite/gdb.base/advance.exp
index e5061d8fbf..ffd0bb5d2c 100644
--- a/gdb/testsuite/gdb.base/advance.exp
+++ b/gdb/testsuite/gdb.base/advance.exp
@@ -29,7 +29,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 remote_exec build "rm -f ${binfile}"
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested advance.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/all-bin.exp b/gdb/testsuite/gdb.base/all-bin.exp
index bc717710ba..04911fa994 100644
--- a/gdb/testsuite/gdb.base/all-bin.exp
+++ b/gdb/testsuite/gdb.base/all-bin.exp
@@ -42,7 +42,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested all-bin.exp
+    return -1
     }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
index 977108a635..c26aa6df1a 100644
--- a/gdb/testsuite/gdb.base/annota1.exp
+++ b/gdb/testsuite/gdb.base/annota1.exp
@@ -43,7 +43,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested annota1.exp
+    return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
index 2bdf88cdfc..055a7b5e88 100644
--- a/gdb/testsuite/gdb.base/annota3.exp
+++ b/gdb/testsuite/gdb.base/annota3.exp
@@ -42,7 +42,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested annota3.exp
+    return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.base/args.exp b/gdb/testsuite/gdb.base/args.exp
index cdd729e111..fa3c6c2ace 100644
--- a/gdb/testsuite/gdb.base/args.exp
+++ b/gdb/testsuite/gdb.base/args.exp
@@ -45,7 +45,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested args.exp
+    return -1
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/arithmet.exp b/gdb/testsuite/gdb.base/arithmet.exp
index acce9d4ee8..ff7744cd03 100644
--- a/gdb/testsuite/gdb.base/arithmet.exp
+++ b/gdb/testsuite/gdb.base/arithmet.exp
@@ -41,7 +41,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested arithmet.exp
+     return -1
     }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/assign.exp b/gdb/testsuite/gdb.base/assign.exp
index 77f06de407..1cb984919f 100644
--- a/gdb/testsuite/gdb.base/assign.exp
+++ b/gdb/testsuite/gdb.base/assign.exp
@@ -40,7 +40,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested assign.exp
+     return -1
     }
 
 
diff --git a/gdb/testsuite/gdb.base/async.exp b/gdb/testsuite/gdb.base/async.exp
index 5872dc5da1..d805ea9377 100644
--- a/gdb/testsuite/gdb.base/async.exp
+++ b/gdb/testsuite/gdb.base/async.exp
@@ -34,7 +34,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested async.exp
+    return -1
 }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp
index b4aaf9bb1b..8599727b13 100644
--- a/gdb/testsuite/gdb.base/attach.exp
+++ b/gdb/testsuite/gdb.base/attach.exp
@@ -53,13 +53,15 @@ remote_exec build "rm -f ${binfile} ${binfile2}"
 # build the first test case
 #
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested attach.exp
+    return -1
 }
 
 # Build the in-system-call test
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested attach.exp
+    return -1
 }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.base/bang.exp b/gdb/testsuite/gdb.base/bang.exp
index c967275516..676ec7ab36 100644
--- a/gdb/testsuite/gdb.base/bang.exp
+++ b/gdb/testsuite/gdb.base/bang.exp
@@ -26,7 +26,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/bang!
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested bang.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/bigcore.exp b/gdb/testsuite/gdb.base/bigcore.exp
index d972e46f0a..db92cc42d9 100644
--- a/gdb/testsuite/gdb.base/bigcore.exp
+++ b/gdb/testsuite/gdb.base/bigcore.exp
@@ -62,7 +62,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 set corefile ${objdir}/${subdir}/${testfile}.corefile
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested bigcore.exp
+     return -1
 }
 
 # Run GDB on the bigcore program up-to where it will dump core.
diff --git a/gdb/testsuite/gdb.base/bitfields.exp b/gdb/testsuite/gdb.base/bitfields.exp
index 148eec84cf..1fea3cd172 100644
--- a/gdb/testsuite/gdb.base/bitfields.exp
+++ b/gdb/testsuite/gdb.base/bitfields.exp
@@ -30,7 +30,8 @@ set testfile "bitfields"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested bitfields.exp
+    return -1
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/bitfields2.exp b/gdb/testsuite/gdb.base/bitfields2.exp
index d4f93c7496..b00429e7f2 100644
--- a/gdb/testsuite/gdb.base/bitfields2.exp
+++ b/gdb/testsuite/gdb.base/bitfields2.exp
@@ -34,7 +34,8 @@ set testfile "bitfields2"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested bitfields2.exp
+    return -1
 }
 
 set has_signed_bitfields 1
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index d99d13b7e7..2869c253a2 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -38,15 +38,18 @@ set srcfile1 ${testfile}1.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested break.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested break.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested break.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile}] {
@@ -870,15 +873,18 @@ test_next_with_recursion
 set binfileo2 ${objdir}/${subdir}/${testfile}o2
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}O0.o" object {debug nowarnings optimize=-O2}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested break.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}O1.o" object {debug nowarnings optimize=-O2}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested break.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile}O0.o ${binfile}O1.o" "${binfileo2}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested break.exp
+     return -1
 }
 
 if [get_compiler_info ${binfileo2}] {
diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp
index 01a9f15209..cff6d85a66 100644
--- a/gdb/testsuite/gdb.base/call-sc.exp
+++ b/gdb/testsuite/gdb.base/call-sc.exp
@@ -85,7 +85,8 @@ 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"] != "" } {
-	    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	    untested call-sc.exp
+	    return -1
 	}
     }
 
diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp
index 281ee23551..aa39864db9 100644
--- a/gdb/testsuite/gdb.base/call-strs.exp
+++ b/gdb/testsuite/gdb.base/call-strs.exp
@@ -43,7 +43,8 @@ if { [istarget "sparclet-*-*"] } {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested call-strs.exp
+    return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp
index a40845c9a9..f48b0648e6 100644
--- a/gdb/testsuite/gdb.base/callfuncs.exp
+++ b/gdb/testsuite/gdb.base/callfuncs.exp
@@ -33,7 +33,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested callfuncs.exp
+     return -1
 }
 
 # Create and source the file that provides information about the compiler
diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp
index 2640b04293..5ab734339b 100644
--- a/gdb/testsuite/gdb.base/checkpoint.exp
+++ b/gdb/testsuite/gdb.base/checkpoint.exp
@@ -40,7 +40,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested checkpoint.exp
+     return -1
 }
 
 # Start with a fresh gdb
diff --git a/gdb/testsuite/gdb.base/chng-syms.exp b/gdb/testsuite/gdb.base/chng-syms.exp
index b967d21614..b1ea43d494 100644
--- a/gdb/testsuite/gdb.base/chng-syms.exp
+++ b/gdb/testsuite/gdb.base/chng-syms.exp
@@ -40,7 +40,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DVARIABLE=var1}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested chng-syms.exp
+    return -1
 }
 
 set oldtimeout $timeout
diff --git a/gdb/testsuite/gdb.base/code-expr.exp b/gdb/testsuite/gdb.base/code-expr.exp
index 03cc4effe7..3b7df0cb29 100644
--- a/gdb/testsuite/gdb.base/code-expr.exp
+++ b/gdb/testsuite/gdb.base/code-expr.exp
@@ -37,7 +37,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested code-expr.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
index e981f81079..d3833d2536 100644
--- a/gdb/testsuite/gdb.base/commands.exp
+++ b/gdb/testsuite/gdb.base/commands.exp
@@ -32,7 +32,8 @@ set testfile "run"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/commands
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested commands.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index 23d69027b2..40102fae36 100644
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -68,15 +68,18 @@ set srcfile1 ${testfile}1.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested completion.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested completion.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested completion.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.base/cond-expr.exp b/gdb/testsuite/gdb.base/cond-expr.exp
index ad0f3cc731..63de95fabf 100644
--- a/gdb/testsuite/gdb.base/cond-expr.exp
+++ b/gdb/testsuite/gdb.base/cond-expr.exp
@@ -43,7 +43,8 @@ set testfile "int-type"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested cond-expr.exp
+     return -1
     }
 
 
diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/condbreak.exp
index 742c2e5f26..4cc4a255b0 100644
--- a/gdb/testsuite/gdb.base/condbreak.exp
+++ b/gdb/testsuite/gdb.base/condbreak.exp
@@ -39,15 +39,18 @@ set srcfile1 ${testfile}1.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested condbreak.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested condbreak.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested condbreak.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.base/consecutive.exp b/gdb/testsuite/gdb.base/consecutive.exp
index 6eeb73eeda..15d4154c65 100644
--- a/gdb/testsuite/gdb.base/consecutive.exp
+++ b/gdb/testsuite/gdb.base/consecutive.exp
@@ -36,7 +36,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested consecutive.exp
+    return -1
 }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.base/constvars.exp b/gdb/testsuite/gdb.base/constvars.exp
index 25f7434e53..4129062394 100644
--- a/gdb/testsuite/gdb.base/constvars.exp
+++ b/gdb/testsuite/gdb.base/constvars.exp
@@ -46,7 +46,8 @@ if [get_compiler_info ${binfile}] {
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug ] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested constvars.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp
index eb58ed259d..cc8cf6bf9c 100644
--- a/gdb/testsuite/gdb.base/corefile.exp
+++ b/gdb/testsuite/gdb.base/corefile.exp
@@ -36,7 +36,8 @@ set testfile "coremaker"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested corefile.exp
+     return -1
 }
 
 # Create and source the file that provides information about the compiler
diff --git a/gdb/testsuite/gdb.base/cvexpr.exp b/gdb/testsuite/gdb.base/cvexpr.exp
index 56afb9dd22..b025f13626 100644
--- a/gdb/testsuite/gdb.base/cvexpr.exp
+++ b/gdb/testsuite/gdb.base/cvexpr.exp
@@ -37,7 +37,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested cvexpr.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp
index 161333c8ea..98f448192f 100644
--- a/gdb/testsuite/gdb.base/dbx.exp
+++ b/gdb/testsuite/gdb.base/dbx.exp
@@ -32,15 +32,18 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 
 if  { [gdb_compile "${srcdir}/${subdir}/average.c" "${binfile1}.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested dbx.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/sum.c" "${binfile2}.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested dbx.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile1}.o ${binfile2}.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested dbx.exp
+     return -1
 }
 
 #
diff --git a/gdb/testsuite/gdb.base/define.exp b/gdb/testsuite/gdb.base/define.exp
index a13d886e9f..3028d94086 100644
--- a/gdb/testsuite/gdb.base/define.exp
+++ b/gdb/testsuite/gdb.base/define.exp
@@ -38,15 +38,18 @@ set srcfile1 ${testfile}1.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested define.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested define.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested define.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/detach.exp b/gdb/testsuite/gdb.base/detach.exp
index 1f86fecfca..d0d54f4d12 100644
--- a/gdb/testsuite/gdb.base/detach.exp
+++ b/gdb/testsuite/gdb.base/detach.exp
@@ -43,7 +43,8 @@ set binfile  ${objdir}/${subdir}/${testfile}
 set escapedbinfile  [string_to_regexp ${objdir}/${subdir}/${testfile}]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested detach.exp
+     return -1
 }
 
 proc do_detach_tests {} {
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
index cc99cd4101..c56760cb6d 100644
--- a/gdb/testsuite/gdb.base/display.exp
+++ b/gdb/testsuite/gdb.base/display.exp
@@ -32,7 +32,8 @@ set binfile  ${objdir}/${subdir}/${testfile}
 
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested display.exp
+    return -1
 }
 if [target_info exists gdb_stub] {
     gdb_step_for_stub;
diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp
index f8d96616aa..742828a2b8 100644
--- a/gdb/testsuite/gdb.base/dump.exp
+++ b/gdb/testsuite/gdb.base/dump.exp
@@ -46,7 +46,8 @@ if {[istarget "ia64*-*-*"] || [istarget "hppa64-*-*"]} then {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ${options}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested dump.exp
+     return -1
 }
 
 # Start with a fresh gdb.
@@ -65,7 +66,8 @@ remote_exec build "rm -f intarr1.bin intarr1b.bin intarr1.ihex intarr1.srec inta
 # Run target program until data structs are initialized.
 
 if { ! [ runto checkpoint1 ] } then {
-    gdb_suppress_entire_file "Program failed to run, so all tests in this file will automatically fail."
+    untested dump.exp
+    return -1
 }
 
 # Now generate some dump files.
@@ -276,7 +278,8 @@ gdb_load ${binfile}
 
 # Run to main.
 if { ! [ runto_main ] } then {
-    gdb_suppress_entire_file "Program failed to run, so remaining tests in this file will automatically fail."
+    untested dump.exp
+    return -1
 }
 
 if { ![string compare $array_val \
diff --git a/gdb/testsuite/gdb.base/ena-dis-br.exp b/gdb/testsuite/gdb.base/ena-dis-br.exp
index bbf8c517ab..6a73bbeb31 100644
--- a/gdb/testsuite/gdb.base/ena-dis-br.exp
+++ b/gdb/testsuite/gdb.base/ena-dis-br.exp
@@ -35,15 +35,18 @@ set srcfile1 ${testfile}1.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ena-dis-br.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ena-dis-br.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ena-dis-br.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index 1363a000ca..c2dd10ef75 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -36,7 +36,8 @@ remote_exec build "rm -f core"
 
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ending-run.exp
+     return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.base/environ.exp b/gdb/testsuite/gdb.base/environ.exp
index 5a7e0071c8..f07baeb2ce 100644
--- a/gdb/testsuite/gdb.base/environ.exp
+++ b/gdb/testsuite/gdb.base/environ.exp
@@ -42,15 +42,18 @@ set srcfile1 ${testfile}1.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested environ.exp
+    return -1
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested environ.exp
+    return -1
 }
 
 if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested environ.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/eval-skip.exp b/gdb/testsuite/gdb.base/eval-skip.exp
index 91ae6b9370..64f27d6253 100644
--- a/gdb/testsuite/gdb.base/eval-skip.exp
+++ b/gdb/testsuite/gdb.base/eval-skip.exp
@@ -45,7 +45,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested eval-skip.exp
+     return -1
     }
 
 if [get_compiler_info $binfile] {
diff --git a/gdb/testsuite/gdb.base/exprs.exp b/gdb/testsuite/gdb.base/exprs.exp
index f6ce7194a8..c5b1f1a2cd 100644
--- a/gdb/testsuite/gdb.base/exprs.exp
+++ b/gdb/testsuite/gdb.base/exprs.exp
@@ -34,7 +34,8 @@ set testfile "exprs"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested exprs.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index 01eff55a27..2193a4dbb2 100644
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -37,7 +37,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested fileio.exp
+    return -1
 }
 
 # Create and source the file that provides information about the compiler
diff --git a/gdb/testsuite/gdb.base/finish.exp b/gdb/testsuite/gdb.base/finish.exp
index 8818233339..c6ef79ab0c 100644
--- a/gdb/testsuite/gdb.base/finish.exp
+++ b/gdb/testsuite/gdb.base/finish.exp
@@ -31,7 +31,8 @@ set testfile "return2"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested finish.exp
+     return -1
 }
 
 proc finish_1 { type } {
@@ -101,7 +102,8 @@ proc finish_tests { } {
     global gdb_prompt
 
     if { ! [ runto_main ] } then {
-	gdb_suppress_entire_file "Run to main failed, so all tests in this file will automatically fail."
+	untested finish.exp
+	return -1
     }
 
     finish_void
diff --git a/gdb/testsuite/gdb.base/float.exp b/gdb/testsuite/gdb.base/float.exp
index 31f9890a9f..af6d3eee7d 100644
--- a/gdb/testsuite/gdb.base/float.exp
+++ b/gdb/testsuite/gdb.base/float.exp
@@ -34,7 +34,8 @@ set testfile "run"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested float.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/foll-exec.exp b/gdb/testsuite/gdb.base/foll-exec.exp
index 482a0df3c3..e0e1ab9022 100644
--- a/gdb/testsuite/gdb.base/foll-exec.exp
+++ b/gdb/testsuite/gdb.base/foll-exec.exp
@@ -37,11 +37,13 @@ set binfile2 ${objdir}/${subdir}/${testfile2}
 
 # build the first test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested foll-exec.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested foll-exec.exp
+     return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp
index 2ef3a4a0ad..435166ec97 100644
--- a/gdb/testsuite/gdb.base/foll-fork.exp
+++ b/gdb/testsuite/gdb.base/foll-fork.exp
@@ -33,7 +33,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested foll-fork.exp
+     return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.base/foll-vfork.exp b/gdb/testsuite/gdb.base/foll-vfork.exp
index 86a1ce9fcf..852feee8ab 100644
--- a/gdb/testsuite/gdb.base/foll-vfork.exp
+++ b/gdb/testsuite/gdb.base/foll-vfork.exp
@@ -44,11 +44,13 @@ set binfile ${objdir}/${subdir}/${testfile}
 set binfile2 ${objdir}/${subdir}/${testfile2}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested foll-vfork.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested foll-vfork.exp
+     return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.base/freebpcmd.exp b/gdb/testsuite/gdb.base/freebpcmd.exp
index 80991d80f9..b2e9d5d8e1 100644
--- a/gdb/testsuite/gdb.base/freebpcmd.exp
+++ b/gdb/testsuite/gdb.base/freebpcmd.exp
@@ -53,7 +53,8 @@ set srcfile1 ${testfile}1.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested freebpcmd.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/funcargs.exp b/gdb/testsuite/gdb.base/funcargs.exp
index f3284c01b9..601bf1bb87 100644
--- a/gdb/testsuite/gdb.base/funcargs.exp
+++ b/gdb/testsuite/gdb.base/funcargs.exp
@@ -31,7 +31,8 @@ set testfile "funcargs"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested funcargs.exp
+     return -1
 }
 
 # Create and source the file that provides information about the compiler
diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp
index 29239ef87f..e7800921cf 100644
--- a/gdb/testsuite/gdb.base/gcore.exp
+++ b/gdb/testsuite/gdb.base/gcore.exp
@@ -32,7 +32,8 @@ set srcfile  ${testfile}.c
 set binfile  ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested gcore.exp
+     return -1
 }
 
 # Start with a fresh gdb.
@@ -62,7 +63,8 @@ gdb_expect {
 }
 
 if { ! [ runto_main ] } then {
-    gdb_suppress_entire_file "Run to main failed, so all tests in this file will automatically fail."
+    untested gcore.exp
+    return -1
 }
 
 proc capture_command_output { command prefix } {
diff --git a/gdb/testsuite/gdb.base/gdb1090.exp b/gdb/testsuite/gdb.base/gdb1090.exp
index 20da3b1283..295ef0be62 100644
--- a/gdb/testsuite/gdb.base/gdb1090.exp
+++ b/gdb/testsuite/gdb.base/gdb1090.exp
@@ -34,7 +34,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested gdb1090.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/gdb1250.exp b/gdb/testsuite/gdb.base/gdb1250.exp
index 4ffdf2baff..7d2524eb51 100644
--- a/gdb/testsuite/gdb.base/gdb1250.exp
+++ b/gdb/testsuite/gdb.base/gdb1250.exp
@@ -34,7 +34,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested gdb1250.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/huge.exp b/gdb/testsuite/gdb.base/huge.exp
index 68354ec5da..ce50861f48 100644
--- a/gdb/testsuite/gdb.base/huge.exp
+++ b/gdb/testsuite/gdb.base/huge.exp
@@ -43,7 +43,8 @@ for { set size [expr 2 * 1024 * 1024] } { $size > 10 } { set size [expr $size /
       == "" } break
 }
 if { $size < 10 } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested huge.exp
+     return -1
 }
 
 # Start with a fresh gdb.
@@ -56,7 +57,8 @@ gdb_load ${binfile}
 set timeout 30
 
 if { ! [ runto_main ] } then {
-    gdb_suppress_entire_file "Run to main failed, so all tests in this file will automatically fail."
+    untested huge.exp
+    return -1
 }
 
 gdb_test "print a" ".1 = .0 .repeats \[0123456789\]+ times.." "print a very large data object"
diff --git a/gdb/testsuite/gdb.base/info-proc.exp b/gdb/testsuite/gdb.base/info-proc.exp
index cc53f7d546..15cd314c13 100644
--- a/gdb/testsuite/gdb.base/info-proc.exp
+++ b/gdb/testsuite/gdb.base/info-proc.exp
@@ -35,15 +35,18 @@ set srcfile1 ${testfile}1.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested info-proc.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested info-proc.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested info-proc.exp
+     return -1
 }
 
 # Start with a fresh gdb.
@@ -75,7 +78,8 @@ gdb_expect {
 gdb_test "info proc" "No current process.*" "info proc without a process"
 
 if { ! [ runto_main ] } then {
-    gdb_suppress_entire_file "Run to main failed, so all tests in this file will automatically fail."
+    untested info-proc.exp
+    return -1
 }
 
 gdb_test "info proc" "process ${decimal}.*" "info proc with process"
diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp
index 83e9630ef3..1d21bb7f52 100644
--- a/gdb/testsuite/gdb.base/interrupt.exp
+++ b/gdb/testsuite/gdb.base/interrupt.exp
@@ -39,7 +39,8 @@ set testfile interrupt
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested interrupt.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.base/jump.exp b/gdb/testsuite/gdb.base/jump.exp
index 6cf44aef88..a0d5ee2dcf 100644
--- a/gdb/testsuite/gdb.base/jump.exp
+++ b/gdb/testsuite/gdb.base/jump.exp
@@ -32,7 +32,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 # Build the test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested jump.exp
+     return -1
     }
 
 
diff --git a/gdb/testsuite/gdb.base/langs.exp b/gdb/testsuite/gdb.base/langs.exp
index 49b9c5d5ad..c8aa345ae4 100644
--- a/gdb/testsuite/gdb.base/langs.exp
+++ b/gdb/testsuite/gdb.base/langs.exp
@@ -34,19 +34,23 @@ if [is_remote host] {
 
 
 if  { [gdb_compile "${srcdir}/${subdir}/langs0.c" "${binfile}0.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested langs.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/langs1.c" "${binfile}1.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested langs.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/langs2.c" "${binfile}2.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested langs.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile}0.o ${binfile}1.o ${binfile}2.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested langs.exp
+     return -1
 }
 
 set oldtimeout $timeout
diff --git a/gdb/testsuite/gdb.base/lineinc.exp b/gdb/testsuite/gdb.base/lineinc.exp
index 4707ce516e..2b0c2dd0f5 100644
--- a/gdb/testsuite/gdb.base/lineinc.exp
+++ b/gdb/testsuite/gdb.base/lineinc.exp
@@ -93,7 +93,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 
 if {[gdb_compile "${srcdir}/${subdir}/${testfile}.c" ${binfile} executable {debug}] != ""} {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested lineinc.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp
index 5494c28acd..ef1385e2a1 100644
--- a/gdb/testsuite/gdb.base/list.exp
+++ b/gdb/testsuite/gdb.base/list.exp
@@ -35,15 +35,18 @@ remote_download host ${srcdir}/${subdir}/list0.h list0.h
 
 
 if  { [gdb_compile "${srcdir}/${subdir}/list0.c" "${binfile}0.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested list.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/list1.c" "${binfile}1.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested list.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile}0.o ${binfile}1.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested list.exp
+     return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.base/logical.exp b/gdb/testsuite/gdb.base/logical.exp
index 9ef42e5605..f0ee6938c4 100644
--- a/gdb/testsuite/gdb.base/logical.exp
+++ b/gdb/testsuite/gdb.base/logical.exp
@@ -37,7 +37,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested logical.exp
+    return -1
 }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp
index 7a7d9f9347..1c9fdf2da8 100644
--- a/gdb/testsuite/gdb.base/long_long.exp
+++ b/gdb/testsuite/gdb.base/long_long.exp
@@ -45,7 +45,8 @@ if {$hp_cc_compiler} {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [concat debug additional_flags=$flag nowarnings]] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested long_long.exp
+     return -1
 }
 
 # use this to debug:
diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index 283fe84457..96d695bc8a 100644
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -29,7 +29,8 @@ set testfile "macscp"
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  {[gdb_compile "${srcdir}/${subdir}/macscp1.c" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested macscp.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp
index 7bf9d0d833..cc165eca0a 100644
--- a/gdb/testsuite/gdb.base/maint.exp
+++ b/gdb/testsuite/gdb.base/maint.exp
@@ -69,15 +69,18 @@ set srcfile1 ${testfile}1.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested maint.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested maint.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested maint.exp
+     return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.base/mips_pro.exp b/gdb/testsuite/gdb.base/mips_pro.exp
index 53ea9fdee2..62cfbd5c50 100644
--- a/gdb/testsuite/gdb.base/mips_pro.exp
+++ b/gdb/testsuite/gdb.base/mips_pro.exp
@@ -39,11 +39,13 @@ if [get_compiler_info ${binfile}] {
 
 if { [test_compiler_info gcc-*-*] } then {
     if  { [gdb_compile "${srcdir}/$subdir/${srcfile}" "${binfile}" executable {debug additional_flags=-O2}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mips_pro.exp
+     return -1
     }
 } else {
     if  { [gdb_compile "${srcdir}/$subdir/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mips_pro.exp
+     return -1
     }
 }
 
diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp
index 6fe071fa7d..dc97d8cade 100644
--- a/gdb/testsuite/gdb.base/miscexprs.exp
+++ b/gdb/testsuite/gdb.base/miscexprs.exp
@@ -52,7 +52,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ${additional_flags} nowarnings]] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested miscexprs.exp
+    return -1
 }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp
index 5a706d7125..4799478498 100644
--- a/gdb/testsuite/gdb.base/multi-forks.exp
+++ b/gdb/testsuite/gdb.base/multi-forks.exp
@@ -37,7 +37,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested multi-forks.exp
+     return -1
 }
 
 # Start with a fresh gdb
diff --git a/gdb/testsuite/gdb.base/opaque.exp b/gdb/testsuite/gdb.base/opaque.exp
index 4030b4f528..7a6aa504e5 100644
--- a/gdb/testsuite/gdb.base/opaque.exp
+++ b/gdb/testsuite/gdb.base/opaque.exp
@@ -35,15 +35,18 @@ set binfile ${objdir}/${subdir}/opaque
 #}
 
 if  { [gdb_compile "${srcdir}/${subdir}/opaque0.c" "${binfile}0.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested opaque.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/opaque1.c" "${binfile}1.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested opaque.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile}0.o ${binfile}1.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested opaque.exp
+     return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.base/overlays.exp b/gdb/testsuite/gdb.base/overlays.exp
index 671eab5cfd..2fba0e7b60 100644
--- a/gdb/testsuite/gdb.base/overlays.exp
+++ b/gdb/testsuite/gdb.base/overlays.exp
@@ -49,26 +49,33 @@ set binfile ${objdir}/${subdir}/${testfile}
 set srcfile ${testfile}.c
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${testfile}.o" object {debug}] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested overlays.exp
+     return -1
 }
 if {[gdb_compile "${srcdir}/${subdir}/ovlymgr.c" ovlymgr.o object {debug}] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested overlays.exp
+     return -1
 }
 if {[gdb_compile "${srcdir}/${subdir}/foo.c" foo.o object {debug} ] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested overlays.exp
+     return -1
 }
 
 if {[gdb_compile "${srcdir}/${subdir}/bar.c" bar.o object {debug}] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested overlays.exp
+     return -1
 }
 if {[gdb_compile "${srcdir}/${subdir}/baz.c" baz.o object {debug}] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested overlays.exp
+     return -1
 }
 if {[gdb_compile "${srcdir}/${subdir}/grbx.c" grbx.o object {debug}] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested overlays.exp
+     return -1
 }
 if  {[gdb_compile "${testfile}.o ovlymgr.o foo.o bar.o baz.o grbx.o" ${binfile} executable "ldscript=-Wl,-T$linker_script"] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested overlays.exp
+     return -1
 }
 
 remote_exec build "mv ${testfile}.o foo.o bar.o baz.o grbx.o ovlymgr.o ${objdir}/${subdir}"
diff --git a/gdb/testsuite/gdb.base/pc-fp.exp b/gdb/testsuite/gdb.base/pc-fp.exp
index f4c3cfc1f5..83ec4d93f0 100644
--- a/gdb/testsuite/gdb.base/pc-fp.exp
+++ b/gdb/testsuite/gdb.base/pc-fp.exp
@@ -39,7 +39,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested pc-fp.exp
+    return -1
 }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.base/pointers.exp b/gdb/testsuite/gdb.base/pointers.exp
index b33590f904..becf09989b 100644
--- a/gdb/testsuite/gdb.base/pointers.exp
+++ b/gdb/testsuite/gdb.base/pointers.exp
@@ -40,7 +40,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested pointers.exp
+     return -1
     }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp
index e532d71de0..4a710aad6d 100644
--- a/gdb/testsuite/gdb.base/printcmds.exp
+++ b/gdb/testsuite/gdb.base/printcmds.exp
@@ -33,7 +33,8 @@ set testfile "printcmds"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested printcmds.exp
+     return -1
 }
 
 # Set the current language to C.  This counts as a test.  If it
diff --git a/gdb/testsuite/gdb.base/psymtab.exp b/gdb/testsuite/gdb.base/psymtab.exp
index 8c2abffa34..da51ebb200 100644
--- a/gdb/testsuite/gdb.base/psymtab.exp
+++ b/gdb/testsuite/gdb.base/psymtab.exp
@@ -40,15 +40,18 @@ set testfile "psymtab"
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${testfile}1.c" "${testfile}1.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested psymtab.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${testfile}2.c" "${testfile}2.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested psymtab.exp
+     return -1
 }
 
 if  { [gdb_compile "${testfile}1.o ${testfile}2.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested psymtab.exp
+     return -1
 }
 
 # Create and source the file that provides information about the compiler
diff --git a/gdb/testsuite/gdb.base/ptype.exp b/gdb/testsuite/gdb.base/ptype.exp
index 851d6b7b77..2f61ee8e3c 100644
--- a/gdb/testsuite/gdb.base/ptype.exp
+++ b/gdb/testsuite/gdb.base/ptype.exp
@@ -36,13 +36,16 @@ set srcfile1 ${testfile}1.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile0}" "${binfile}0.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ptype.exp
+     return -1
 }
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ptype.exp
+     return -1
 }
 if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ptype.exp
+     return -1
 }
 
 # Create and source the file that provides information about the compiler
diff --git a/gdb/testsuite/gdb.base/recurse.exp b/gdb/testsuite/gdb.base/recurse.exp
index bd1ecee60d..3a8f05275d 100644
--- a/gdb/testsuite/gdb.base/recurse.exp
+++ b/gdb/testsuite/gdb.base/recurse.exp
@@ -31,7 +31,8 @@ set testfile "recurse"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested recurse.exp
+     return -1
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.base/relational.exp b/gdb/testsuite/gdb.base/relational.exp
index 32ff8e014f..ad55c351d3 100644
--- a/gdb/testsuite/gdb.base/relational.exp
+++ b/gdb/testsuite/gdb.base/relational.exp
@@ -39,7 +39,8 @@ set testfile "int-type"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested relational.exp
+     return -1
     }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.base/relocate.exp b/gdb/testsuite/gdb.base/relocate.exp
index 320a9c15b5..edc921e15f 100644
--- a/gdb/testsuite/gdb.base/relocate.exp
+++ b/gdb/testsuite/gdb.base/relocate.exp
@@ -30,7 +30,8 @@ set binfile ${objdir}/${subdir}/${testfile}.o
 
 remote_exec build "rm -f ${binfile}"
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested relocate.exp
+     return -1
 }
 
 proc get_var_address { var } {
diff --git a/gdb/testsuite/gdb.base/remote.exp b/gdb/testsuite/gdb.base/remote.exp
index 1c37017147..bbc426a043 100644
--- a/gdb/testsuite/gdb.base/remote.exp
+++ b/gdb/testsuite/gdb.base/remote.exp
@@ -38,7 +38,8 @@ gdb_start
 
 set result [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}]
 if {$result != "" } then {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested remote.exp
+    return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.base/reread.exp b/gdb/testsuite/gdb.base/reread.exp
index 2d1167e4dd..9fb23aeaec 100644
--- a/gdb/testsuite/gdb.base/reread.exp
+++ b/gdb/testsuite/gdb.base/reread.exp
@@ -34,7 +34,8 @@ set srcfile1 ${testfile1}.c
 set binfile1 ${objdir}/${subdir}/${testfile1}$EXEEXT
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile1}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested reread.exp
+    return -1
 }
 
 # build the second test case
@@ -44,7 +45,8 @@ set srcfile2 ${testfile2}.c
 set binfile2 ${objdir}/${subdir}/${testfile2}$EXEEXT
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested reread.exp
+    return -1
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.base/restore.exp b/gdb/testsuite/gdb.base/restore.exp
index 1ee71d631d..83c251707f 100644
--- a/gdb/testsuite/gdb.base/restore.exp
+++ b/gdb/testsuite/gdb.base/restore.exp
@@ -34,7 +34,8 @@ set testfile "restore"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested restore.exp
+    return -1
 }
 
 proc restore_tests { } {
diff --git a/gdb/testsuite/gdb.base/return.exp b/gdb/testsuite/gdb.base/return.exp
index 2f8946d302..afc72f2b34 100644
--- a/gdb/testsuite/gdb.base/return.exp
+++ b/gdb/testsuite/gdb.base/return.exp
@@ -30,7 +30,8 @@ set testfile "return"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested return.exp
+     return -1
 }
 
 proc return_tests { } {
diff --git a/gdb/testsuite/gdb.base/return2.exp b/gdb/testsuite/gdb.base/return2.exp
index 050ccf9fa7..b32c486934 100644
--- a/gdb/testsuite/gdb.base/return2.exp
+++ b/gdb/testsuite/gdb.base/return2.exp
@@ -30,7 +30,8 @@ set testfile "return2"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested return2.exp
+     return -1
 }
 
 proc return_1 { type } {
@@ -101,7 +102,8 @@ proc return2_tests { } {
     global gdb_prompt
 
     if { ! [ runto_main ] } then {
-	gdb_suppress_entire_file "Run to main failed, so all tests in this file will automatically fail."
+	untested return2.exp
+	return -1
     }
 
     return_void
diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp
index a9f8deaf09..258edf99d2 100644
--- a/gdb/testsuite/gdb.base/scope.exp
+++ b/gdb/testsuite/gdb.base/scope.exp
@@ -32,15 +32,18 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 
 if  { [gdb_compile "${srcdir}/${subdir}/scope0.c" "${binfile}0.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested scope.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/scope1.c" "${binfile}1.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested scope.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile}0.o ${binfile}1.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested scope.exp
+     return -1
 }
 
 # Create and source the file that provides information about the compiler
diff --git a/gdb/testsuite/gdb.base/sect-cmd.exp b/gdb/testsuite/gdb.base/sect-cmd.exp
index 01be44b6fb..439fba5ac4 100644
--- a/gdb/testsuite/gdb.base/sect-cmd.exp
+++ b/gdb/testsuite/gdb.base/sect-cmd.exp
@@ -44,15 +44,18 @@ set srcfile1 ${testfile}1.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested sect-cmd.exp
+    return -1
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested sect-cmd.exp
+    return -1
 }
 
 if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested sect-cmd.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/sep.exp b/gdb/testsuite/gdb.base/sep.exp
index 7699ea27e9..3a167d9c26 100644
--- a/gdb/testsuite/gdb.base/sep.exp
+++ b/gdb/testsuite/gdb.base/sep.exp
@@ -26,7 +26,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested sep.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp
index 2a38fad17d..5bc00c5453 100644
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ b/gdb/testsuite/gdb.base/sepdebug.exp
@@ -43,7 +43,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested sepdebug.exp
+    return -1
 }
 
 # FIXME: this is nasty. We need to check for the stabs debug format.
diff --git a/gdb/testsuite/gdb.base/setshow.exp b/gdb/testsuite/gdb.base/setshow.exp
index a406824eeb..b861f127b4 100644
--- a/gdb/testsuite/gdb.base/setshow.exp
+++ b/gdb/testsuite/gdb.base/setshow.exp
@@ -31,7 +31,8 @@ set testfile "setshow"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested setshow.exp
+     return -1
 }
 
 # Start with a fresh gdb
diff --git a/gdb/testsuite/gdb.base/setvar.exp b/gdb/testsuite/gdb.base/setvar.exp
index c101f9c4ce..a88f8c68e4 100644
--- a/gdb/testsuite/gdb.base/setvar.exp
+++ b/gdb/testsuite/gdb.base/setvar.exp
@@ -36,7 +36,8 @@ set testfile "setvar"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested setvar.exp
+     return -1
 }
 
 # Create and source the file that provides information about the compiler
diff --git a/gdb/testsuite/gdb.base/sigall.exp b/gdb/testsuite/gdb.base/sigall.exp
index f452f0c6ef..349950534c 100644
--- a/gdb/testsuite/gdb.base/sigall.exp
+++ b/gdb/testsuite/gdb.base/sigall.exp
@@ -34,7 +34,8 @@ set testfile sigall
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested sigall.exp
+     return -1
 }
 
 # Make the first signal SIGABRT because it is always supported.
diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp
index 0e69e3989e..cb45f3093d 100644
--- a/gdb/testsuite/gdb.base/sigbpt.exp
+++ b/gdb/testsuite/gdb.base/sigbpt.exp
@@ -45,7 +45,8 @@ set testfile "sigbpt"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested sigbpt.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/signals.exp
index cbe00bf3b1..4965a11dea 100644
--- a/gdb/testsuite/gdb.base/signals.exp
+++ b/gdb/testsuite/gdb.base/signals.exp
@@ -30,7 +30,8 @@ set testfile signals
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested signals.exp
+    return -1
 }
 
 # Create and source the file that provides information about the compiler
diff --git a/gdb/testsuite/gdb.base/signull.exp b/gdb/testsuite/gdb.base/signull.exp
index e6a5976478..e18560064d 100644
--- a/gdb/testsuite/gdb.base/signull.exp
+++ b/gdb/testsuite/gdb.base/signull.exp
@@ -44,7 +44,8 @@ set testfile "signull"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested signull.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/sizeof.exp b/gdb/testsuite/gdb.base/sizeof.exp
index 9329134241..80ca850ddc 100644
--- a/gdb/testsuite/gdb.base/sizeof.exp
+++ b/gdb/testsuite/gdb.base/sizeof.exp
@@ -35,7 +35,8 @@ set testfile "sizeof"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested sizeof.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.base/solib.exp b/gdb/testsuite/gdb.base/solib.exp
index 3ce0edb718..4da48a057c 100644
--- a/gdb/testsuite/gdb.base/solib.exp
+++ b/gdb/testsuite/gdb.base/solib.exp
@@ -45,7 +45,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 # build the first test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested solib.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile}] {
@@ -105,7 +106,8 @@ if { [istarget "hppa*-*-hpux*"] } {
 if { [istarget "hppa*-*-hpux*"] } {
     set additional_flags "-Wl,-u,main"
     if { [gdb_compile "${binfile}_sl.sl" "${binfile}_sl" executable [list debug $additional_flags]] != "" } {
-        gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+        untested solib.exp
+        return -1
     }
 } else {
     # FIXME: need to fill this part in for non-HP build
diff --git a/gdb/testsuite/gdb.base/step-line.exp b/gdb/testsuite/gdb.base/step-line.exp
index 9754fddcee..3ebbaecaac 100644
--- a/gdb/testsuite/gdb.base/step-line.exp
+++ b/gdb/testsuite/gdb.base/step-line.exp
@@ -33,7 +33,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 remote_exec build "rm -f ${binfile}"
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested step-line.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/step-test.exp b/gdb/testsuite/gdb.base/step-test.exp
index 1878298a6d..70c4d0db31 100644
--- a/gdb/testsuite/gdb.base/step-test.exp
+++ b/gdb/testsuite/gdb.base/step-test.exp
@@ -28,7 +28,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 remote_exec build "rm -f ${binfile}"
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested step-test.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp
index 7db660ee21..f634622acf 100644
--- a/gdb/testsuite/gdb.base/structs.exp
+++ b/gdb/testsuite/gdb.base/structs.exp
@@ -76,7 +76,8 @@ proc start_structs_test { types } {
 	# 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"] != "" } {
-	    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	    untested structs.exp
+	    return -1
 	}
     }
 
diff --git a/gdb/testsuite/gdb.base/structs2.exp b/gdb/testsuite/gdb.base/structs2.exp
index 7f96a220f4..ad189110c5 100644
--- a/gdb/testsuite/gdb.base/structs2.exp
+++ b/gdb/testsuite/gdb.base/structs2.exp
@@ -40,7 +40,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     # 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 {debug additional_flags=-DNO_PROTOTYPES}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	untested structs2.exp
+	return -1
     }
     set prototypes 0
 }
diff --git a/gdb/testsuite/gdb.base/term.exp b/gdb/testsuite/gdb.base/term.exp
index 1a64531129..0fd1cc0ab2 100644
--- a/gdb/testsuite/gdb.base/term.exp
+++ b/gdb/testsuite/gdb.base/term.exp
@@ -41,7 +41,8 @@ set testfile "run"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested term.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/twice.exp b/gdb/testsuite/gdb.base/twice.exp
index 7a86701cb6..9830f54f92 100644
--- a/gdb/testsuite/gdb.base/twice.exp
+++ b/gdb/testsuite/gdb.base/twice.exp
@@ -37,7 +37,8 @@ close $fileid;
 remote_download host ${srcdir}/${subdir}/twice.c twice.c
 
 if  { [gdb_compile "${objdir}/${subdir}/${srcfile}" "${binfile}" executable $options] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested twice.exp
+     return -1
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.base/until.exp b/gdb/testsuite/gdb.base/until.exp
index a3a80f2890..a4c81fa886 100644
--- a/gdb/testsuite/gdb.base/until.exp
+++ b/gdb/testsuite/gdb.base/until.exp
@@ -29,15 +29,18 @@ set srcfile1 ${testfile}1.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested until.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested until.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested until.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/varargs.exp b/gdb/testsuite/gdb.base/varargs.exp
index 22fa84a3c5..c309e40949 100644
--- a/gdb/testsuite/gdb.base/varargs.exp
+++ b/gdb/testsuite/gdb.base/varargs.exp
@@ -56,7 +56,8 @@ if {$hp_cc_compiler} {
 
 # build the first test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug ${additional_flags}}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested varargs.exp
+     return -1
 }
 
 # Start with a fresh gdb.
diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp
index b6623f8ce9..325621a8e9 100644
--- a/gdb/testsuite/gdb.base/volatile.exp
+++ b/gdb/testsuite/gdb.base/volatile.exp
@@ -53,7 +53,8 @@ if [get_compiler_info ${binfile}] {
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug ] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested volatile.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index a69271b0af..19b878b65c 100644
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -38,7 +38,8 @@ if [get_compiler_info ${binfile}] {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested watchpoint.exp
+     return -1
 }
 
 # Prepare for watchpoint tests by setting up two breakpoints and one
diff --git a/gdb/testsuite/gdb.base/whatis-exp.exp b/gdb/testsuite/gdb.base/whatis-exp.exp
index f4a1966e1d..44eb2aeca7 100644
--- a/gdb/testsuite/gdb.base/whatis-exp.exp
+++ b/gdb/testsuite/gdb.base/whatis-exp.exp
@@ -43,7 +43,8 @@ set testfile "int-type"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested whatis-exp.exp
+     return -1
     }
 
 
diff --git a/gdb/testsuite/gdb.base/whatis.exp b/gdb/testsuite/gdb.base/whatis.exp
index fdc86f98d4..5972501518 100644
--- a/gdb/testsuite/gdb.base/whatis.exp
+++ b/gdb/testsuite/gdb.base/whatis.exp
@@ -31,7 +31,8 @@ set testfile whatis
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested whatis.exp
+     return -1
 }
 
 # Create and source the file that provides information about the compiler
diff --git a/gdb/testsuite/gdb.cp/ambiguous.exp b/gdb/testsuite/gdb.cp/ambiguous.exp
index f54e96458d..1f9fd14f3c 100644
--- a/gdb/testsuite/gdb.cp/ambiguous.exp
+++ b/gdb/testsuite/gdb.cp/ambiguous.exp
@@ -45,7 +45,8 @@ if [get_compiler_info ${binfile} "c++"] {
 if { [test_compiler_info gcc-*] } then { continue }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ambiguous.exp
+     return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp
index 1a4f5d30bd..9460f3ef09 100644
--- a/gdb/testsuite/gdb.cp/annota2.exp
+++ b/gdb/testsuite/gdb.cp/annota2.exp
@@ -35,7 +35,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++ nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested annota2.exp
+    return -1
 }
 
 # are we on a target board? If so, don't run these tests.
diff --git a/gdb/testsuite/gdb.cp/annota3.exp b/gdb/testsuite/gdb.cp/annota3.exp
index 87db9e3a73..3121281215 100644
--- a/gdb/testsuite/gdb.cp/annota3.exp
+++ b/gdb/testsuite/gdb.cp/annota3.exp
@@ -34,7 +34,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++ nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested annota3.exp
+    return -1
 }
 
 # are we on a target board? If so, don't run these tests.
diff --git a/gdb/testsuite/gdb.cp/bool.exp b/gdb/testsuite/gdb.cp/bool.exp
index c6e7b64ac6..3074f5382c 100644
--- a/gdb/testsuite/gdb.cp/bool.exp
+++ b/gdb/testsuite/gdb.cp/bool.exp
@@ -35,7 +35,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested bool.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.cp/breakpoint.exp b/gdb/testsuite/gdb.cp/breakpoint.exp
index c85f80541e..3c2a292243 100644
--- a/gdb/testsuite/gdb.cp/breakpoint.exp
+++ b/gdb/testsuite/gdb.cp/breakpoint.exp
@@ -35,7 +35,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested breakpoint.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile} "c++"] {
diff --git a/gdb/testsuite/gdb.cp/casts.exp b/gdb/testsuite/gdb.cp/casts.exp
index 3aaf37cbff..705b831331 100644
--- a/gdb/testsuite/gdb.cp/casts.exp
+++ b/gdb/testsuite/gdb.cp/casts.exp
@@ -43,7 +43,8 @@ if [get_compiler_info ${binfile} "c++"] {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested casts.exp
+     return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.cp/class2.exp b/gdb/testsuite/gdb.cp/class2.exp
index e3f63b08ea..1d2047291d 100644
--- a/gdb/testsuite/gdb.cp/class2.exp
+++ b/gdb/testsuite/gdb.cp/class2.exp
@@ -34,7 +34,8 @@ if [get_compiler_info ${binfile} "c++"] {
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested class2.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.cp/classes.exp b/gdb/testsuite/gdb.cp/classes.exp
index 397a14920f..e072667c03 100644
--- a/gdb/testsuite/gdb.cp/classes.exp
+++ b/gdb/testsuite/gdb.cp/classes.exp
@@ -33,7 +33,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested classes.exp
+     return -1
 }
 
 # Test ptype of class objects.
diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp
index a509afb54e..2b08db0151 100644
--- a/gdb/testsuite/gdb.cp/cplusfuncs.exp
+++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp
@@ -33,7 +33,8 @@ if { [get_compiler_info $binfile "c++"] } {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested cplusfuncs.exp
+     return -1
 }
 
 #
diff --git a/gdb/testsuite/gdb.cp/ctti.exp b/gdb/testsuite/gdb.cp/ctti.exp
index de1ee3496d..5d1a9f3140 100644
--- a/gdb/testsuite/gdb.cp/ctti.exp
+++ b/gdb/testsuite/gdb.cp/ctti.exp
@@ -40,23 +40,28 @@ set objfile3 "${testfile}3.o"
 set binfile  "${objdir}/${subdir}/${testfile}"
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" "$objdir/$subdir/$objfile" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ctti.exp
+     return -1
 }
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile1" "$objdir/$subdir/$objfile1" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ctti.exp
+     return -1
 }
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile2" "$objdir/$subdir/$objfile2" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ctti.exp
+     return -1
 }
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile3" "$objdir/$subdir/$objfile3" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ctti.exp
+     return -1
 }
 
 if { [gdb_compile "$objdir/$subdir/$objfile $objdir/$subdir/$objfile1 $objdir/$subdir/$objfile2 $objdir/$subdir/$objfile3" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ctti.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile} "c++"] {
diff --git a/gdb/testsuite/gdb.cp/derivation.exp b/gdb/testsuite/gdb.cp/derivation.exp
index 6c98d3ce5a..14f9f633e5 100644
--- a/gdb/testsuite/gdb.cp/derivation.exp
+++ b/gdb/testsuite/gdb.cp/derivation.exp
@@ -45,7 +45,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested derivation.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.cp/exception.exp b/gdb/testsuite/gdb.cp/exception.exp
index 9cfaa40687..655d39037e 100644
--- a/gdb/testsuite/gdb.cp/exception.exp
+++ b/gdb/testsuite/gdb.cp/exception.exp
@@ -49,7 +49,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
  
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested exception.exp
+     return -1
 }
 
 # Start with a fresh gdb
diff --git a/gdb/testsuite/gdb.cp/gdb1355.exp b/gdb/testsuite/gdb.cp/gdb1355.exp
index 11f16d5b63..83427bd64f 100644
--- a/gdb/testsuite/gdb.cp/gdb1355.exp
+++ b/gdb/testsuite/gdb.cp/gdb1355.exp
@@ -39,7 +39,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested gdb1355.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile} "c++"] {
diff --git a/gdb/testsuite/gdb.cp/hang.exp b/gdb/testsuite/gdb.cp/hang.exp
index 23088741fb..3c1edd7410 100644
--- a/gdb/testsuite/gdb.cp/hang.exp
+++ b/gdb/testsuite/gdb.cp/hang.exp
@@ -28,12 +28,14 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 foreach file {hang1 hang2 hang3} {
     if {[gdb_compile "${srcdir}/${subdir}/${file}.C" "${file}.o" object {c++ debug}] != ""} {
-        gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+        untested hang.exp
+        return -1
     }
 }
 
 if {[gdb_compile "hang1.o hang2.o hang3.o" ${binfile} executable {c++ debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested hang.exp
+     return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.cp/inherit.exp b/gdb/testsuite/gdb.cp/inherit.exp
index e90c0c68e1..47a08ae3c2 100644
--- a/gdb/testsuite/gdb.cp/inherit.exp
+++ b/gdb/testsuite/gdb.cp/inherit.exp
@@ -35,7 +35,8 @@ set srcfile misc.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested inherit.exp
+     return -1
 }
 
 # Single inheritance, print type definitions.
diff --git a/gdb/testsuite/gdb.cp/local.exp b/gdb/testsuite/gdb.cp/local.exp
index 6bae99ff29..be72e380f4 100644
--- a/gdb/testsuite/gdb.cp/local.exp
+++ b/gdb/testsuite/gdb.cp/local.exp
@@ -42,7 +42,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested local.exp
+     return -1
 }
 
 if [get_compiler_info $binfile "c++"] {
diff --git a/gdb/testsuite/gdb.cp/m-data.exp b/gdb/testsuite/gdb.cp/m-data.exp
index 85adb5e520..08f9f7ecc5 100644
--- a/gdb/testsuite/gdb.cp/m-data.exp
+++ b/gdb/testsuite/gdb.cp/m-data.exp
@@ -36,7 +36,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested m-data.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile} "c++"] {
diff --git a/gdb/testsuite/gdb.cp/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp
index 7963a10168..02851205ff 100644
--- a/gdb/testsuite/gdb.cp/m-static.exp
+++ b/gdb/testsuite/gdb.cp/m-static.exp
@@ -40,15 +40,18 @@ set objfile1 "${testfile}1.o"
 set binfile  "${objdir}/${subdir}/${testfile}"
 
 if  { [gdb_compile "$srcdir/$subdir/$srcfile" "$objdir/$subdir/$objfile" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested m-static.exp
+     return -1
 }
 
 if  { [gdb_compile "$srcdir/$subdir/$srcfile1" "$objdir/$subdir/$objfile1" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested m-static.exp
+     return -1
 }
 
 if { [gdb_compile "$objdir/$subdir/$objfile $objdir/$subdir/$objfile1" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested m-static.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.cp/member-ptr.exp b/gdb/testsuite/gdb.cp/member-ptr.exp
index f6a9d4039b..ee1d1abe27 100644
--- a/gdb/testsuite/gdb.cp/member-ptr.exp
+++ b/gdb/testsuite/gdb.cp/member-ptr.exp
@@ -42,7 +42,8 @@ if [get_compiler_info ${binfile} "c++"] {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested member-ptr.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.cp/method.exp b/gdb/testsuite/gdb.cp/method.exp
index 87666d833a..c92badaafa 100644
--- a/gdb/testsuite/gdb.cp/method.exp
+++ b/gdb/testsuite/gdb.cp/method.exp
@@ -46,7 +46,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested method.exp
+     return -1
 }
 
 if [get_compiler_info $binfile "c++"] {
diff --git a/gdb/testsuite/gdb.cp/misc.exp b/gdb/testsuite/gdb.cp/misc.exp
index 2758cd0ae6..31c7b48528 100644
--- a/gdb/testsuite/gdb.cp/misc.exp
+++ b/gdb/testsuite/gdb.cp/misc.exp
@@ -27,7 +27,8 @@ set testfile "misc"
 set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested misc.exp
+     return -1
 }
 
 #
diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp
index 4d29589498..66dd9a0100 100644
--- a/gdb/testsuite/gdb.cp/namespace.exp
+++ b/gdb/testsuite/gdb.cp/namespace.exp
@@ -47,15 +47,18 @@ if [get_compiler_info ${binfile} c++] {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested namespace.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${objfile1}" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested namespace.exp
+     return -1
 }
 
 if  { [gdb_compile "${objfile} ${objfile1}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested namespace.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.cp/overload.exp b/gdb/testsuite/gdb.cp/overload.exp
index b09c58e385..9899569a8d 100644
--- a/gdb/testsuite/gdb.cp/overload.exp
+++ b/gdb/testsuite/gdb.cp/overload.exp
@@ -39,7 +39,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested overload.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.cp/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovldbreak.exp
index fefe7812fe..d45f029e75 100644
--- a/gdb/testsuite/gdb.cp/ovldbreak.exp
+++ b/gdb/testsuite/gdb.cp/ovldbreak.exp
@@ -41,7 +41,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ovldbreak.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.cp/pr-1023.exp b/gdb/testsuite/gdb.cp/pr-1023.exp
index c8c9802747..0bd3aac1c5 100644
--- a/gdb/testsuite/gdb.cp/pr-1023.exp
+++ b/gdb/testsuite/gdb.cp/pr-1023.exp
@@ -36,7 +36,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested pr-1023.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile} "c++"] {
diff --git a/gdb/testsuite/gdb.cp/pr-1210.exp b/gdb/testsuite/gdb.cp/pr-1210.exp
index 3ff850d121..08d91bbf76 100644
--- a/gdb/testsuite/gdb.cp/pr-1210.exp
+++ b/gdb/testsuite/gdb.cp/pr-1210.exp
@@ -35,7 +35,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested pr-1210.exp
+    return -1
 }
 
 if [get_compiler_info ${binfile} "c++"] {
diff --git a/gdb/testsuite/gdb.cp/pr-574.exp b/gdb/testsuite/gdb.cp/pr-574.exp
index 5beacd10fe..f1efb78e5f 100644
--- a/gdb/testsuite/gdb.cp/pr-574.exp
+++ b/gdb/testsuite/gdb.cp/pr-574.exp
@@ -38,7 +38,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested pr-574.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile} "c++"] {
diff --git a/gdb/testsuite/gdb.cp/printmethod.exp b/gdb/testsuite/gdb.cp/printmethod.exp
index 67372cd093..8c7a9c0e8e 100644
--- a/gdb/testsuite/gdb.cp/printmethod.exp
+++ b/gdb/testsuite/gdb.cp/printmethod.exp
@@ -37,7 +37,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested printmethod.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile} "c++"] {
diff --git a/gdb/testsuite/gdb.cp/psmang.exp b/gdb/testsuite/gdb.cp/psmang.exp
index b13737956c..6784154644 100644
--- a/gdb/testsuite/gdb.cp/psmang.exp
+++ b/gdb/testsuite/gdb.cp/psmang.exp
@@ -193,15 +193,18 @@ if [get_compiler_info ${binfile} "c++"] {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${testfile}1.cc" "${testfile}1.o" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested psmang.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${testfile}2.cc" "${testfile}2.o" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested psmang.exp
+     return -1
 }
 
 if  { [gdb_compile "${testfile}1.o ${testfile}2.o" ${binfile} executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested psmang.exp
+     return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.cp/ref-params.exp b/gdb/testsuite/gdb.cp/ref-params.exp
index 8ad0198ddb..8a8eb9071d 100644
--- a/gdb/testsuite/gdb.cp/ref-params.exp
+++ b/gdb/testsuite/gdb.cp/ref-params.exp
@@ -34,7 +34,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ref-params.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.cp/ref-types.exp b/gdb/testsuite/gdb.cp/ref-types.exp
index 764ba8b6b7..ec52260e87 100644
--- a/gdb/testsuite/gdb.cp/ref-types.exp
+++ b/gdb/testsuite/gdb.cp/ref-types.exp
@@ -34,7 +34,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested ref-types.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.cp/rtti.exp b/gdb/testsuite/gdb.cp/rtti.exp
index 991836d307..1a9e73ea7c 100644
--- a/gdb/testsuite/gdb.cp/rtti.exp
+++ b/gdb/testsuite/gdb.cp/rtti.exp
@@ -47,15 +47,18 @@ set objfile2 "${testfile}2.o"
 set binfile  "${objdir}/${subdir}/${testfile}"
 
 if  { [gdb_compile "$srcdir/$subdir/$srcfile1" "$objdir/$subdir/$objfile1" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested rtti.exp
+     return -1
 }
 
 if  { [gdb_compile "$srcdir/$subdir/$srcfile2" "$objdir/$subdir/$objfile2" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested rtti.exp
+     return -1
 }
 
 if  { [gdb_compile "$objdir/$subdir/$objfile1 $objdir/$subdir/$objfile2" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested rtti.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile} "c++"] {
diff --git a/gdb/testsuite/gdb.cp/templates.exp b/gdb/testsuite/gdb.cp/templates.exp
index 15e9a58f94..0a616786e3 100644
--- a/gdb/testsuite/gdb.cp/templates.exp
+++ b/gdb/testsuite/gdb.cp/templates.exp
@@ -36,7 +36,8 @@ if [get_compiler_info ${binfile} "c++"] {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested templates.exp
+     return -1
 }
 
 #
diff --git a/gdb/testsuite/gdb.cp/try_catch.exp b/gdb/testsuite/gdb.cp/try_catch.exp
index 1473e20c5f..46a0ef4dfb 100644
--- a/gdb/testsuite/gdb.cp/try_catch.exp
+++ b/gdb/testsuite/gdb.cp/try_catch.exp
@@ -36,7 +36,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested try_catch.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile} "c++"] {
diff --git a/gdb/testsuite/gdb.cp/userdef.exp b/gdb/testsuite/gdb.cp/userdef.exp
index 6a8cb046d8..782045ee1b 100644
--- a/gdb/testsuite/gdb.cp/userdef.exp
+++ b/gdb/testsuite/gdb.cp/userdef.exp
@@ -32,7 +32,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested userdef.exp
+     return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.cp/virtfunc.exp b/gdb/testsuite/gdb.cp/virtfunc.exp
index 0a0291d249..2da0763812 100644
--- a/gdb/testsuite/gdb.cp/virtfunc.exp
+++ b/gdb/testsuite/gdb.cp/virtfunc.exp
@@ -33,7 +33,8 @@ set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {c++ debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested virtfunc.exp
+     return -1
 }
 
 proc test_ptype_of_classes {} {
diff --git a/gdb/testsuite/gdb.disasm/am33.exp b/gdb/testsuite/gdb.disasm/am33.exp
index c020fac88f..dada3ce7b5 100644
--- a/gdb/testsuite/gdb.disasm/am33.exp
+++ b/gdb/testsuite/gdb.disasm/am33.exp
@@ -37,7 +37,8 @@ set testfile "am33"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" object ""] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested am33.exp
+     return -1
 }
 
 proc call_tests { } {
diff --git a/gdb/testsuite/gdb.disasm/h8300s.exp b/gdb/testsuite/gdb.disasm/h8300s.exp
index dff165c266..192ac12418 100644
--- a/gdb/testsuite/gdb.disasm/h8300s.exp
+++ b/gdb/testsuite/gdb.disasm/h8300s.exp
@@ -35,7 +35,8 @@ set testfile "h8300s"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable {debug additional_flags=-ms}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested h8300s.exp
+     return -1
 }
 
 proc all_set_machine_h8300s { } {
diff --git a/gdb/testsuite/gdb.disasm/mn10300.exp b/gdb/testsuite/gdb.disasm/mn10300.exp
index 0f12226205..31e30a030b 100644
--- a/gdb/testsuite/gdb.disasm/mn10300.exp
+++ b/gdb/testsuite/gdb.disasm/mn10300.exp
@@ -37,7 +37,8 @@ set testfile "mn10300"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable ""] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mn10300.exp
+     return -1
 }
 
 proc add_tests { } {
diff --git a/gdb/testsuite/gdb.disasm/sh3.exp b/gdb/testsuite/gdb.disasm/sh3.exp
index 6c82f9151f..9efc984f14 100644
--- a/gdb/testsuite/gdb.disasm/sh3.exp
+++ b/gdb/testsuite/gdb.disasm/sh3.exp
@@ -35,7 +35,8 @@ set testfile "sh3"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable ""] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested sh3.exp
+     return -1
 }
 
 proc all_fp_move_and_load_tests { } {
diff --git a/gdb/testsuite/gdb.disasm/t01_mov.exp b/gdb/testsuite/gdb.disasm/t01_mov.exp
index 50910e9a09..5d90adbb77 100644
--- a/gdb/testsuite/gdb.disasm/t01_mov.exp
+++ b/gdb/testsuite/gdb.disasm/t01_mov.exp
@@ -41,11 +41,13 @@ set link-flags "-m h8300sxelf";
 
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
+     untested t01_mov.exp
+     return -1
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
+     untested t01_mov.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t02_mova.exp b/gdb/testsuite/gdb.disasm/t02_mova.exp
index 899bbfdbe3..8f17803b16 100644
--- a/gdb/testsuite/gdb.disasm/t02_mova.exp
+++ b/gdb/testsuite/gdb.disasm/t02_mova.exp
@@ -41,11 +41,13 @@ set link-flags "-m h8300sxelf";
 
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
+     untested t02_mova.exp
+     return -1
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
+     untested t02_mova.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t03_add.exp b/gdb/testsuite/gdb.disasm/t03_add.exp
index 5128fb92d4..525b9e5427 100644
--- a/gdb/testsuite/gdb.disasm/t03_add.exp
+++ b/gdb/testsuite/gdb.disasm/t03_add.exp
@@ -41,11 +41,13 @@ set link-flags "-m h8300sxelf";
 
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
+     untested t03_add.exp
+     return -1
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
+     untested t03_add.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t04_sub.exp b/gdb/testsuite/gdb.disasm/t04_sub.exp
index e3a521325f..130fa1194e 100644
--- a/gdb/testsuite/gdb.disasm/t04_sub.exp
+++ b/gdb/testsuite/gdb.disasm/t04_sub.exp
@@ -41,11 +41,13 @@ set link-flags "-m h8300sxelf";
 
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
+     untested t04_sub.exp
+     return -1
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
+     untested t04_sub.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t05_cmp.exp b/gdb/testsuite/gdb.disasm/t05_cmp.exp
index 8578000680..04cdd5dc34 100644
--- a/gdb/testsuite/gdb.disasm/t05_cmp.exp
+++ b/gdb/testsuite/gdb.disasm/t05_cmp.exp
@@ -41,11 +41,13 @@ set link-flags "-m h8300sxelf";
 
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
+     untested t05_cmp.exp
+     return -1
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
+     untested t05_cmp.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t06_ari2.exp b/gdb/testsuite/gdb.disasm/t06_ari2.exp
index 99ad3669d6..c86b3b9da6 100644
--- a/gdb/testsuite/gdb.disasm/t06_ari2.exp
+++ b/gdb/testsuite/gdb.disasm/t06_ari2.exp
@@ -41,11 +41,13 @@ set link-flags "-m h8300sxelf";
 
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
+     untested t06_ari2.exp
+     return -1
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
+     untested t06_ari2.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t07_ari3.exp b/gdb/testsuite/gdb.disasm/t07_ari3.exp
index 7084a950aa..fd4a713c3a 100644
--- a/gdb/testsuite/gdb.disasm/t07_ari3.exp
+++ b/gdb/testsuite/gdb.disasm/t07_ari3.exp
@@ -41,11 +41,13 @@ set link-flags "-m h8300sxelf";
 
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
+     untested t07_ari3.exp
+     return -1
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
+     untested t07_ari3.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t08_or.exp b/gdb/testsuite/gdb.disasm/t08_or.exp
index 5652cf7555..c15e12ff68 100644
--- a/gdb/testsuite/gdb.disasm/t08_or.exp
+++ b/gdb/testsuite/gdb.disasm/t08_or.exp
@@ -41,11 +41,13 @@ set link-flags "-m h8300sxelf";
 
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
+     untested t08_or.exp
+     return -1
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
+     untested t08_or.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t09_xor.exp b/gdb/testsuite/gdb.disasm/t09_xor.exp
index 0164b330b4..79ea3190db 100644
--- a/gdb/testsuite/gdb.disasm/t09_xor.exp
+++ b/gdb/testsuite/gdb.disasm/t09_xor.exp
@@ -41,11 +41,13 @@ set link-flags "-m h8300sxelf";
 
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
+     untested t09_xor.exp
+     return -1
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
+     untested t09_xor.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t10_and.exp b/gdb/testsuite/gdb.disasm/t10_and.exp
index 63ae907615..2ed7d7b125 100644
--- a/gdb/testsuite/gdb.disasm/t10_and.exp
+++ b/gdb/testsuite/gdb.disasm/t10_and.exp
@@ -41,11 +41,13 @@ set link-flags "-m h8300sxelf";
 
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
+     untested t10_and.exp
+     return -1
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
+     untested t10_and.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t11_logs.exp b/gdb/testsuite/gdb.disasm/t11_logs.exp
index 85b2a9ea82..33df7e81d1 100644
--- a/gdb/testsuite/gdb.disasm/t11_logs.exp
+++ b/gdb/testsuite/gdb.disasm/t11_logs.exp
@@ -41,11 +41,13 @@ set link-flags "-m h8300sxelf";
 
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
+     untested t11_logs.exp
+     return -1
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
+     untested t11_logs.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t12_bit.exp b/gdb/testsuite/gdb.disasm/t12_bit.exp
index c59cdc8bd6..f4388a5ad8 100644
--- a/gdb/testsuite/gdb.disasm/t12_bit.exp
+++ b/gdb/testsuite/gdb.disasm/t12_bit.exp
@@ -41,11 +41,13 @@ set link-flags "-m h8300sxelf";
 
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
+     untested t12_bit.exp
+     return -1
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
+     untested t12_bit.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.disasm/t13_otr.exp b/gdb/testsuite/gdb.disasm/t13_otr.exp
index 5c018428c2..b37a3f3758 100644
--- a/gdb/testsuite/gdb.disasm/t13_otr.exp
+++ b/gdb/testsuite/gdb.disasm/t13_otr.exp
@@ -41,11 +41,13 @@ set link-flags "-m h8300sxelf";
 
 
 if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
+     untested t13_otr.exp
+     return -1
 }
 
 if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
+     untested t13_otr.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.hp/gdb.aCC/optimize.exp b/gdb/testsuite/gdb.hp/gdb.aCC/optimize.exp
index 84b51b6aca..7c47f8c668 100644
--- a/gdb/testsuite/gdb.hp/gdb.aCC/optimize.exp
+++ b/gdb/testsuite/gdb.hp/gdb.aCC/optimize.exp
@@ -49,7 +49,8 @@ if { $gcc_compiled } then { continue }
 # Vanilla -O, which is the same as +O2
 #
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug optimize=+O2}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested optimize.exp
+     return -1
 }
 
 
@@ -113,7 +114,8 @@ gdb_exit
 # +O4, don't use -g
 #
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {optimize=+O4}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested optimize.exp
+     return -1
 }
 
 gdb_start
diff --git a/gdb/testsuite/gdb.hp/gdb.aCC/watch-cmd.exp b/gdb/testsuite/gdb.hp/gdb.aCC/watch-cmd.exp
index e447c0b5cf..10d5ca156e 100644
--- a/gdb/testsuite/gdb.hp/gdb.aCC/watch-cmd.exp
+++ b/gdb/testsuite/gdb.hp/gdb.aCC/watch-cmd.exp
@@ -33,7 +33,8 @@ set testfile "run"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested watch-cmd.exp
+     return -1
 
 }
 
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/callfwmall.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/callfwmall.exp
index 0f06983b58..fbef5aa3c7 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/callfwmall.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/callfwmall.exp
@@ -99,7 +99,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested callfwmall.exp
+     return -1
 }
 
 # Create and source the file that provides information about the compiler
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/dollar.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/dollar.exp
index b3a6335a1f..c7a3fca052 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/dollar.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/dollar.exp
@@ -45,7 +45,8 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested dollar.exp
+     return -1
 }
 
 #source ${binfile}.ci
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp
index 3e529f8c0e..d0b7b26dad 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp
@@ -37,7 +37,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 # build the first test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested hwwatchbus.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp
index 4e48107c60..db26aade13 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp
@@ -52,7 +52,8 @@ if { $gcc_compiled } then { continue }
 #
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested pxdb.exp
+    return -1
 }
 
 #
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.exp
index ce42c786e3..8da978e78d 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.exp
@@ -54,7 +54,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 #
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested reg-pa64.exp
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp
index cc1028d537..9ed6415baa 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp
@@ -55,7 +55,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 #
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested reg.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/sized-enum.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/sized-enum.exp
index 0b5b6871ef..6cbba5ca97 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/sized-enum.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/sized-enum.exp
@@ -50,7 +50,8 @@ if { $gcc_compiled } then { continue }
 if {$hp_aCC_compiler} {continue}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested sized-enum.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/xdb1.exp b/gdb/testsuite/gdb.hp/gdb.compat/xdb1.exp
index f371852c78..0440811260 100644
--- a/gdb/testsuite/gdb.hp/gdb.compat/xdb1.exp
+++ b/gdb/testsuite/gdb.hp/gdb.compat/xdb1.exp
@@ -37,7 +37,8 @@ set testfile "xdb"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested xdb1.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp b/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp
index de983d3e9c..b55b488058 100644
--- a/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp
+++ b/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp
@@ -32,15 +32,18 @@ set binfile2 ${objdir}/${subdir}/${testfile2}
 set binfile ${objdir}/${subdir}/${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/average.c" "${binfile1}.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested xdb3.exp
+     return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/sum.c" "${binfile2}.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested xdb3.exp
+     return -1
 }
 
 if  { [gdb_compile "${binfile1}.o ${binfile2}.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested xdb3.exp
+     return -1
 }
 
 if [get_compiler_info ${binfile}] {
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp
index 70d9d0c983..f743825987 100644
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp
+++ b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp
@@ -25,7 +25,8 @@ if {!$hp_aCC_compiler && !$hp_cc_compiler} {
 }
 
 if { [gdb_compile "${toolssubdir}/test-objdbg.cc" "${objdbgdir}/test-objdbg.o" object "debug c++ {additional_flags=-I${toolssubdir} +objdebug}"] != "" } {
-    gdb_suppress_entire_file "WARNING: +objdebug option is not supported in this compiler version, test ignored."
+    untested objdbg01.exp
+    return -1
 }
 
 if { [gdb_compile "${srcsubdir}/x1.cc" "${objdbgdir}/x1.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp
index fcd0fdc9b4..c3364981ca 100644
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp
+++ b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp
@@ -24,7 +24,8 @@ if {!$hp_aCC_compiler && !$hp_cc_compiler} {
 }
 
 if { [gdb_compile "${toolssubdir}/test-objdbg.cc" "${objdbgdir}/test-objdbg.o" object "debug c++ {additional_flags=-I${toolssubdir} +objdebug}"] != "" } {
-    gdb_suppress_entire_file "WARNING: +objdebug option is not supported in this compiler version, test ignored."
+    untested objdbg02.exp
+    return -1
 }
 
 if { [gdb_compile "${srcsubdir}/x1.cc" "${objdbgdir}/x1.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp
index 1e549476f3..c5d12e5544 100644
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp
+++ b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp
@@ -29,7 +29,8 @@ if {!$hp_aCC_compiler && !$hp_cc_compiler} {
 }
 
 if { [gdb_compile "${toolssubdir}/test-objdbg.cc" "${objdbgdir}/test-objdbg.o" object "debug c++ {additional_flags=-I${toolssubdir} +objdebug}"] != "" } {
-    gdb_suppress_entire_file "WARNING: +objdebug option is not supported in this compiler version, test ignored."
+    untested objdbg03.exp
+    return -1
 }
 
 if { [gdb_compile "${srcsubdir}/x1.cc" "${objdbgdir}/x1.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04.exp
index c57f4c0e05..b060f1c243 100644
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04.exp
+++ b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04.exp
@@ -25,7 +25,8 @@ if {!$hp_aCC_compiler && !$hp_cc_compiler} {
 }
 
 if { [gdb_compile "${toolssubdir}/test-objdbg.cc" "${objdbgdir}/test-objdbg.o" object "debug c++ {additional_flags=-I${toolssubdir} +objdebug}"] != "" } {
-    gdb_suppress_entire_file "WARNING: +objdebug option is not supported in this compiler version, test ignored."
+    untested objdbg04.exp
+    return -1
 }
 
 if { [gdb_compile "${srcsubdir}/x1.cc" "${objdbgdir}/x1.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
diff --git a/gdb/testsuite/gdb.mi/gdb701.exp b/gdb/testsuite/gdb.mi/gdb701.exp
index 703ec6a9fc..8120b5a08f 100644
--- a/gdb/testsuite/gdb.mi/gdb701.exp
+++ b/gdb/testsuite/gdb.mi/gdb701.exp
@@ -33,7 +33,8 @@ set testfile gdb701
 set srcfile "$testfile.c"
 set binfile $objdir/$subdir/$testfile
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable debug] != ""} {
-  gdb_suppress_entire_file "Testcase compile failed, so all test in this file will automatically fail."
+  untested gdb701.exp
+  return -1
 }
 
 # When varobj reports the types of objects, it often isn't really reporting
diff --git a/gdb/testsuite/gdb.mi/gdb792.exp b/gdb/testsuite/gdb.mi/gdb792.exp
index 37fc3ae8da..29dc064b18 100644
--- a/gdb/testsuite/gdb.mi/gdb792.exp
+++ b/gdb/testsuite/gdb.mi/gdb792.exp
@@ -40,7 +40,8 @@ if [get_compiler_info ${binfile} "c++"] {
 }
 
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable {debug c++}] != ""} {
-  gdb_suppress_entire_file "Testcase compile failed, so all test in this file will automatically fail."
+  untested gdb792.exp
+  return -1
 }
 
 # Test that children of classes are properly reported
diff --git a/gdb/testsuite/gdb.mi/mi-basics.exp b/gdb/testsuite/gdb.mi/mi-basics.exp
index 7bf15d7545..9a6bdc8b66 100644
--- a/gdb/testsuite/gdb.mi/mi-basics.exp
+++ b/gdb/testsuite/gdb.mi/mi-basics.exp
@@ -44,7 +44,8 @@ set escapedobjdir [string_to_regexp ${objdir}]
 set escapedsrcdir [string_to_regexp ${srcdir}]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-basics.exp
+     return -1
 }
 
 # In this file we want to test if the operations needed by the following
diff --git a/gdb/testsuite/gdb.mi/mi-break.exp b/gdb/testsuite/gdb.mi/mi-break.exp
index 0693aa54c7..ed60a760e3 100644
--- a/gdb/testsuite/gdb.mi/mi-break.exp
+++ b/gdb/testsuite/gdb.mi/mi-break.exp
@@ -37,7 +37,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-break.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-cli.exp b/gdb/testsuite/gdb.mi/mi-cli.exp
index 1293c346d7..a20fc04bd7 100644
--- a/gdb/testsuite/gdb.mi/mi-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi-cli.exp
@@ -32,7 +32,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-cli.exp
+     return -1
 }
 
 mi_gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.mi/mi-console.exp b/gdb/testsuite/gdb.mi/mi-console.exp
index 55535f7a03..bdea71dd6b 100644
--- a/gdb/testsuite/gdb.mi/mi-console.exp
+++ b/gdb/testsuite/gdb.mi/mi-console.exp
@@ -44,7 +44,8 @@ set testfile "mi-console"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-console.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-disassemble.exp b/gdb/testsuite/gdb.mi/mi-disassemble.exp
index 625c430cdd..27f5e37a9a 100644
--- a/gdb/testsuite/gdb.mi/mi-disassemble.exp
+++ b/gdb/testsuite/gdb.mi/mi-disassemble.exp
@@ -33,7 +33,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-disassemble.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-eval.exp b/gdb/testsuite/gdb.mi/mi-eval.exp
index a07f607e52..e6b89bcfb6 100644
--- a/gdb/testsuite/gdb.mi/mi-eval.exp
+++ b/gdb/testsuite/gdb.mi/mi-eval.exp
@@ -35,7 +35,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-eval.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-file.exp b/gdb/testsuite/gdb.mi/mi-file.exp
index 6104466384..86f0665719 100644
--- a/gdb/testsuite/gdb.mi/mi-file.exp
+++ b/gdb/testsuite/gdb.mi/mi-file.exp
@@ -37,7 +37,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-file.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-read-memory.exp b/gdb/testsuite/gdb.mi/mi-read-memory.exp
index 2cc74dda6d..00677c3f18 100644
--- a/gdb/testsuite/gdb.mi/mi-read-memory.exp
+++ b/gdb/testsuite/gdb.mi/mi-read-memory.exp
@@ -41,7 +41,8 @@ set testfile "mi-read-memory"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-read-memory.exp
+     return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.mi/mi-regs.exp b/gdb/testsuite/gdb.mi/mi-regs.exp
index 2ca9803441..3564703f8a 100644
--- a/gdb/testsuite/gdb.mi/mi-regs.exp
+++ b/gdb/testsuite/gdb.mi/mi-regs.exp
@@ -38,7 +38,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-regs.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-return.exp b/gdb/testsuite/gdb.mi/mi-return.exp
index 5397624e39..7f61656274 100644
--- a/gdb/testsuite/gdb.mi/mi-return.exp
+++ b/gdb/testsuite/gdb.mi/mi-return.exp
@@ -35,7 +35,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-return.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-simplerun.exp b/gdb/testsuite/gdb.mi/mi-simplerun.exp
index 9e9385e957..8d9b45964f 100644
--- a/gdb/testsuite/gdb.mi/mi-simplerun.exp
+++ b/gdb/testsuite/gdb.mi/mi-simplerun.exp
@@ -37,7 +37,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-simplerun.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-stack.exp b/gdb/testsuite/gdb.mi/mi-stack.exp
index 962b25f222..47e51cd50c 100644
--- a/gdb/testsuite/gdb.mi/mi-stack.exp
+++ b/gdb/testsuite/gdb.mi/mi-stack.exp
@@ -35,7 +35,8 @@ set testfile "mi-stack"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-stack.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-stepi.exp b/gdb/testsuite/gdb.mi/mi-stepi.exp
index 5972107162..25122a7fd8 100644
--- a/gdb/testsuite/gdb.mi/mi-stepi.exp
+++ b/gdb/testsuite/gdb.mi/mi-stepi.exp
@@ -35,7 +35,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-stepi.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-syn-frame.exp b/gdb/testsuite/gdb.mi/mi-syn-frame.exp
index 6648b3aff6..8271fb38ab 100644
--- a/gdb/testsuite/gdb.mi/mi-syn-frame.exp
+++ b/gdb/testsuite/gdb.mi/mi-syn-frame.exp
@@ -32,7 +32,8 @@ set testfile "mi-syn-frame"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-syn-frame.exp
+     return -1
 }
 
 mi_gdb_exit
diff --git a/gdb/testsuite/gdb.mi/mi-until.exp b/gdb/testsuite/gdb.mi/mi-until.exp
index ff686afd5e..5174b7639c 100644
--- a/gdb/testsuite/gdb.mi/mi-until.exp
+++ b/gdb/testsuite/gdb.mi/mi-until.exp
@@ -38,7 +38,8 @@ set testfile "until"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-until.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-var-block.exp b/gdb/testsuite/gdb.mi/mi-var-block.exp
index db49456a63..3f2c42f3e2 100644
--- a/gdb/testsuite/gdb.mi/mi-var-block.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-block.exp
@@ -32,7 +32,8 @@ set testfile "var-cmd"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested mi-var-block.exp
+    return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-var-child.exp b/gdb/testsuite/gdb.mi/mi-var-child.exp
index 3337d890a8..5d44543a55 100644
--- a/gdb/testsuite/gdb.mi/mi-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-child.exp
@@ -32,7 +32,8 @@ set testfile "mi-var-child"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested mi-var-child.exp
+    return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
index 30f060d3ae..a6023e9f2f 100644
--- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
@@ -33,7 +33,8 @@ set testfile "var-cmd"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested mi-var-cmd.exp
+    return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp
index 72f5cf0e72..77c87202a0 100644
--- a/gdb/testsuite/gdb.mi/mi-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-display.exp
@@ -33,7 +33,8 @@ set testfile "var-cmd"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested mi-var-display.exp
+    return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi-watch.exp b/gdb/testsuite/gdb.mi/mi-watch.exp
index 1ef3ab0f63..a6d243b25c 100644
--- a/gdb/testsuite/gdb.mi/mi-watch.exp
+++ b/gdb/testsuite/gdb.mi/mi-watch.exp
@@ -38,7 +38,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-watch.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-basics.exp b/gdb/testsuite/gdb.mi/mi2-basics.exp
index d265888677..c3a6692850 100644
--- a/gdb/testsuite/gdb.mi/mi2-basics.exp
+++ b/gdb/testsuite/gdb.mi/mi2-basics.exp
@@ -45,7 +45,8 @@ set escapedobjdir [string_to_regexp ${objdir}]
 set escapedsrcdir [string_to_regexp ${srcdir}]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-basics.exp
+     return -1
 }
 
 # In this file we want to test if the operations needed by the following
diff --git a/gdb/testsuite/gdb.mi/mi2-break.exp b/gdb/testsuite/gdb.mi/mi2-break.exp
index 43103fb1b8..ecc854d337 100644
--- a/gdb/testsuite/gdb.mi/mi2-break.exp
+++ b/gdb/testsuite/gdb.mi/mi2-break.exp
@@ -37,7 +37,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-break.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-cli.exp b/gdb/testsuite/gdb.mi/mi2-cli.exp
index ae778d1c0d..c3e2691926 100644
--- a/gdb/testsuite/gdb.mi/mi2-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi2-cli.exp
@@ -32,7 +32,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-cli.exp
+     return -1
 }
 
 mi_gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.mi/mi2-console.exp b/gdb/testsuite/gdb.mi/mi2-console.exp
index 242d791d3c..45c1160885 100644
--- a/gdb/testsuite/gdb.mi/mi2-console.exp
+++ b/gdb/testsuite/gdb.mi/mi2-console.exp
@@ -44,7 +44,8 @@ set testfile "mi-console"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-console.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-disassemble.exp b/gdb/testsuite/gdb.mi/mi2-disassemble.exp
index b79a9c09e2..ac80e04654 100644
--- a/gdb/testsuite/gdb.mi/mi2-disassemble.exp
+++ b/gdb/testsuite/gdb.mi/mi2-disassemble.exp
@@ -34,7 +34,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-disassemble.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-eval.exp b/gdb/testsuite/gdb.mi/mi2-eval.exp
index 1d181913aa..92fa954e43 100644
--- a/gdb/testsuite/gdb.mi/mi2-eval.exp
+++ b/gdb/testsuite/gdb.mi/mi2-eval.exp
@@ -35,7 +35,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-eval.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-file.exp b/gdb/testsuite/gdb.mi/mi2-file.exp
index 50581ca49f..246523510f 100644
--- a/gdb/testsuite/gdb.mi/mi2-file.exp
+++ b/gdb/testsuite/gdb.mi/mi2-file.exp
@@ -37,7 +37,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-file.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-read-memory.exp b/gdb/testsuite/gdb.mi/mi2-read-memory.exp
index c3f16774e4..845727cf38 100644
--- a/gdb/testsuite/gdb.mi/mi2-read-memory.exp
+++ b/gdb/testsuite/gdb.mi/mi2-read-memory.exp
@@ -41,7 +41,8 @@ set testfile "mi-read-memory"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-read-memory.exp
+     return -1
 }
 
 
diff --git a/gdb/testsuite/gdb.mi/mi2-regs.exp b/gdb/testsuite/gdb.mi/mi2-regs.exp
index 3277ccd44e..38c2057764 100644
--- a/gdb/testsuite/gdb.mi/mi2-regs.exp
+++ b/gdb/testsuite/gdb.mi/mi2-regs.exp
@@ -38,7 +38,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-regs.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-return.exp b/gdb/testsuite/gdb.mi/mi2-return.exp
index 98a96a360e..855fa80e44 100644
--- a/gdb/testsuite/gdb.mi/mi2-return.exp
+++ b/gdb/testsuite/gdb.mi/mi2-return.exp
@@ -36,7 +36,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-return.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-simplerun.exp b/gdb/testsuite/gdb.mi/mi2-simplerun.exp
index 6fdaffde05..be43ed3265 100644
--- a/gdb/testsuite/gdb.mi/mi2-simplerun.exp
+++ b/gdb/testsuite/gdb.mi/mi2-simplerun.exp
@@ -37,7 +37,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-simplerun.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-stack.exp b/gdb/testsuite/gdb.mi/mi2-stack.exp
index 9199266bfa..6e6d090f0e 100644
--- a/gdb/testsuite/gdb.mi/mi2-stack.exp
+++ b/gdb/testsuite/gdb.mi/mi2-stack.exp
@@ -35,7 +35,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-stack.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-stepi.exp b/gdb/testsuite/gdb.mi/mi2-stepi.exp
index adfea7ac0e..5f4e28ebbc 100644
--- a/gdb/testsuite/gdb.mi/mi2-stepi.exp
+++ b/gdb/testsuite/gdb.mi/mi2-stepi.exp
@@ -36,7 +36,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-stepi.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-syn-frame.exp b/gdb/testsuite/gdb.mi/mi2-syn-frame.exp
index eb1cbe0aa3..2e6ab7fe0c 100644
--- a/gdb/testsuite/gdb.mi/mi2-syn-frame.exp
+++ b/gdb/testsuite/gdb.mi/mi2-syn-frame.exp
@@ -33,7 +33,8 @@ set testfile "mi-syn-frame"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-syn-frame.exp
+     return -1
 }
 
 set my_mi_gdb_prompt "\\(gdb\\)\[ \]*\[\r\n\]*"
diff --git a/gdb/testsuite/gdb.mi/mi2-until.exp b/gdb/testsuite/gdb.mi/mi2-until.exp
index 760a4a2102..485a358b01 100644
--- a/gdb/testsuite/gdb.mi/mi2-until.exp
+++ b/gdb/testsuite/gdb.mi/mi2-until.exp
@@ -39,7 +39,8 @@ set testfile "until"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-until.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-var-block.exp b/gdb/testsuite/gdb.mi/mi2-var-block.exp
index 474891030c..e34a2f7617 100644
--- a/gdb/testsuite/gdb.mi/mi2-var-block.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-block.exp
@@ -32,7 +32,8 @@ set testfile "var-cmd"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested mi2-var-block.exp
+    return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-var-child.exp b/gdb/testsuite/gdb.mi/mi2-var-child.exp
index be2dc84921..a18b03c573 100644
--- a/gdb/testsuite/gdb.mi/mi2-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-child.exp
@@ -32,7 +32,8 @@ set testfile "var-cmd"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested mi2-var-child.exp
+    return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-var-cmd.exp b/gdb/testsuite/gdb.mi/mi2-var-cmd.exp
index 5a8f50b014..291f2d4405 100644
--- a/gdb/testsuite/gdb.mi/mi2-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-cmd.exp
@@ -33,7 +33,8 @@ set testfile "var-cmd"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested mi2-var-cmd.exp
+    return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-var-display.exp b/gdb/testsuite/gdb.mi/mi2-var-display.exp
index 0465945c84..840c221cdc 100644
--- a/gdb/testsuite/gdb.mi/mi2-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-display.exp
@@ -33,7 +33,8 @@ set testfile "var-cmd"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested mi2-var-display.exp
+    return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.mi/mi2-watch.exp b/gdb/testsuite/gdb.mi/mi2-watch.exp
index 301505e968..5cb0b32fe9 100644
--- a/gdb/testsuite/gdb.mi/mi2-watch.exp
+++ b/gdb/testsuite/gdb.mi/mi2-watch.exp
@@ -37,7 +37,8 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi2-watch.exp
+     return -1
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.stabs/exclfwd.exp b/gdb/testsuite/gdb.stabs/exclfwd.exp
index 9d50014639..42b2c94254 100644
--- a/gdb/testsuite/gdb.stabs/exclfwd.exp
+++ b/gdb/testsuite/gdb.stabs/exclfwd.exp
@@ -38,12 +38,14 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 foreach file {exclfwd1 exclfwd2} {
     if {[gdb_compile "${srcdir}/${subdir}/${file}.c" "${file}.o" object {debug}] != ""} {
-        gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+        untested exclfwd.exp
+        return -1
     }
 }
 
 if {[gdb_compile "exclfwd1.o exclfwd2.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested exclfwd.exp
+     return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
index fca9701ccf..cff581bfe8 100644
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ b/gdb/testsuite/gdb.stabs/weird.exp
@@ -290,7 +290,8 @@ if { [lindex $exec_output 0] != 0 } {
 }
 
 if  { [gdb_compile "${srcfile}" "${binfile}" object ""] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested weird.exp
+     return -1
 }
 
 remote_file build delete ${srcfile}
diff --git a/gdb/testsuite/gdb.threads/gcore-thread.exp b/gdb/testsuite/gdb.threads/gcore-thread.exp
index d7f897198b..bb8f4f2011 100644
--- a/gdb/testsuite/gdb.threads/gcore-thread.exp
+++ b/gdb/testsuite/gdb.threads/gcore-thread.exp
@@ -79,7 +79,8 @@ gdb_expect {
 }
 
 if { ! [ runto_main ] } then {
-    gdb_suppress_entire_file "Run to main failed, so all tests in this file will automatically fail."
+    untested gcore-thread.exp
+    return -1
 }
 
 send_gdb "info threads\n"
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index 9be9f5945c..74769d093b 100644
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -40,7 +40,8 @@ if [istarget "m68k-*-elf"] then {
     set binfile $objdir/$subdir/$testfile
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	untested actions.exp
+	return -1
     }
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
index dde7795024..b4a44e82cc 100644
--- a/gdb/testsuite/gdb.trace/backtrace.exp
+++ b/gdb/testsuite/gdb.trace/backtrace.exp
@@ -44,7 +44,8 @@ if [istarget "m68k-*-elf"] then {
     send_gdb "compare-sections CS\n"
     gdb_expect {
 	-re "MIS-MATCHED.*$gdb_prompt $" {
-	    gdb_suppress_entire_file "Symbol file does not match target!
+	    untested backtrace.exp
+	    return -1
 	    all tests in this module will fail.";
 	}
 	-re ".*$gdb_prompt $" { }
@@ -55,7 +56,8 @@ if [istarget "m68k-*-elf"] then {
     set binfile $objdir/$subdir/$testfile
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	untested backtrace.exp
+	return -1
     }
     gdb_load $binfile
     gdb_test "tstop"       "" ""
@@ -124,12 +126,14 @@ gdb_expect {
     }
     -re ".*$gdb_prompt $" {
 	if { ($testline1 == 0) || ($testline2 == 0) || ($testline3 == 0) || ($testline4 == 0) || ($testline5 == 0) || ($testline6 == 0) } {
-	    gdb_suppress_entire_file "failed to locate test source lines:
+	    untested backtrace.exp
+	    return -1
 all tests in this module will fail."
 	}
     }
     default {
-	    gdb_suppress_entire_file "failed to locate test source lines (def):
+	    untested backtrace.exp
+	    return -1
 all tests in this module will fail."
     } 
 }
diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp
index 4fe230b9a8..fc03d4213c 100644
--- a/gdb/testsuite/gdb.trace/circ.exp
+++ b/gdb/testsuite/gdb.trace/circ.exp
@@ -37,7 +37,8 @@ set binfile $objdir/$subdir/$testfile
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested circ.exp
+    return -1
 }
 
 # Tests:
diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp
index 1d499fd3c5..b6abf985b8 100644
--- a/gdb/testsuite/gdb.trace/collection.exp
+++ b/gdb/testsuite/gdb.trace/collection.exp
@@ -37,7 +37,8 @@ set binfile $objdir/$subdir/$testfile
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested collection.exp
+    return -1
 }
 
 # Tests: 
diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp
index a9adf7a766..e5899b0cc1 100644
--- a/gdb/testsuite/gdb.trace/deltrace.exp
+++ b/gdb/testsuite/gdb.trace/deltrace.exp
@@ -40,7 +40,8 @@ if [istarget "m68k-*-elf"] then {
     set binfile $objdir/$subdir/$testfile
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	untested deltrace.exp
+	return -1
     }
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
index ae7d0355c9..5d362bc0a2 100644
--- a/gdb/testsuite/gdb.trace/infotrace.exp
+++ b/gdb/testsuite/gdb.trace/infotrace.exp
@@ -40,7 +40,8 @@ if [istarget "m68k-*-elf"] then {
     set binfile $objdir/$subdir/$testfile
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	untested infotrace.exp
+	return -1
     }
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/limits.exp b/gdb/testsuite/gdb.trace/limits.exp
index 4022d6d59a..75c1b0ba6c 100644
--- a/gdb/testsuite/gdb.trace/limits.exp
+++ b/gdb/testsuite/gdb.trace/limits.exp
@@ -37,7 +37,8 @@ set binfile $objdir/$subdir/$testfile
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	executable {debug nowarnings}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested limits.exp
+    return -1
 }
 
 # Tests:
diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index 54b22cc57d..b7ed2d5a63 100644
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -44,7 +44,8 @@ if [istarget "m68k-*-elf"] then {
     send_gdb "compare-sections CS\n"
     gdb_expect {
 	-re "MIS-MATCHED.*$gdb_prompt $" {
-	    gdb_suppress_entire_file "Symbol file does not match target!
+	    untested packetlen.exp
+	    return -1
 	    all tests in this module will fail.";
 	}
 	-re ".*$gdb_prompt $" { }
@@ -55,7 +56,8 @@ if [istarget "m68k-*-elf"] then {
     set binfile $objdir/$subdir/$testfile
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	untested packetlen.exp
+	return -1
     }
     gdb_load $binfile
     gdb_test "tstop"       "" ""
diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp
index f3c6848cda..58bab6e4f1 100644
--- a/gdb/testsuite/gdb.trace/passc-dyn.exp
+++ b/gdb/testsuite/gdb.trace/passc-dyn.exp
@@ -43,7 +43,8 @@ if [istarget "m68k-*-elf"] then {
     send_gdb "compare-sections CS\n"
     gdb_expect {
 	-re "MIS-MATCHED.*$gdb_prompt $" {
-	    gdb_suppress_entire_file "Symbol file does not match target!
+	    untested passc-dyn.exp
+	    return -1
 	    all tests in this module will fail.";
 	}
 	-re ".*$gdb_prompt $" { }
@@ -54,7 +55,8 @@ if [istarget "m68k-*-elf"] then {
     set binfile $objdir/$subdir/$testfile
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	untested passc-dyn.exp
+	return -1
     }
     gdb_load $binfile
     gdb_test "tstop"       "" ""
@@ -142,32 +144,38 @@ if [istarget "m68k-*-elf"] then {
 
 gdb_test "tfind none" "" ""
 if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x -1 x" ""] {
-    gdb_suppress_entire_file "0: tfind none failed"
+    untested passc-dyn.exp
+    return -1
 }
 
 gdb_test "tfind tracepoint $tdp2" "" ""
 if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 0 x" ""] {
-    gdb_suppress_entire_file "1: first tfind failed"
+    untested passc-dyn.exp
+    return -1
 }
 
 gdb_test "tfind tracepoint $tdp3" "" ""
 if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 1 x" ""] {
-    gdb_suppress_entire_file "2: second tfind failed"
+    untested passc-dyn.exp
+    return -1
 }
 
 gdb_test "tfind tracepoint $tdp4" "" ""
 if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 2 x" ""] {
-    gdb_suppress_entire_file "3: third tfind failed"
+    untested passc-dyn.exp
+    return -1
 }
 
 gdb_test "tfind tracepoint $tdp2" "" ""
 if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 3 x" ""] {
-    gdb_suppress_entire_file "4: fourth tfind failed"
+    untested passc-dyn.exp
+    return -1
 }
 
 gdb_test "tfind tracepoint $tdp3" "" ""
 if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 4 x" ""] {
-    gdb_suppress_entire_file "5: fifth tfind failed"
+    untested passc-dyn.exp
+    return -1
 }
 
 ## We should now be at the last frame, because this frame's passcount
diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp
index 881ead0f6c..e815718dba 100644
--- a/gdb/testsuite/gdb.trace/passcount.exp
+++ b/gdb/testsuite/gdb.trace/passcount.exp
@@ -39,7 +39,8 @@ if [istarget "m68k-*-elf"] then {
     set binfile $objdir/$subdir/$testfile
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	untested passcount.exp
+	return -1
     }
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index 1b772a3470..0d2531788f 100644
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -44,7 +44,8 @@ if [istarget "m68k-*-elf"] then {
     send_gdb "compare-sections CS\n"
     gdb_expect {
 	-re "MIS-MATCHED.*$gdb_prompt $" {
-	    gdb_suppress_entire_file "Symbol file does not match target!
+	    untested report.exp
+	    return -1
 	    all tests in this module will fail.";
 	}
 	-re ".*$gdb_prompt $" { }
@@ -55,7 +56,8 @@ if [istarget "m68k-*-elf"] then {
     set binfile $objdir/$subdir/$testfile
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	     executable {debug nowarnings}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	untested report.exp
+	return -1
     }
     gdb_load $binfile
     gdb_test "tstop"       "" ""
@@ -129,12 +131,14 @@ gdb_expect {
     }
     -re ".*$gdb_prompt $" {
 	if { ($testline1 == 0) || ($testline2 == 0) || ($testline3 == 0) || ($testline4 == 0) || ($testline5 == 0) || ($testline6 == 0) } {
-	    gdb_suppress_entire_file "failed to locate test source lines:
+	    untested report.exp
+	    return -1
 all tests in this module will fail."
 	}
     }
     default {
-	    gdb_suppress_entire_file "failed to locate test source lines (def):
+	    untested report.exp
+	    return -1
 all tests in this module will fail."
     } 
 }
diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp
index 6ab52f0150..43f6f9c43e 100644
--- a/gdb/testsuite/gdb.trace/save-trace.exp
+++ b/gdb/testsuite/gdb.trace/save-trace.exp
@@ -40,7 +40,8 @@ if [istarget "m68k-*-elf"] then {
     set binfile $objdir/$subdir/$testfile
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	untested save-trace.exp
+	return -1
     }
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index aa152989e9..3d2992f26c 100644
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -44,7 +44,8 @@ if [istarget "m68k-*-elf"] then {
     send_gdb "compare-sections CS\n"
     gdb_expect {
 	-re "MIS-MATCHED.*$gdb_prompt $" {
-	    gdb_suppress_entire_file "Symbol file does not match target!
+	    untested tfind.exp
+	    return -1
 	    all tests in this module will fail.";
 	}
 	-re ".*$gdb_prompt $" { }
@@ -56,7 +57,8 @@ if [istarget "m68k-*-elf"] then {
 
     if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \
 	    executable {debug nowarnings}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	untested tfind.exp
+	return -1
     }
     gdb_load $binfile
     gdb_test "tstop"       "" ""
diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
index dad64cf350..1609e67ac5 100644
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp
@@ -39,7 +39,8 @@ if [istarget "m68k-*-elf"] then {
     set binfile $objdir/$subdir/$testfile
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	untested tracecmd.exp
+	return -1
     }
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp
index 03adf8ce88..6019312091 100644
--- a/gdb/testsuite/gdb.trace/while-dyn.exp
+++ b/gdb/testsuite/gdb.trace/while-dyn.exp
@@ -45,7 +45,8 @@ if [istarget "m68k-*-elf"] then {
     send_gdb "compare-section CS\n"
     gdb_expect {
 	-re "MIS-MATCHED.*$gdb_prompt $" {
-	    gdb_suppress_entire_file "Symbol file does not match target!
+	    untested while-dyn.exp
+	    return -1
 	    all tests in this module will fail.";
 	}
 	-re ".*$gdb_prompt $" { }
@@ -56,7 +57,8 @@ if [istarget "m68k-*-elf"] then {
     set binfile $objdir/$subdir/$testfile
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	untested while-dyn.exp
+	return -1
     }
     gdb_load $binfile
     gdb_test "tstop"       "" ""
diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp
index 0ea38f544f..225c9fdeb0 100644
--- a/gdb/testsuite/gdb.trace/while-stepping.exp
+++ b/gdb/testsuite/gdb.trace/while-stepping.exp
@@ -40,7 +40,8 @@ if [istarget "m68k-*-elf"] then {
     set binfile ${objdir}/${subdir}/${testfile}
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \
 	    executable {debug nowarnings}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+	untested while-stepping.exp
+	return -1
     }
 }
 gdb_reinitialize_dir $srcdir/$subdir
-- 
2.34.1