From 4eecc5e08e3306b9baf034a6018752f3f989ead4 Mon Sep 17 00:00:00 2001 From: jkratoch Date: Sat, 14 Mar 2009 14:25:53 +0000 Subject: [PATCH] Fix a racy FAIL. * gdb.base/multi-forks.exp (continue_to_exit_bp_loc): New function with code from `follow parent, print pids'. (`follow child, print pids', `follow parent, print pids'): Call it. Replace `gdb_test "break..."' by gdb_breakpoint. --- gdb/testsuite/ChangeLog | 8 +++ gdb/testsuite/gdb.base/multi-forks.exp | 117 +++++++++++++++++---------------- 2 files changed, 68 insertions(+), 57 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d45e3b4671..b047421388 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2009-03-14 Jan Kratochvil + + Fix a racy FAIL. + * gdb.base/multi-forks.exp (continue_to_exit_bp_loc): New function with + code from `follow parent, print pids'. + (`follow child, print pids', `follow parent, print pids'): Call it. + Replace `gdb_test "break..."' by gdb_breakpoint. + 2009-03-13 Vladimir Prus * gdb.mi/mi-cli.exp: Adjust for output difference in diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp index ac56fb04b4..f8531800cd 100644 --- a/gdb/testsuite/gdb.base/multi-forks.exp +++ b/gdb/testsuite/gdb.base/multi-forks.exp @@ -51,7 +51,62 @@ global gdb_prompt # This is a test of gdb's ability to follow the parent, child or both # parent and child of multiple Unix fork() system calls. -# + +set exit_bp_loc [gdb_get_line_number "Set exit breakpoint here."] + +# Insert a breakpoint at the location provided by the exit_bp_loc global +# and resume the execution until hitting that breakpoint. We also make +# sure to consume all the expected output from all processes as well, +# to make sure it doesn't cause trouble during a subsequent test. + +proc continue_to_exit_bp_loc {} { + global exit_bp_loc decimal gdb_prompt + + gdb_breakpoint $exit_bp_loc + + send_gdb "continue\n" + + # The output from the child processes can be interleaved arbitrarily + # with the output from GDB and the parent process. If we don't + # consume it all now, it can confuse later interactions. + set seen_done 0 + set seen_break 0 + set seen_prompt 0 + set seen_timeout 0 + while { ($seen_done < 16 || ! $seen_prompt) && ! $seen_timeout } { + # We don't know what order the interesting things will arrive in. + # Using a pattern of the form 'x|y|z' instead of -re x ... -re y + # ... -re z ensures that expect always chooses the match that + # occurs leftmost in the input, and not the pattern appearing + # first in the script that occurs anywhere in the input, so that + # we don't skip anything. + gdb_expect { + -re "($decimal done)|(Breakpoint)|($gdb_prompt)" { + if {[info exists expect_out(1,string)]} { + incr seen_done + } elseif {[info exists expect_out(2,string)]} { + set seen_break 1 + } elseif {[info exists expect_out(3,string)]} { + set seen_prompt 1 + } + array unset expect_out + } + timeout { set seen_timeout 1 } + } + } + + if { $seen_timeout } { + fail "run to exit 2 (timeout)" + } elseif { ! $seen_prompt } { + fail "run to exit 2 (no prompt)" + } elseif { ! $seen_break } { + fail "run to exit 2 (no breakpoint hit)" + } elseif { $seen_done != 16 } { + fail "run to exit 2 (missing done messages)" + } else { + pass "run to exit 2" + } +} # The inferior program builds a tree of processes by executing a loop # four times, calling fork at each iteration. Thus, at each @@ -66,69 +121,17 @@ global gdb_prompt # The result should be that each of the 4 forks returns zero. runto_main -set exit_bp_loc [gdb_get_line_number "Set exit breakpoint here."] -gdb_test "break $exit_bp_loc" "Breakpoint.* at .*" "Break at exit" -gdb_test "set follow child" "" "" - -send_gdb "continue\n" -gdb_expect { - -re ".*Break.* main .*$gdb_prompt.*$" {} - -re ".*$gdb_prompt $" {fail "run to exit 1"} - default {fail "run to exit 1 (timeout)"} -} +gdb_test "set follow child" +continue_to_exit_bp_loc gdb_test "print pids" "\\$.* = \\{0, 0, 0, 0\\}.*" "follow child, print pids" # Now set gdb to follow the parent. # Result should be that none of the 4 forks returns zero. -delete_breakpoints runto_main -gdb_test "break $exit_bp_loc" "Breakpoint.* at .*" "Break at exit" gdb_test "set follow parent" "" "" - -send_gdb "continue\n" - -# The output from the child processes can be interleaved arbitrarily -# with the output from GDB and the parent process. If we don't -# consume it all now, it can confuse later interactions. -set seen_done 0 -set seen_break 0 -set seen_prompt 0 -set seen_timeout 0 -while { ($seen_done < 16 || ! $seen_prompt) && ! $seen_timeout } { - # We don't know what order the interesting things will arrive in. - # Using a pattern of the form 'x|y|z' instead of -re x ... -re y - # ... -re z ensures that expect always chooses the match that - # occurs leftmost in the input, and not the pattern appearing - # first in the script that occurs anywhere in the input, so that - # we don't skip anything. - gdb_expect { - -re "($decimal done)|(Breakpoint)|($gdb_prompt)" { - if {[info exists expect_out(1,string)]} { - incr seen_done - } elseif {[info exists expect_out(2,string)]} { - set seen_break 1 - } elseif {[info exists expect_out(3,string)]} { - set seen_prompt 1 - } - array unset expect_out - } - timeout { set seen_timeout 1 } - } -} - -if { $seen_timeout } { - fail "run to exit 2 (timeout)" -} elseif { ! $seen_prompt } { - fail "run to exit 2 (no prompt)" -} elseif { ! $seen_break } { - fail "run to exit 2 (no breakpoint hit)" -} elseif { $seen_done != 16 } { - fail "run to exit 2 (missing done messages)" -} else { - pass "run to exit 2" -} +continue_to_exit_bp_loc gdb_test "print pids\[0\]==0 || pids\[1\]==0 || pids\[2\]==0 || pids\[3\]==0" \ " = 0" "follow parent, print pids" @@ -138,7 +141,7 @@ gdb_test "print pids\[0\]==0 || pids\[1\]==0 || pids\[2\]==0 || pids\[3\]==0" \ # runto_main -gdb_test "break $exit_bp_loc" "Breakpoint.* at .*" "" +gdb_breakpoint $exit_bp_loc gdb_test "help set detach-on-fork" "whether gdb will detach the child.*" \ "help set detach" -- 2.11.0