* gdb.base/info-fun.exp: Fix failures on m68k, ppc64, s390x.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f85848b..06b05f9 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-02  Doug Evans  <dje@google.com>
+
+       * gdb.base/info-fun.exp: Fix failures on m68k, ppc64, s390x.
+
 2012-08-02  Sergio Durigan Junior  <sergiodj@redhat.com>
 
        * gdb.base/pc-fp.exp: Adjust testcase to match different outputs from

diff --git a/gdb/testsuite/gdb.base/info-fun.exp b/gdb/testsuite/gdb.base/info-fun.exp
index 627d8fb..2b43652 100644 (file)
--- a/gdb/testsuite/gdb.base/info-fun.exp
+++ b/gdb/testsuite/gdb.base/info-fun.exp
@@ -67,9 +67,17 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
        append match_str {int foo\(void\);[\r\n]*}
     }
     append match_str {Non-debugging symbols:[\r\n]*}
+    # Note: Targets like {m68k,ppc64,s390x}-linux also have, e.g.,
+    # 00000011.plt_call.foo+0 (m68k).
+    set plt_foo_match "($hex \[^\r\n\]*plt\[^\r\n\]*foo\[^\r\n\]*\[\r\n\]*)?"
+    append match_str $plt_foo_match
+    # This text we want to match precisely.
     append match_str "$hex *foo(@plt)?\[\r\n\]*"
+    # Watch for again to not have to worry about the order of appearance.
+    append match_str $plt_foo_match
     if { "$libsepdebug" == "NO"  } {
-       append match_str "$hex *foo\[\r\n\]*"
+       # Note: The ".?" is for targets like m68k-linux that have ".foo" here.
+       append match_str "$hex *.?foo\[\r\n\]*"
     }
 
     gdb_test "info fun foo" "$match_str"