From 0b2f8a3bbb595a99dd7977caa6382aab25630115 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 28 Apr 2020 06:54:55 +0200 Subject: [PATCH] [gdb/testsuite] Remove KFAIL from gdb.base/info-macros.exp When running test-case gdb.base/info-macros.exp, we have: ... (gdb) KFAIL: gdb.base/info-macros.exp: info macros info-macros.c:42 \ (PRMS: gdb/NNNN) ... The described failure mode however: ... set test "info macros info-macros.c:42" set r1 ".*define DEF_MACROS" set r2 ".*define ONE" setup_kfail "gdb/NNNN" *-*-* gdb_test "$test" "$r1$r2" ... does not match the actual output, given that both defines are in fact printed. The pattern fails to match because it's missing a trailing ".*". Fix this by removing the KFAIL and adding the missing trailing ".*". Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-04-28 Tom de Vries * gdb.base/info-macros.exp: Remove KFAIL. Add missing trailing ".*". --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.base/info-macros.exp | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2972e273992..b51ec118b19 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2020-04-28 Tom de Vries + + * gdb.base/info-macros.exp: Remove KFAIL. Add missing trailing ".*". + 2020-04-28 Tom de Vries * gdb.ada/array_ptr_renaming.exp: Add PR number in KFAIL. diff --git a/gdb/testsuite/gdb.base/info-macros.exp b/gdb/testsuite/gdb.base/info-macros.exp index d525515efc9..f18281746d9 100644 --- a/gdb/testsuite/gdb.base/info-macros.exp +++ b/gdb/testsuite/gdb.base/info-macros.exp @@ -273,7 +273,4 @@ set test "info macros info-macros.c:42" set r1 ".*define DEF_MACROS" set r2 ".*define ONE" -# info macros on the line where the #define or #include is -# fails to find the macro defined (though it works on the next line.) -setup_kfail "gdb/NNNN" *-*-* -gdb_test "$test" "$r1$r2" +gdb_test "$test" "$r1$r2.*" -- 2.30.2