From 2604c0dc3b89dcf7114de4ce71b7556bf4bf6913 Mon Sep 17 00:00:00 2001 From: Bruno Larsen Date: Tue, 4 Oct 2022 19:07:46 +0200 Subject: [PATCH 1/1] gdb/testsuite: remove XFAIL on gdb.cp/temargs.exp gdb.cp/temargs.exp last 2 tests always setup an XFAILs, despite checking for old gcc versions. However, Clang does not fail in this test, turning into XPASSes and slighty annoying when comparing between compilers. To change this, make the xfails only happen if we using gcc. Approved-by: Tom Tromey --- gdb/testsuite/gdb.cp/temargs.exp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.cp/temargs.exp b/gdb/testsuite/gdb.cp/temargs.exp index 05fd902bb83..22c29cc7d8a 100644 --- a/gdb/testsuite/gdb.cp/temargs.exp +++ b/gdb/testsuite/gdb.cp/temargs.exp @@ -46,6 +46,8 @@ if {[test_compiler_info {gcc-[0-3]-*}] set have_pr_45024_fixed 0 } +set using_gcc [test_compiler_info gcc-*-*] + set line [gdb_get_line_number "Breakpoint 1" $srcfile] gdb_test "break $srcfile:$line" "Breakpoint 2.*" \ "set first breakpoint for temargs" @@ -190,10 +192,10 @@ gdb_test "print F" "&S::somefunc" "test value of F in k2_m" gdb_continue_to_breakpoint "continue to sixth breakpoint for temargs" if $have_older_template_gcc { setup_xfail "*-*-*" -} else { setup_xfail gcc/49546 "*-*-*" } +} elseif { $using_gcc } { setup_xfail gcc/49546 "*-*-*" } gdb_test "ptype F" {type = void \(\*\)\(int\)} "test type of F in k3_m" if $have_older_template_gcc { setup_xfail "*-*-*" -} else { setup_xfail gcc/49546 "*-*-*" } +} elseif { $using_gcc } { setup_xfail gcc/49546 "*-*-*" } gdb_test "print F" { = \(void \(\*\)\(int\)\) 0x[0-9a-f]+ } \ "test value of F in k3_m" -- 2.30.2