From 2bc69f2588c0beef39a56f057f61f6a063ed4405 Mon Sep 17 00:00:00 2001 From: Alan Hayward Date: Thu, 18 Oct 2018 14:36:06 +0100 Subject: [PATCH] testsuite: ovldbreak.exp: fix regexp Fix the layout used in the regexp for breakpoints. Gets rid of two FAILS. 2018-10-18 Alan Hayward * gdb.cp/ovldbreak.exp: Fix regexps. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.cp/ovldbreak.exp | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0f0017593c..0cc9e445ea 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2018-10-19 Alan Hayward + + * gdb.cp/ovldbreak.exp: Fix regexps. + 2018-10-19 Alan Hayward * gdb.compile/compile-cplus-print.exp: Start inferior earlier. diff --git a/gdb/testsuite/gdb.cp/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovldbreak.exp index 9a2efc115e..f3f329d293 100644 --- a/gdb/testsuite/gdb.cp/ovldbreak.exp +++ b/gdb/testsuite/gdb.cp/ovldbreak.exp @@ -208,11 +208,11 @@ for {set idx 0} {$idx < [llength $overloads]} {incr idx} { } # Verify the breakpoints. -set bptable "Num Type\[\t \]+Disp Enb Address\[\t \]+What.*" -append bptable "\[0-9\]+\[\t \]+breakpoint keep y\[\t \]+$hex\[\t \]+in main(\\((|void)\\))? at.*$srcfile:49\[\r\n\]+" -append bptable "\[\t \]+breakpoint already hit 1 time\[\r\n\]+" +set bptable "Num\[\t \]+Type\[\t \]+Disp Enb Address\[\t \]+What.*\[\r\n]+" +append bptable "\[0-9\]+\[\t \]+breakpoint\[\t \]+keep\[\t \]y\[\t \]+$hex\[\t \]+in main(\\((|void)\\))? at.*$srcfile:4\[89\]\[\r\n\]+" +append bptable "\[\t \]+breakpoint already hit 1 time\[\r\n\]+." foreach ovld $overloads { - append bptable [format "\[0-9\]+\[\t \]+breakpoint keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(%s\\) at.*$srcfile:%d\[\r\n\]+" $ovld \ + append bptable [format "\[0-9\]+\[\t \]+breakpoint\[\t \]+keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(%s\\) at.*$srcfile:%d\[\r\n\]+" $ovld \ $line($type_map("$ovld"))] } gdb_test "info break" $bptable "breakpoint info (after setting one-by-one)" @@ -317,7 +317,7 @@ gdb_expect { } # Create the breakpoint table for "info breakpoint". -set bptable "Num Type\[\t \]+Disp Enb Address\[\t \]+What.*\[\r\n]+" +set bptable "Num\[\t \]+Type\[\t \]+Disp Enb Address\[\t \]+What.*\[\r\n]+" append bptable "\[0-9\]+\[\t \]+breakpoint\[\t \]+keep\[\t \]y\[\t \]+.*\[\r\n\]+" foreach ovld {void char signed_char unsigned_char short_int \ unsigned_short_int int unsigned_int long_int \