darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a racy FAIL.

Browse source 
* gdb.base/auxv.exp (fetch_auxv): Fix trailing newlines consumption.
	* gdb.base/callfuncs.exp (fetch_all_registers): Likewise.
This commit is contained in:
Jan Kratochvil 2009-03-22 21:11:45 +00:00
parent f3b1572e1a
commit bcd5727bdd
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,9 @@
2009-03-22 Jan Kratochvil <jan.kratochvil@redhat.com>
Fix a racy FAIL.
* gdb.base/auxv.exp (fetch_auxv): Fix trailing newlines consumption.
* gdb.base/callfuncs.exp (fetch_all_registers): Likewise.
2009-03-21 Thiago Jung Bauermann <bauerman@br.ibm.com>
* gdb.python/python-cmd.exp: Add tests for keyword arguments.

12
gdb/testsuite/gdb.base/auxv.exp
View file

@ -78,8 +78,10 @@ proc fetch_auxv {test} {
set auxv_lines {}
set bad -1
# Former trailing `\[\r\n\]+' may eat just \r leaving \n in the buffer
# corrupting the next matches.
if {[gdb_test_multiple "info auxv" $test {
-re "info auxv\[\r\n\]+" {
-re "info auxv\r\n" {
exp_continue
}
-ex "The program has no auxiliary information now" {
@ -94,20 +96,20 @@ proc fetch_auxv {test} {
set bad 1
exp_continue
}
-re "^\[0-9\]+\[ \t\]+(AT_\[^ \t\]+)\[^\r\n\]+\[\r\n\]+" {
-re "^\[0-9\]+\[ \t\]+(AT_\[^ \t\]+)\[^\r\n\]+\r\n" {
lappend auxv_lines $expect_out(0,string)
exp_continue
}
-re "^\[0-9\]+\[ \t\]+\\?\\?\\?\[^\r\n\]+\[\r\n\]+" {
-re "^\[0-9\]+\[ \t\]+\\?\\?\\?\[^\r\n\]+\r\n" {
warning "Unrecognized tag value: $expect_out(0,string)"
set bad 1
lappend auxv_lines $expect_out(0,string)
exp_continue
}
-re ".*$gdb_prompt $" {
-re "$gdb_prompt $" {
incr bad
}
-re "^\[^\r\n\]+\[\r\n\]+" {
-re "^\[^\r\n\]+\r\n" {
if {!$bad} {
warning "Unrecognized output: $expect_out(0,string)"
set bad 1

12
gdb/testsuite/gdb.base/callfuncs.exp
View file

@ -249,15 +249,17 @@ proc fetch_all_registers {test} {
set all_registers_lines {}
set bad -1
# Former trailing `\[\r\n\]+' may eat just \r leaving \n in the buffer
# corrupting the next matches.
if {[gdb_test_multiple "info all-registers" $test {
-re "info all-registers\[\r\n\]+" {
-re "info all-registers\r\n" {
exp_continue
}
-ex "The program has no registers now" {
set bad 1
exp_continue
}
-re "^bspstore\[ \t\]+\[^\r\n\]+\[\r\n\]+" {
-re "^bspstore\[ \t\]+\[^\r\n\]+\r\n" {
if [istarget "ia64-*-*"] {
# Filter out bspstore which is specially tied to bsp,
# giving spurious differences.
@ -266,14 +268,14 @@ proc fetch_all_registers {test} {
}
exp_continue
}
-re "^\[^ \t\]+\[ \t\]+\[^\r\n\]+\[\r\n\]+" {
-re "^\[^ \t\]+\[ \t\]+\[^\r\n\]+\r\n" {
lappend all_registers_lines $expect_out(0,string)
exp_continue
}
-re ".*$gdb_prompt $" {
-re "$gdb_prompt $" {
incr bad
}
-re "^\[^\r\n\]+\[\r\n\]+" {
-re "^\[^\r\n\]+\r\n" {
if {!$bad} {
warning "Unrecognized output: $expect_out(0,string)"
set bad 1