From e3a91079b5e5669567424d3b2f31b48b7b89ef72 Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Mon, 16 Apr 2018 20:58:14 +0200 Subject: [PATCH] Adjust more test cases to changed output of info var/func/type After this commit: b744723f57 -- Show line numbers in output for "info var/func/type" the test cases dbx.exp and info-fun.exp yield new FAILs because two regular expressions have not been adjusted to the changed output yet. This is fixed. gdb/testsuite/ChangeLog: * gdb.base/dbx.exp (test_whereis): Adjust regexp to added line number information in output of "whereis" command. * gdb.base/info-fun.exp: Likewise, for "info fun" command. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/dbx.exp | 2 +- gdb/testsuite/gdb.base/info-fun.exp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ed464a1..749c01a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-04-16 Andreas Arnez + + * gdb.base/dbx.exp (test_whereis): Adjust regexp to added line + number information in output of "whereis" command. + * gdb.base/info-fun.exp: Likewise, for "info fun" command. + 2018-04-13 Andreas Arnez * gdb.ada/info_types.exp: Adjust expected output to the line diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp index 0cc5e82..40e0238 100644 --- a/gdb/testsuite/gdb.base/dbx.exp +++ b/gdb/testsuite/gdb.base/dbx.exp @@ -267,7 +267,7 @@ proc test_assign { } { #test_whereis # proc test_whereis { } { - gdb_test "whereis my_list" "All variables matching regular expression \"my_list\":\r\n\r\nFile.*average\.c:\r\nstatic int my_list\\\[10\\\];" + gdb_test "whereis my_list" "All variables matching regular expression \"my_list\":\r\n\r\nFile.*average\.c:\r\n.*\tstatic int my_list\\\[10\\\];" } # diff --git a/gdb/testsuite/gdb.base/info-fun.exp b/gdb/testsuite/gdb.base/info-fun.exp index f298bf7..d527dac 100644 --- a/gdb/testsuite/gdb.base/info-fun.exp +++ b/gdb/testsuite/gdb.base/info-fun.exp @@ -63,7 +63,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" { set match_str {All functions matching regular expression "foo":[\r\n]*} if { "$libsepdebug" != "NO" } { append match_str {File .*/info-fun-solib[.]c:[\r\n]*} - append match_str {int foo\(void\);[\r\n]*} + append match_str {\d+:\tint foo\(void\);[\r\n]*} } append match_str {Non-debugging symbols:[\r\n]*} # Note: Targets like {m68k,ppc64,s390x}-linux also have, e.g., -- 2.7.4