* gdb.hp/gdb.base-hp/hwwatchbus.exp: Allow inferior to get either

        a SIGBUS or SIGSEGV.

        * gdb.hp/gdb.base-hp/so-thresh.exp: Remove useless send_user command.

        * gdb.hp/gdb.defects/bs14602.exp: Revamp slightly so that test
        can be compiled with either HP's compiler or GCC.

4 files changed, 26 insertions, 12 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index cdfef4e9b42..dceae82e2e7 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -7,6 +7,14 @@
 
 Thu Dec 20 09:54:36 2001  Jeffrey A Law  (law@redhat.com)
 
+	* gdb.hp/gdb.base-hp/hwwatchbus.exp: Allow inferior to get either
+	a SIGBUS or SIGSEGV.
+
+	* gdb.hp/gdb.base-hp/so-thresh.exp: Remove useless send_user command.
+
+	* gdb.hp/gdb.defects/bs14602.exp: Revamp slightly so that test
+	can be compiled with either HP's compiler or GCC.
+
 	* gdb.hp/gdb.threads-hp/usrthbasic.exp: Disable completely.
 	* gdb.hp/gdb.threads-hp/usrthcore.exp: Disable completely.
 	* gdb.hp/gdb.threads-hp/usrthfork.exp: Disable completely.
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp
index 1affdca18f2..3e529f8c0e6 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp
@@ -54,7 +54,7 @@ gdb_load ${binfile}
 
 
 # We ought to be able to set a hardware watchpoint, step, and
-# get a SIGBUS signal reported.
+# get a SIGBUS or SIGSEGV signal reported.
 #
 if ![runto_main] then {
   fail "can't run to main"
@@ -72,11 +72,11 @@ gdb_expect {
 
 send_gdb "step\n"
 gdb_expect {
-  -re "Program received signal SIGBUS, Bus error.* in main .*${srcfile}:8.*$gdb_prompt $"\
-          {pass "see real SIGBUS when h/w watchpoint set"}
+  -re "Program received signal (SIGBUS|SIGSEGV), (Bus error|Segmentation fault).* in main .*${srcfile}:8.*$gdb_prompt $"\
+          {pass "see real signal when h/w watchpoint set"}
   -re "$gdb_prompt $"\
-          {fail "see real SIGBUS when h/w watchpoint set"}
-  timeout {fail "(timeout) see real SIGBUS when h/w watchpoint set"}
+          {fail "see real signal when h/w watchpoint set"}
+  timeout {fail "(timeout) see real signal when h/w watchpoint set"}
 }
 
 remote_exec build "mv ${binfile} ${binfile}.bak"
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.exp
index 82e020fadcb..0a5de66d1ef 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.exp
@@ -63,7 +63,6 @@ set timeout 60
 #
 # remote_exec build "sh -c \\\"cd ${objdir}/${subdir}\\; make -v -f ${srcdir}/${subdir}/${testfile}.mk clean require_shlibs all SRCDIR=${srcdir}/${subdir} OBJDIR=${objdir}/${subdir}\\\""
 
-send_user "Making with '${srcdir}/${subdir}/${testfile}.sh $subdir ...\n"
 remote_exec build "${srcdir}/${subdir}/${testfile}.sh $subdir"
 
 # Only HP-UX (and any other platforms using SOM shared libraries, I
diff --git a/gdb/testsuite/gdb.hp/gdb.defects/bs14602.exp b/gdb/testsuite/gdb.hp/gdb.defects/bs14602.exp
index 24b7537916a..d1500f01bd0 100644
--- a/gdb/testsuite/gdb.hp/gdb.defects/bs14602.exp
+++ b/gdb/testsuite/gdb.hp/gdb.defects/bs14602.exp
@@ -17,16 +17,23 @@ set prms_id 0
 set bug_id 0
 
 
-# set up appropriate compile option to recognize long double
-set ansi_option ""
-if [istarget "hppa*-*-*"] {
-    set ansi_option "-Ae"
-}
-
 set testfile bs14602
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
+# Create and source the file that provides information about the compiler
+# used to compile the test case.
+if [get_compiler_info ${binfile}] {
+    return -1;
+}
+
+# set up appropriate compile option to recognize long double
+if {$hp_aCC_compiler || $hp_cc_compiler} {
+    set ansi_option "-Ae"
+} else {
+    set ansi_option ""
+}
+
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "$binfile" executable "debug {additional_flags=${ansi_option}}"] != "" } {
     perror "Couldn't compile ${srcfile}"
     return -1