diff options
| author | Alan Hayward <alan.hayward@arm.com> | 2018-10-18 14:36:06 +0100 |
|---|---|---|
| committer | Alan Hayward <alan.hayward@arm.com> | 2018-10-19 11:13:40 +0100 |
| commit | 2bc69f2588c0beef39a56f057f61f6a063ed4405 (patch) | |
| tree | 47b6ff1a754818b3312a6e6537e4e56483dafef9 /gdb/testsuite | |
| parent | 1f1ae3a34faf8217bd253fa12b4d0abaaa42c2d2 (diff) | |
| download | gdb-2bc69f2588c0beef39a56f057f61f6a063ed4405.zip gdb-2bc69f2588c0beef39a56f057f61f6a063ed4405.tar.gz gdb-2bc69f2588c0beef39a56f057f61f6a063ed4405.tar.bz2 | |
testsuite: ovldbreak.exp: fix regexp
Fix the layout used in the regexp for breakpoints.
Gets rid of two FAILS.
2018-10-18 Alan Hayward <alan.hayward@arm.com>
* gdb.cp/ovldbreak.exp: Fix regexps.
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | 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 0f00175..0cc9e44 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2018-10-19 Alan Hayward <alan.hayward@arm.com> + * gdb.cp/ovldbreak.exp: Fix regexps. + +2018-10-19 Alan Hayward <alan.hayward@arm.com> + * gdb.compile/compile-cplus-print.exp: Start inferior earlier. 2018-10-18 Sergio Durigan Junior <sergiodj@redhat.com> diff --git a/gdb/testsuite/gdb.cp/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovldbreak.exp index 9a2efc1..f3f329d 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 \]+<MULTIPLE>.*\[\r\n\]+" foreach ovld {void char signed_char unsigned_char short_int \ unsigned_short_int int unsigned_int long_int \ |