OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

testsuite: ovldbreak.exp: fix regexp

Browse Source 
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.
This commit is contained in:
Alan Hayward 2018-10-18 14:36:06 +01:00
parent 1f1ae3a34f
commit 2bc69f2588
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2018-10-19 Alan Hayward <alan.hayward@arm.com>
* gdb.cp/ovldbreak.exp: Fix regexps.
2018-10-19 Alan Hayward <alan.hayward@arm.com> 2018-10-19 Alan Hayward <alan.hayward@arm.com>
* gdb.compile/compile-cplus-print.exp: Start inferior earlier. * gdb.compile/compile-cplus-print.exp: Start inferior earlier.

10
gdb/testsuite/gdb.cp/ovldbreak.exp
View File

@ -208,11 +208,11 @@ for {set idx 0} {$idx < [llength $overloads]} {incr idx} {
} }
# Verify the breakpoints. # Verify the breakpoints.
set bptable "Num Type\[\t \]+Disp Enb Address\[\t \]+What.*" set bptable "Num\[\t \]+Type\[\t \]+Disp Enb Address\[\t \]+What.*\[\r\n]+"
append bptable "\[0-9\]+\[\t \]+breakpoint keep y\[\t \]+$hex\[\t \]+in main(\\((|void)\\))? at.*$srcfile:49\[\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\]+" append bptable "\[\t \]+breakpoint already hit 1 time\[\r\n\]+."
foreach ovld $overloads { 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"))] $line($type_map("$ovld"))]
} }
gdb_test "info break" $bptable "breakpoint info (after setting one-by-one)" 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". # 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\]+" append bptable "\[0-9\]+\[\t \]+breakpoint\[\t \]+keep\[\t \]y\[\t \]+<MULTIPLE>.*\[\r\n\]+"
foreach ovld {void char signed_char unsigned_char short_int \ foreach ovld {void char signed_char unsigned_char short_int \
unsigned_short_int int unsigned_int long_int \ unsigned_short_int int unsigned_int long_int \