[ChangeLog]

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / so-indr-cl.exp

diff --git a/gdb/testsuite/gdb.base/so-indr-cl.exp b/gdb/testsuite/gdb.base/so-indr-cl.exp
index e37878e4a6b2aa76221bc5694d58a4d89d550f63..1232cebabe9e121a15c47d9dc289fc65f9ddc0f0 100644 (file)
--- a/gdb/testsuite/gdb.base/so-indr-cl.exp
+++ b/gdb/testsuite/gdb.base/so-indr-cl.exp
@@ -1,4 +1,4 @@
-#   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+#   Copyright 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -33,8 +33,9 @@ if ![isnative] then {
 # that we use HP-UX-specific compiler & linker options to build
 # the testcase.
 #
-setup_xfail "*-*-*"
-clear_xfail "hppa*-*-*hpux*"
+if {! [istarget "hppa*-*-*hpux*"] } {
+    return
+}
 
 set libfile "solib"
 set testfile "so-indr-cl"
@@ -51,13 +52,8 @@ if [get_compiler_info ${binfile}] {
 #remote_exec build "$CC -g +z -c ${libfile}1.c -o ${libfile}1.o"
 
 
-if {$gcc_compiled == 0} {
-    if [istarget "hppa*-hp-hpux*"] then {
-       set additional_flags "additional_flags=+z"
-    } else {
-       # don't know what the compiler is...
-       set additional_flags ""
-    }
+if {$hp_cc_compiler || $hp_aCC_compiler} {
+    set additional_flags "additional_flags=+z"
 } else {
     set additional_flags "additional_flags=-fpic"
 }
@@ -77,13 +73,8 @@ if [istarget "hppa*-hp-hpux*"] then {
 #remote_exec build "$CC -Aa -g ${srcfile} ${libfile}1.sl -o ${binfile}"
 
 
-if {$gcc_compiled == 0} {
-    if [istarget "hppa*-hp-hpux*"] then {
-       set additional_flags "additional_flags=-Ae"
-    } else {
-       # don't know what the compiler is, hope for the best, maybe it's ANSI...
-       set additional_flags ""
-    }
+if {$hp_cc_compiler} {
+    set additional_flags "additional_flags=-Ae"
 } else {
     set additional_flags ""
 }
@@ -119,6 +110,8 @@ send_gdb "break solib_main\n"
 gdb_expect {
   -re "Cannot break on solib_main without a running program.*$gdb_prompt $"\
           {pass "break on indirect solib call before running"}
+  -re "Breakpoint.*deferred.*\\(\"solib_main\" was not found.*$gdb_prompt $"\
+         {pass "break on indirect solib call before running 2"}
   -re "$gdb_prompt $"\
           {fail "break on indirect solib call before running"}
   timeout {fail "(timeout) break on indirect solib call before running"}