From d1fe6965e59a7ebd81b43b62c15d9002d086b610 Mon Sep 17 00:00:00 2001 From: David Carlton Date: Tue, 4 Feb 2003 01:09:03 +0000 Subject: [PATCH] 2003-02-03 David Carlton * gdb.c++/ovldbreak.exp (continue_to_bp_overloaded): Add 'might_kfail' arg. KFAIL some of the continue_to_bp_overloaded calls, according to PR c++/1025. --- gdb/testsuite/ChangeLog | 7 ++++++ gdb/testsuite/gdb.c++/ovldbreak.exp | 37 +++++++++++++++++++---------- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5c5ee5b651b..dde2a43f393 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2003-02-03 David Carlton + + * gdb.c++/ovldbreak.exp (continue_to_bp_overloaded): Add + 'might_kfail' arg. + KFAIL some of the continue_to_bp_overloaded calls, according to + PR c++/1025. + 2003-02-01 Michael Chastain * gdb.base/advance.c (marker1): New marker function. diff --git a/gdb/testsuite/gdb.c++/ovldbreak.exp b/gdb/testsuite/gdb.c++/ovldbreak.exp index 9852cb597b1..043243d23ff 100644 --- a/gdb/testsuite/gdb.c++/ovldbreak.exp +++ b/gdb/testsuite/gdb.c++/ovldbreak.exp @@ -312,7 +312,11 @@ gdb_test "info break" \ # Run through each breakpoint. -proc continue_to_bp_overloaded {bpnumber argtype actuals} { +# NOTE: carlton/2003-02-03: I'm seeing failures on some of the tests, +# with the wrong arg being printed out. Michael Chastain sees +# failures at times, too, albeit fewer than I do. + +proc continue_to_bp_overloaded {might_kfail bpnumber argtype actuals} { global gdb_prompt hex decimal srcfile send_gdb "continue\n" @@ -320,6 +324,13 @@ proc continue_to_bp_overloaded {bpnumber argtype actuals} { -re "Continuing.\r\n\r\nBreakpoint ${bpnumber}, (${hex} in )?foo::overload1arg(\\(${argtype}\\))? \\(this=${hex}(, )?${actuals}\\) at.*${srcfile}:${decimal}\r\n${decimal}\[\t \]+int foo::overload1arg \\(${argtype}( arg)?\\).*\r\n.*$gdb_prompt $" { pass "continue to bp overloaded : ${argtype}" } + -re "Continuing.\r\n\r\nBreakpoint ${bpnumber}, (${hex} in )?foo::overload1arg(\\(${argtype}\\))? \\(this=${hex}, arg=.*\\) at.*${srcfile}:${decimal}\r\n${decimal}\[\t \]+int foo::overload1arg \\(${argtype}( arg)?\\).*\r\n.*$gdb_prompt $" { + if $might_kfail { + kfail "gdb/1025" "continue to bp overloaded : ${argtype}" + } else { + fail "continue to bp overloaded : ${argtype}" + } + } -re ".*$gdb_prompt $" { fail "continue to bp overloaded : ${argtype}" } @@ -329,18 +340,18 @@ proc continue_to_bp_overloaded {bpnumber argtype actuals} { } } -continue_to_bp_overloaded 25 "(void|)" "" -continue_to_bp_overloaded 24 "char" "arg=2 \\'\\\\002\\'" -continue_to_bp_overloaded 23 "signed char" "arg=3 \\'\\\\003\\'" -continue_to_bp_overloaded 22 "unsigned char" "arg=4 \\'\\\\004\\'" -continue_to_bp_overloaded 21 "short" "arg=5" -continue_to_bp_overloaded 20 "unsigned short" "arg=6" -continue_to_bp_overloaded 19 "int" "arg=7" -continue_to_bp_overloaded 18 "(unsigned|unsigned int)" "arg=8" -continue_to_bp_overloaded 17 "long" "arg=9" -continue_to_bp_overloaded 16 "unsigned long" "arg=10" -continue_to_bp_overloaded 15 "float" "arg=100" -continue_to_bp_overloaded 14 "double" "arg=200" +continue_to_bp_overloaded 0 25 "(void|)" "" +continue_to_bp_overloaded 1 24 "char" "arg=2 \\'\\\\002\\'" +continue_to_bp_overloaded 1 23 "signed char" "arg=3 \\'\\\\003\\'" +continue_to_bp_overloaded 1 22 "unsigned char" "arg=4 \\'\\\\004\\'" +continue_to_bp_overloaded 1 21 "short" "arg=5" +continue_to_bp_overloaded 1 20 "unsigned short" "arg=6" +continue_to_bp_overloaded 0 19 "int" "arg=7" +continue_to_bp_overloaded 0 18 "(unsigned|unsigned int)" "arg=8" +continue_to_bp_overloaded 0 17 "long" "arg=9" +continue_to_bp_overloaded 0 16 "unsigned long" "arg=10" +continue_to_bp_overloaded 0 15 "float" "arg=100" +continue_to_bp_overloaded 1 14 "double" "arg=200" -- 2.30.2