From d9a472877066d56b0546af71890bc92eef85df67 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 6 Jun 2014 19:16:47 +0800 Subject: [PATCH] Restrict the pattern in gdb.base/jit.exp I see the following fail in some thumb multi-lib in arm-none-linux-gnueabi, info function jit_function^M All functions matching regular expression "jit_function":^M ^M Non-debugging symbols:^M 0x00000790 __real_jit_function_XXXX^M 0x0000079c __jit_function_XXXX_from_arm^M 0x0000079c jit_function_0000^M 0x00000790 __real_jit_function_XXXX^M 0x0000079c __jit_function_XXXX_from_arm^M 0x0000079c jit_function_0001^M (gdb) FAIL: gdb.base/jit.exp: one_jit_test-2: info function jit_function the test expects to see only jit_function_0000 and jit_function_0001 one_jit_test 2 "${hex} jit_function_0000\[\r\n\]+${hex} jit_function_0001" Symbols with the prefix "__real_" or suffix "_from_arm" is generated by gcc/ld for arm/thumb interworking. This patch is to restrict the pattern from "jit_function" to "^jit_function", the output becomes expected. gdb/testsuite: 2014-06-06 Yao Qi * gdb.base/jit.exp (one_jit_test): Restrict the pattern from "jit_function" to "^jit_function". --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/jit.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5484618aa63..c513d0833be 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-06-06 Yao Qi + + * gdb.base/jit.exp (one_jit_test): Restrict the pattern + from "jit_function" to "^jit_function". + 2014-06-06 Yao Qi * gdb.base/async.c (foo): Add one statement. diff --git a/gdb/testsuite/gdb.base/jit.exp b/gdb/testsuite/gdb.base/jit.exp index 366c8b387eb..ca6e6c3430b 100644 --- a/gdb/testsuite/gdb.base/jit.exp +++ b/gdb/testsuite/gdb.base/jit.exp @@ -93,7 +93,7 @@ proc one_jit_test {count match_str} { gdb_breakpoint [gdb_get_line_number "break here 1"] gdb_continue_to_breakpoint "break here 1" - gdb_test "info function jit_function" "$match_str" + gdb_test "info function ^jit_function" "$match_str" # This is just to help debugging when things fail if {$verbose > 0} { -- 2.30.2