From 7a292a7adf506b866905b06b3024c0fd411c4583 Mon Sep 17 00:00:00 2001
From: Stan Shebs <shebs@codesourcery.com>
Date: Mon, 26 Apr 1999 18:34:20 +0000
Subject: import gdb-19990422 snapshot

---
 gdb/testsuite/gdb.hp/ambiguous.exp  |  7 ++++---
 gdb/testsuite/gdb.hp/attach.exp     |  6 +-----
 gdb/testsuite/gdb.hp/attach2.exp    |  2 ++
 gdb/testsuite/gdb.hp/classes-hp.exp |  6 +++---
 gdb/testsuite/gdb.hp/ctti.exp       |  6 +++---
 gdb/testsuite/gdb.hp/dbx.exp        |  3 ++-
 gdb/testsuite/gdb.hp/exception.exp  |  3 ++-
 gdb/testsuite/gdb.hp/foll-exec.exp  |  5 +----
 gdb/testsuite/gdb.hp/foll-fork.exp  |  5 +----
 gdb/testsuite/gdb.hp/foll-vfork.exp |  5 +----
 gdb/testsuite/gdb.hp/hwwatchbus.exp |  5 +----
 gdb/testsuite/gdb.hp/inherit-hp.exp |  4 +++-
 gdb/testsuite/gdb.hp/more-steps.exp |  2 ++
 gdb/testsuite/gdb.hp/namespace.exp  | 12 ++++--------
 gdb/testsuite/gdb.hp/optimize.exp   |  4 +++-
 gdb/testsuite/gdb.hp/pxdb.exp       |  7 ++++---
 gdb/testsuite/gdb.hp/reg-test.exp   |  7 ++-----
 gdb/testsuite/gdb.hp/sized-enum.exp |  4 +++-
 gdb/testsuite/gdb.hp/so-thresh.exp  |  5 +----
 gdb/testsuite/gdb.hp/start-stop.exp |  2 ++
 gdb/testsuite/gdb.hp/templ-hp.exp   |  4 +++-
 gdb/testsuite/gdb.hp/thr-lib.exp    |  2 ++
 gdb/testsuite/gdb.hp/thr-stg.exp    |  2 ++
 gdb/testsuite/gdb.hp/virtfun-hp.exp |  7 ++++---
 gdb/testsuite/gdb.hp/watch-cmd.exp  |  9 +++------
 gdb/testsuite/gdb.hp/watch-hp.exp   |  4 +++-
 gdb/testsuite/gdb.hp/xdb1.exp       |  3 ++-
 gdb/testsuite/gdb.hp/xdb2.exp       |  5 +++--
 gdb/testsuite/gdb.hp/xdb3.exp       |  3 ++-
 29 files changed, 69 insertions(+), 70 deletions(-)

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

diff --git a/gdb/testsuite/gdb.hp/ambiguous.exp b/gdb/testsuite/gdb.hp/ambiguous.exp
index 5b87af3..0ee3ecb 100644
--- a/gdb/testsuite/gdb.hp/ambiguous.exp
+++ b/gdb/testsuite/gdb.hp/ambiguous.exp
@@ -35,6 +35,8 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile "ambiguous"
 set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
@@ -42,9 +44,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 if [get_compiler_info ${binfile} "c++"] {
     return -1;
 }
- 
- 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+
+if { $gcc_compiled } 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."
diff --git a/gdb/testsuite/gdb.hp/attach.exp b/gdb/testsuite/gdb.hp/attach.exp
index 372acd0..b76f04c 100644
--- a/gdb/testsuite/gdb.hp/attach.exp
+++ b/gdb/testsuite/gdb.hp/attach.exp
@@ -34,11 +34,7 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
-
-# are we on a target board
-if ![isnative] then {
-    return
-}
+if { [skip_hp_tests] } then { continue }
 
 if { ![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"] } {
     #setup_xfail "*-*-*"
diff --git a/gdb/testsuite/gdb.hp/attach2.exp b/gdb/testsuite/gdb.hp/attach2.exp
index e298ee9..84b0e4a 100644
--- a/gdb/testsuite/gdb.hp/attach2.exp
+++ b/gdb/testsuite/gdb.hp/attach2.exp
@@ -29,6 +29,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 # Thread stuff is _slow_; prepare for long waits.
 #
 # Further, this test has some "null" lines designed
diff --git a/gdb/testsuite/gdb.hp/classes-hp.exp b/gdb/testsuite/gdb.hp/classes-hp.exp
index cb22c96..f67a2af 100644
--- a/gdb/testsuite/gdb.hp/classes-hp.exp
+++ b/gdb/testsuite/gdb.hp/classes-hp.exp
@@ -25,6 +25,7 @@ if $tracelevel then {
 	strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
 
 # Check to see if we have an executable to test.  If not, then either we
 # haven't tried to compile one, or the compilation failed for some reason.
@@ -37,9 +38,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 if [get_compiler_info ${binfile} "c++"] {
     return -1;
 }
- 
- 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+
+if { $gcc_compiled } 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."
diff --git a/gdb/testsuite/gdb.hp/ctti.exp b/gdb/testsuite/gdb.hp/ctti.exp
index e53210d..7f1fac9 100644
--- a/gdb/testsuite/gdb.hp/ctti.exp
+++ b/gdb/testsuite/gdb.hp/ctti.exp
@@ -29,6 +29,7 @@ if $tracelevel then {
         strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
 
 # Check to see if we have an executable to test.  If not, then either we
 # haven't tried to compile one, or the compilation failed for some reason.
@@ -44,9 +45,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 if [get_compiler_info ${binfile} "c++"] {
     return -1;
 }
- 
- 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+
+if { $gcc_compiled } then { continue }
 
 #if  { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcdir}/${subdir}/${srcfile1} ${srcdir}/${subdir}/${srcfile2} ${srcdir}/${subdir}/${srcfile3}" "${binfile}" executable {debug c++}] != "" } {
 #     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
diff --git a/gdb/testsuite/gdb.hp/dbx.exp b/gdb/testsuite/gdb.hp/dbx.exp
index 66f24e9..340c609 100644
--- a/gdb/testsuite/gdb.hp/dbx.exp
+++ b/gdb/testsuite/gdb.hp/dbx.exp
@@ -22,6 +22,7 @@ if $tracelevel then {
         strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
 
 set testfile1 "average"
 set testfile2 "sum"
@@ -47,7 +48,7 @@ if  { [gdb_compile "${binfile1}.o ${binfile2}.o" ${binfile} executable {debug}]
 if [get_compiler_info ${binfile}] {
     return -1;
 }
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 proc dbx_reinitialize_dir { subdir } {
     global gdb_prompt
diff --git a/gdb/testsuite/gdb.hp/exception.exp b/gdb/testsuite/gdb.hp/exception.exp
index 4cafbdc..64ff488 100644
--- a/gdb/testsuite/gdb.hp/exception.exp
+++ b/gdb/testsuite/gdb.hp/exception.exp
@@ -50,6 +50,7 @@ if $tracelevel then {
         strace $tracelevel
         }
 
+if { [skip_hp_tests] } then { continue }
 
 #
 # test running programs
@@ -67,7 +68,7 @@ if [get_compiler_info ${binfile} "c++"] {
 }
  
  
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 set cmdline "$CXX ${srcdir}/${subdir}/${srcfile} +A -Wl,-a,archive -g -o ${binfile}"
 
diff --git a/gdb/testsuite/gdb.hp/foll-exec.exp b/gdb/testsuite/gdb.hp/foll-exec.exp
index f7d6089..59a4ffc 100644
--- a/gdb/testsuite/gdb.hp/foll-exec.exp
+++ b/gdb/testsuite/gdb.hp/foll-exec.exp
@@ -24,10 +24,7 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
-# are we on a target board
-if ![isnative] then {
-    return
-}
+if { [skip_hp_tests] } then { continue }
 
 if {![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"]} {
     #setup_xfail "*-*.*"
diff --git a/gdb/testsuite/gdb.hp/foll-fork.exp b/gdb/testsuite/gdb.hp/foll-fork.exp
index 7231764..fdfc6ed 100644
--- a/gdb/testsuite/gdb.hp/foll-fork.exp
+++ b/gdb/testsuite/gdb.hp/foll-fork.exp
@@ -24,10 +24,7 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
-# are we on a target board
-if ![isnative] then {
-    return
-}
+if { [skip_hp_tests] } then { continue }
 
 if {![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"]} {
     #setup_xfail "*-*.*"
diff --git a/gdb/testsuite/gdb.hp/foll-vfork.exp b/gdb/testsuite/gdb.hp/foll-vfork.exp
index 26c6981..fc5ee4c 100644
--- a/gdb/testsuite/gdb.hp/foll-vfork.exp
+++ b/gdb/testsuite/gdb.hp/foll-vfork.exp
@@ -24,10 +24,7 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
-# are we on a target board
-if ![isnative] then {
-    return
-}
+if { [skip_hp_tests] } then { continue }
 
 if {![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"]} {
     #setup_xfail "*-*.*"
diff --git a/gdb/testsuite/gdb.hp/hwwatchbus.exp b/gdb/testsuite/gdb.hp/hwwatchbus.exp
index d4899a9..f648e36 100644
--- a/gdb/testsuite/gdb.hp/hwwatchbus.exp
+++ b/gdb/testsuite/gdb.hp/hwwatchbus.exp
@@ -24,10 +24,7 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
-# are we on a target board
-if ![isnative] then {
-    return
-}
+if { [skip_hp_tests] } then { continue }
 
 if { ![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"] } {
     verbose "HPUX h/w watch test ignored for non-hppa or pre-HP/UX-10.30 targets."
diff --git a/gdb/testsuite/gdb.hp/inherit-hp.exp b/gdb/testsuite/gdb.hp/inherit-hp.exp
index 645358e..efa4d70 100644
--- a/gdb/testsuite/gdb.hp/inherit-hp.exp
+++ b/gdb/testsuite/gdb.hp/inherit-hp.exp
@@ -25,6 +25,8 @@ if $tracelevel then {
 	strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 # Check to see if we have an executable to test.  If not, then either we
 # haven't tried to compile one, or the compilation failed for some reason.
 # In either case, just notify the user and skip the tests in this file.
@@ -39,7 +41,7 @@ if [get_compiler_info ${binfile} "c++"] {
 }
  
  
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
diff --git a/gdb/testsuite/gdb.hp/more-steps.exp b/gdb/testsuite/gdb.hp/more-steps.exp
index 320a0d6..9972e2d 100644
--- a/gdb/testsuite/gdb.hp/more-steps.exp
+++ b/gdb/testsuite/gdb.hp/more-steps.exp
@@ -26,6 +26,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 #if { ![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"] } {
 #    verbose "HPUX thread test ignored for non-hppa or pre-HP/UX-10.30 targets."
 #    return 0
diff --git a/gdb/testsuite/gdb.hp/namespace.exp b/gdb/testsuite/gdb.hp/namespace.exp
index 1708db8..1e52237 100644
--- a/gdb/testsuite/gdb.hp/namespace.exp
+++ b/gdb/testsuite/gdb.hp/namespace.exp
@@ -31,14 +31,11 @@ if $tracelevel then {
         strace $tracelevel
         }
 
-
-#
-# test running programs
-#
-
 set prms_id 0
 set bug_id 0
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile "namespace"
 set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
@@ -46,9 +43,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 if [get_compiler_info ${binfile}] {
     return -1;
 }
- 
- 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+
+if { $gcc_compiled } then { continue }
 
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
diff --git a/gdb/testsuite/gdb.hp/optimize.exp b/gdb/testsuite/gdb.hp/optimize.exp
index 34606eb..62fe373 100644
--- a/gdb/testsuite/gdb.hp/optimize.exp
+++ b/gdb/testsuite/gdb.hp/optimize.exp
@@ -29,6 +29,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile optimize
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
@@ -38,7 +40,7 @@ if [get_compiler_info ${binfile}] {
 }
 
  
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 
 # Vanilla -O, which is the same as +O2
diff --git a/gdb/testsuite/gdb.hp/pxdb.exp b/gdb/testsuite/gdb.hp/pxdb.exp
index c8b3ace..ef34557 100644
--- a/gdb/testsuite/gdb.hp/pxdb.exp
+++ b/gdb/testsuite/gdb.hp/pxdb.exp
@@ -31,6 +31,8 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile pxdb
 set srcfile ${testfile}.c
 set objfile ${objdir}/${subdir}/${testfile}.o
@@ -39,9 +41,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 if [get_compiler_info ${binfile} "c++"] {
     return -1;
 }
- 
- 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+
+if { $gcc_compiled } then { continue }
 
 # To build a non-pxdb-ed file, use
 #
diff --git a/gdb/testsuite/gdb.hp/reg-test.exp b/gdb/testsuite/gdb.hp/reg-test.exp
index 4bdc306..d8b0f16 100644
--- a/gdb/testsuite/gdb.hp/reg-test.exp
+++ b/gdb/testsuite/gdb.hp/reg-test.exp
@@ -26,12 +26,9 @@ if $tracelevel then {
 	strace $tracelevel
 	}
 
-if ![istarget "hppa*-*-*"] {
-    verbose "Wide register test ignored for non-hppa targets."
-    return
-}
+if { [skip_hp_tests] } then { continue }
 
-set testfile "reg_test"
+set testfile "reg-test"
 set srcfile ${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 
diff --git a/gdb/testsuite/gdb.hp/sized-enum.exp b/gdb/testsuite/gdb.hp/sized-enum.exp
index 191050a..5588559 100644
--- a/gdb/testsuite/gdb.hp/sized-enum.exp
+++ b/gdb/testsuite/gdb.hp/sized-enum.exp
@@ -36,6 +36,8 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile "sized-enum"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
@@ -44,7 +46,7 @@ if [get_compiler_info ${binfile}] {
     return -1
 }
 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { 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."
diff --git a/gdb/testsuite/gdb.hp/so-thresh.exp b/gdb/testsuite/gdb.hp/so-thresh.exp
index 1977e92..1780416 100644
--- a/gdb/testsuite/gdb.hp/so-thresh.exp
+++ b/gdb/testsuite/gdb.hp/so-thresh.exp
@@ -24,10 +24,7 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
-# are we on a target board
-if ![isnative] then {
-    return
-}
+if { [skip_hp_tests] } then { continue }
 
 set testfile "so-thresh"
 set srcfile ${testfile}.c
diff --git a/gdb/testsuite/gdb.hp/start-stop.exp b/gdb/testsuite/gdb.hp/start-stop.exp
index 4f70f51..cb64aa6 100644
--- a/gdb/testsuite/gdb.hp/start-stop.exp
+++ b/gdb/testsuite/gdb.hp/start-stop.exp
@@ -54,6 +54,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 if { ![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"] } {
     verbose "HPUX thread test ignored for non-hppa or pre-HP/UX-10.30 targets."
     return 0
diff --git a/gdb/testsuite/gdb.hp/templ-hp.exp b/gdb/testsuite/gdb.hp/templ-hp.exp
index 64ca53d..5cdf0a1 100644
--- a/gdb/testsuite/gdb.hp/templ-hp.exp
+++ b/gdb/testsuite/gdb.hp/templ-hp.exp
@@ -33,6 +33,8 @@ if $tracelevel then {
 	strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile "templ-hp"
 set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
@@ -46,7 +48,7 @@ if [get_compiler_info ${binfile} "c++"] {
     return -1;
 }
 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
diff --git a/gdb/testsuite/gdb.hp/thr-lib.exp b/gdb/testsuite/gdb.hp/thr-lib.exp
index 53bf466..e40b469 100644
--- a/gdb/testsuite/gdb.hp/thr-lib.exp
+++ b/gdb/testsuite/gdb.hp/thr-lib.exp
@@ -50,6 +50,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 if { ![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"] } {
     verbose "HPUX thread test ignored for non-hppa or pre-HP/UX-10.30 targets."
     return 0
diff --git a/gdb/testsuite/gdb.hp/thr-stg.exp b/gdb/testsuite/gdb.hp/thr-stg.exp
index 19d69ee..7fc7a93 100644
--- a/gdb/testsuite/gdb.hp/thr-stg.exp
+++ b/gdb/testsuite/gdb.hp/thr-stg.exp
@@ -50,6 +50,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 if { ![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"] } {
     verbose "HPUX thread test ignored for non-hppa or pre-HP/UX-10.30 targets."
     return 0
diff --git a/gdb/testsuite/gdb.hp/virtfun-hp.exp b/gdb/testsuite/gdb.hp/virtfun-hp.exp
index f5b3637..2b3ee59 100644
--- a/gdb/testsuite/gdb.hp/virtfun-hp.exp
+++ b/gdb/testsuite/gdb.hp/virtfun-hp.exp
@@ -25,6 +25,8 @@ if $tracelevel then {
 	strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile "virtfun-hp"
 set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
@@ -32,9 +34,8 @@ set binfile ${objdir}/${subdir}/${testfile}
 if [get_compiler_info ${binfile} "c++"] {
     return -1;
 }
- 
- 
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+
+if { $gcc_compiled } 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."
diff --git a/gdb/testsuite/gdb.hp/watch-cmd.exp b/gdb/testsuite/gdb.hp/watch-cmd.exp
index a7e3b5c..236af71 100644
--- a/gdb/testsuite/gdb.hp/watch-cmd.exp
+++ b/gdb/testsuite/gdb.hp/watch-cmd.exp
@@ -27,6 +27,8 @@ if $tracelevel then {
 set prms_id 0
 set bug_id 0
 
+if { [skip_hp_tests] } then { continue }
+
 set testfile "run-hp"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
@@ -35,11 +37,6 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 
 }
 
-# are we on a target board
-if ![isnative] then {
-    return
-}
-
 if {![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"]} {
     #setup_xfail "*-*.*"
     return 0
@@ -48,7 +45,7 @@ if {![istarget "hppa*-*-hpux10.30"] && ![istarget "hppa*-*-hpux11.*"]} {
 if [get_compiler_info ${binfile}] {
     return -1;
 }
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.hp/watch-hp.exp b/gdb/testsuite/gdb.hp/watch-hp.exp
index a1c3fc8..068c1b7 100644
--- a/gdb/testsuite/gdb.hp/watch-hp.exp
+++ b/gdb/testsuite/gdb.hp/watch-hp.exp
@@ -23,6 +23,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
+
 set prms_id 0
 set bug_id 0
 
@@ -36,7 +38,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 if [get_compiler_info ${binfile}] {
     return -1;
 }
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 # Prepare for watchpoint tests by setting up two breakpoints and one
 # watchpoint.
diff --git a/gdb/testsuite/gdb.hp/xdb1.exp b/gdb/testsuite/gdb.hp/xdb1.exp
index 88ab2fc..f371852 100644
--- a/gdb/testsuite/gdb.hp/xdb1.exp
+++ b/gdb/testsuite/gdb.hp/xdb1.exp
@@ -23,6 +23,7 @@ if $tracelevel then {
         strace $tracelevel
         }
 
+if { [skip_hp_tests] } then { continue }
 
 global usestubs
 
@@ -42,7 +43,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 if [get_compiler_info ${binfile}] {
     return -1;
 }
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 global GDBFLAGS
 set saved_gdbflags $GDBFLAGS
diff --git a/gdb/testsuite/gdb.hp/xdb2.exp b/gdb/testsuite/gdb.hp/xdb2.exp
index 4cc7b34..9bcdf58 100644
--- a/gdb/testsuite/gdb.hp/xdb2.exp
+++ b/gdb/testsuite/gdb.hp/xdb2.exp
@@ -23,6 +23,8 @@ if $tracelevel then {
         strace $tracelevel
         }
 
+if { [skip_hp_tests] } then { continue }
+
 global message
 
 #
@@ -49,12 +51,11 @@ if  { [gdb_compile "${binfile}0.o ${binfile}1.o" ${binfile} executable {debug}]
     return -1
 }
 
-
 if [get_compiler_info ${binfile}] {
     return -1;
 }
-if {[skip_hp_tests $gcc_compiled]} then { continue }
 
+if { $gcc_compiled } then { continue }
 
 global GDBFLAGS
 set saved_gdbflags $GDBFLAGS
diff --git a/gdb/testsuite/gdb.hp/xdb3.exp b/gdb/testsuite/gdb.hp/xdb3.exp
index cf569e9..36c3ec9 100644
--- a/gdb/testsuite/gdb.hp/xdb3.exp
+++ b/gdb/testsuite/gdb.hp/xdb3.exp
@@ -22,6 +22,7 @@ if $tracelevel then {
         strace $tracelevel
 }
 
+if { [skip_hp_tests] } then { continue }
 
 set testfile1 "average"
 set testfile2 "sum"
@@ -45,7 +46,7 @@ if  { [gdb_compile "${binfile1}.o ${binfile2}.o" ${binfile} executable {debug}]
 if [get_compiler_info ${binfile}] {
     return -1;
 }
-if {[skip_hp_tests $gcc_compiled]} then { continue }
+if { $gcc_compiled } then { continue }
 
 
 proc xdb_reinitialize_dir { subdir } {
-- 
cgit v1.1