[v2,8/9] gdb/testsuite: remove XFAIL on gdb.cp/temargs.exp

Message ID 20221107134604.596986-9-blarsen@redhat.com
State Committed
Headers
Series Cleanup gdb.cp tests when running with clang |

Commit Message

Bruno Larsen Nov. 7, 2022, 1:46 p.m. UTC
  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.
---
 gdb/testsuite/gdb.cp/temargs.exp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
  

Comments

Tom Tromey Nov. 10, 2022, 6:21 p.m. UTC | #1
>>>>> "Bruno" == Bruno Larsen via Gdb-patches <gdb-patches@sourceware.org> writes:

Bruno> gdb.cp/temargs.exp last 2 tests always setup an XFAILs, despite checking
Bruno> for old gcc versions.  However, Clang does not fail in this test,
Bruno> turning into XPASSes and slighty annoying when comparing between
Bruno> compilers.  To change this, make the xfails only happen if we using gcc.

Bruno>  if $have_older_template_gcc { setup_xfail "*-*-*"
Bruno> -} else { setup_xfail gcc/49546 "*-*-*" }
Bruno> +} elseif $using_gcc { setup_xfail gcc/49546 "*-*-*" }
...
Bruno> +} elseif $using_gcc { setup_xfail gcc/49546 "*-*-*" }

IMO it's better Tcl style to brace the condition, like "elseif {$using_gcc}"

This is ok with this tweak.

Tom
  

Patch

diff --git a/gdb/testsuite/gdb.cp/temargs.exp b/gdb/testsuite/gdb.cp/temargs.exp
index 05fd902bb83..2a927d8651b 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]+ <S3::m\(int\)>} \
 	 "test value of F in k3_m"