* gdb.hp/gdb.defects/bs15503.exp: Only run this test if compiling

        with HP's compiler.
        * 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.hp/gdb.defects/solib-d.exp: Update to handle building with
        either HP's compilers or GCC.

4 files changed, 40 insertions, 0 deletions

diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp
index 2feed4b3532..70d9d0c983d 100644
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp
+++ b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp
@@ -14,6 +14,16 @@ set objdbgdir ${objdir}/${subdir}/objdbg01
 set binfile ${objdbgdir}/${testfile}
 set symaddrfile ${toolssubdir}/symaddr
 
+# Create and source the file that provides information about the compiler
+# used to compile the test case.
+if [get_compiler_info ${binfile}] {
+    return -1
+}
+
+if {!$hp_aCC_compiler && !$hp_cc_compiler} {
+  return 0
+}
+
 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."
 }
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp
index 7a7e57a211b..fcd0fdc9b44 100644
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp
+++ b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp
@@ -13,6 +13,16 @@ set objdbgdir ${objdir}/${subdir}/objdbg02
 set binfile ${objdbgdir}/${testfile}
 set toolssubdir ${srcdir}/${subdir}/tools
 
+# Create and source the file that provides information about the compiler
+# used to compile the test case.
+if [get_compiler_info ${binfile}] {
+    return -1
+}
+
+if {!$hp_aCC_compiler && !$hp_cc_compiler} {
+  return 0
+}
+
 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."
 }
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp
index baaa02adcd7..1e549476f31 100644
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp
+++ b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp
@@ -18,6 +18,16 @@ if [istarget "hppa64-*-*"] {
   set symaddrfile ${toolssubdir}/symaddr
 }
 
+# Create and source the file that provides information about the compiler
+# used to compile the test case.
+if [get_compiler_info ${binfile}] {
+    return -1
+}
+
+if {!$hp_aCC_compiler && !$hp_cc_compiler} {
+  return 0
+}
+
 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."
 }
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04.exp
index f6782745619..c57f4c0e056 100644
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04.exp
+++ b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04.exp
@@ -14,6 +14,16 @@ set binfile ${objdbgdir}/${testfile}
 set toolssubdir ${srcdir}/${subdir}/tools
 set symaddrfile ${toolssubdir}/symaddr
 
+# Create and source the file that provides information about the compiler
+# used to compile the test case.
+if [get_compiler_info ${binfile}] {
+    return -1
+}
+
+if {!$hp_aCC_compiler && !$hp_cc_compiler} {
+  return 0
+}
+
 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."
 }