From 7930c920e445cabecd07bb9a471dd439e39e6481 Mon Sep 17 00:00:00 2001
From: Elena Zannoni <ezannoni@kwikemart.cygnus.com>
Date: Fri, 15 Jan 1999 19:10:52 +0000
Subject: [PATCH] Fri Jan 15 14:04:57 1999  Elena Zannoni 
 <ezannoni@kwikemart.cygnus.com>

	* gdb.hp/watch-cmd.exp: do not execute unless on hppa-hpux platform
	and compiled w/o GCC.

	* gdb.hp/watch-hp.exp: ditto.

	* gdb.hp/xdb1.exp: ditto.

	* gdb.hp/xdb2.exp: ditto.

	* gdb.hp/dbx.exp: ditto.
---
 gdb/testsuite/ChangeLog            | 13 +++++++++++++
 gdb/testsuite/gdb.hp/dbx.exp       |  5 +++++
 gdb/testsuite/gdb.hp/watch-cmd.exp | 19 +++++++++++++++++++
 gdb/testsuite/gdb.hp/watch-hp.exp  |  5 +++++
 gdb/testsuite/gdb.hp/xdb1.exp      |  6 ++++++
 gdb/testsuite/gdb.hp/xdb2.exp      |  7 +++++++
 6 files changed, 55 insertions(+)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 00f78b53d6..8c5e0f33d4 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+Fri Jan 15 14:04:57 1999  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
+
+	* gdb.hp/watch-cmd.exp: do not execute unless on hppa-hpux platform 
+	and compiled w/o GCC. 
+
+	* gdb.hp/watch-hp.exp: ditto.
+
+	* gdb.hp/xdb1.exp: ditto.
+
+	* gdb.hp/xdb2.exp: ditto.
+
+	* gdb.hp/dbx.exp: ditto.
+
 Thu Jan 14 18:36:48 1999  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* constvars.c: Remove C++-isms.
diff --git a/gdb/testsuite/gdb.hp/dbx.exp b/gdb/testsuite/gdb.hp/dbx.exp
index ea953f3d52..66f24e90a5 100644
--- a/gdb/testsuite/gdb.hp/dbx.exp
+++ b/gdb/testsuite/gdb.hp/dbx.exp
@@ -22,6 +22,7 @@ if $tracelevel then {
         strace $tracelevel
 }
 
+
 set testfile1 "average"
 set testfile2 "sum"
 set testfile "dbx-test"
@@ -43,6 +44,10 @@ 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."
 }
 
+if [get_compiler_info ${binfile}] {
+    return -1;
+}
+if {[skip_hp_tests $gcc_compiled]} then { continue }
 
 proc dbx_reinitialize_dir { subdir } {
     global gdb_prompt
diff --git a/gdb/testsuite/gdb.hp/watch-cmd.exp b/gdb/testsuite/gdb.hp/watch-cmd.exp
index 968a524098..a7e3b5c513 100644
--- a/gdb/testsuite/gdb.hp/watch-cmd.exp
+++ b/gdb/testsuite/gdb.hp/watch-cmd.exp
@@ -35,6 +35,22 @@ 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
+}
+
+if [get_compiler_info ${binfile}] {
+    return -1;
+}
+if {[skip_hp_tests $gcc_compiled]} then { continue }
+
+
 gdb_exit
 gdb_start
 delete_breakpoints
@@ -144,3 +160,6 @@ watchpoint_command_test
 
 
 
+
+
+
diff --git a/gdb/testsuite/gdb.hp/watch-hp.exp b/gdb/testsuite/gdb.hp/watch-hp.exp
index e25441b100..a1c3fc823f 100644
--- a/gdb/testsuite/gdb.hp/watch-hp.exp
+++ b/gdb/testsuite/gdb.hp/watch-hp.exp
@@ -33,6 +33,11 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 }
 
+if [get_compiler_info ${binfile}] {
+    return -1;
+}
+if {[skip_hp_tests $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 57e20daaab..88ab2fc586 100644
--- a/gdb/testsuite/gdb.hp/xdb1.exp
+++ b/gdb/testsuite/gdb.hp/xdb1.exp
@@ -23,6 +23,7 @@ if $tracelevel then {
         strace $tracelevel
         }
 
+
 global usestubs
 
 #
@@ -38,6 +39,11 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 }
 
+if [get_compiler_info ${binfile}] {
+    return -1;
+}
+if {[skip_hp_tests $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 b138ee39bf..4cc7b341e0 100644
--- a/gdb/testsuite/gdb.hp/xdb2.exp
+++ b/gdb/testsuite/gdb.hp/xdb2.exp
@@ -49,6 +49,13 @@ 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 }
+
+
 global GDBFLAGS
 set saved_gdbflags $GDBFLAGS
 set GDBFLAGS "$GDBFLAGS --xdb"