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: 	* 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/gdb.hp/gdb.aCC/optimize.exp       | 6 ++++--
 gdb/testsuite/gdb.hp/gdb.aCC/watch-cmd.exp      | 3 ++-
 gdb/testsuite/gdb.hp/gdb.base-hp/callfwmall.exp | 3 ++-
 gdb/testsuite/gdb.hp/gdb.base-hp/dollar.exp     | 3 ++-
 gdb/testsuite/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/testsuite/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 ++-
 15 files changed, 36 insertions(+), 18 deletions(-)

(limited to 'gdb/testsuite/gdb.hp')

diff --git a/gdb/testsuite/gdb.hp/gdb.aCC/optimize.exp b/gdb/testsuite/gdb.hp/gdb.aCC/optimize.exp
index 84b51b6..7c47f8c 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 e447c0b..10d5ca1 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 0f06983..fbef5aa 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 b3a6335..c7a3fca 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 3e529f8..d0b7b26 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 4e48107..db26aad 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 ce42c78..8da978e 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 cc1028d..9ed6415 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 0b5b687..6cbba5c 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 f371852..0440811 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 de983d3..b55b488 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 70d9d0c..f743825 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 fcd0fdc..c336498 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 1e54947..c5d12e5 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 c57f4c0..b060f1c 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}"] != "" } {
-- 
cgit v1.1