* [PATCH] Remove HP-UX reference in foll-vfork.exp @ 2015-12-21 20:10 Simon Marchi 2015-12-21 21:13 ` Pedro Alves 0 siblings, 1 reply; 7+ messages in thread From: Simon Marchi @ 2015-12-21 20:10 UTC (permalink / raw) To: gdb-patches; +Cc: Simon Marchi One more I just found. Tested with native, native-gdbserver and native-extended-gdbserver on Linux. gdb/testsuite/ChangeLog: * gdb.base/foll-vork.exp: Remove HP-UX special case. --- gdb/testsuite/gdb.base/foll-vfork.exp | 42 +++++------------------------------ 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/gdb/testsuite/gdb.base/foll-vfork.exp b/gdb/testsuite/gdb.base/foll-vfork.exp index 0356598..bf4ea43 100644 --- a/gdb/testsuite/gdb.base/foll-vfork.exp +++ b/gdb/testsuite/gdb.base/foll-vfork.exp @@ -222,18 +222,8 @@ proc tcatch_vfork_then_parent_follow {} { gdb_test_no_output "set follow-fork parent" gdb_test "tcatch vfork" "Catchpoint .*(vfork).*" - - # HP-UX 10.20 seems to stop you in "vfork", while more recent - # HP-UXs stop you in "_vfork". - set test "continue to vfork" - gdb_test_multiple "continue" $test { - -re "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*$gdb_prompt " { - pass $test - } - -re "vfork \\(\\) at.*$gdb_prompt " { - pass $test - } - } + gdb_test "continue" "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*" \ + "continue to vfork" set linenum [gdb_get_line_number "pid = vfork ();"] set test "finish" @@ -264,18 +254,8 @@ proc tcatch_vfork_then_child_follow_exec {} { gdb_test_no_output "set follow-fork child" gdb_test "tcatch vfork" "Catchpoint .*(vfork).*" - - # HP-UX 10.20 seems to stop you in "vfork", while more recent HP-UXs - # stop you in "_vfork". - set test "continue to vfork" - gdb_test_multiple "continue" $test { - -re "vfork \\(\\) at .*$gdb_prompt $" { - pass $test - } - -re "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*$gdb_prompt " { - pass $test - } - } + gdb_test "continue" "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*" \ + "continue to vfork" set linenum1 [gdb_get_line_number "pid = vfork ();"] set linenum2 [gdb_get_line_number "printf(\"Hello from vforked-prog" ${srcfile2}] @@ -310,18 +290,8 @@ proc tcatch_vfork_then_child_follow_exit {} { gdb_test_no_output "set follow-fork child" gdb_test "tcatch vfork" "Catchpoint .*(vfork).*" - - # HP-UX 10.20 seems to stop you in "vfork", while more recent HP-UXs - # stop you in "_vfork". - set test "continue to vfork" - gdb_test_multiple "continue" $test { - -re "vfork \\(\\) at .*$gdb_prompt $" { - pass $test - } - -re "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*$gdb_prompt " { - pass $test - } - } + gdb_test "continue" "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*" \ + "continue to vfork" set test "finish" gdb_test_multiple "finish" $test { -- 2.5.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Remove HP-UX reference in foll-vfork.exp 2015-12-21 20:10 [PATCH] Remove HP-UX reference in foll-vfork.exp Simon Marchi @ 2015-12-21 21:13 ` Pedro Alves 2015-12-22 15:53 ` Simon Marchi 0 siblings, 1 reply; 7+ messages in thread From: Pedro Alves @ 2015-12-21 21:13 UTC (permalink / raw) To: Simon Marchi, gdb-patches On 12/21/2015 08:09 PM, Simon Marchi wrote: > One more I just found. > > Tested with native, native-gdbserver and native-extended-gdbserver on > Linux. > > gdb/testsuite/ChangeLog: > > * gdb.base/foll-vork.exp: Remove HP-UX special case. OK. Thanks, Pedro Alves ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Remove HP-UX reference in foll-vfork.exp 2015-12-21 21:13 ` Pedro Alves @ 2015-12-22 15:53 ` Simon Marchi 2016-01-08 20:52 ` [testsuite patch] Regression for foll-vfork.exp [Re: [PATCH] Remove HP-UX reference in foll-vfork.exp] Jan Kratochvil 0 siblings, 1 reply; 7+ messages in thread From: Simon Marchi @ 2015-12-22 15:53 UTC (permalink / raw) To: Pedro Alves, gdb-patches On 15-12-21 04:13 PM, Pedro Alves wrote: > OK. > > Thanks, > Pedro Alves Thanks, pushed. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [testsuite patch] Regression for foll-vfork.exp [Re: [PATCH] Remove HP-UX reference in foll-vfork.exp] 2015-12-22 15:53 ` Simon Marchi @ 2016-01-08 20:52 ` Jan Kratochvil 2016-01-08 21:04 ` Simon Marchi 2016-01-11 12:22 ` Pedro Alves 0 siblings, 2 replies; 7+ messages in thread From: Jan Kratochvil @ 2016-01-08 20:52 UTC (permalink / raw) To: Simon Marchi; +Cc: Pedro Alves, gdb-patches [-- Attachment #1: Type: text/plain, Size: 2078 bytes --] On Tue, 22 Dec 2015 16:53:23 +0100, Simon Marchi wrote: > Thanks, pushed. fe33faff35a8ee19db823149e764e3373e603bb9 is the first bad commit commit fe33faff35a8ee19db823149e764e3373e603bb9 Author: Simon Marchi <simon.marchi@ericsson.com> Date: Tue Dec 22 10:52:31 2015 -0500 Remove HP-UX reference in foll-vfork.exp FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork FAIL: gdb.base/foll-vfork.exp: exit: vfork parent follow, finish after tcatch vfork: continue to vfork FAIL: gdb.base/foll-vfork.exp: exit: vfork child follow, finish after tcatch vfork: continue to vfork It happens for plain gdb.base/foll-vfork.exp runtest on Fedora 23 x86_64. -Temporary catchpoint 2 (vforked process 24562), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M +Temporary catchpoint 2 (vforked process 25345), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M 52 pushq %rdi^M Current language: auto^M The current source language is "auto; currently asm".^M -(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork +(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork -Temporary catchpoint 2 (vforked process 24629), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M +Temporary catchpoint 2 (vforked process 25411), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M 52 pushq %rdi^M Current language: auto^M The current source language is "auto; currently asm".^M -(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork +(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork So I have reverted it and just simplified the comment, OK for check-in? The third case is not necessary during testing but I have changed back all the 3 cases. Jan [-- Attachment #2: 1 --] [-- Type: text/plain, Size: 2453 bytes --] gdb/testsuite/ChangeLog 2016-01-08 Jan Kratochvil <jan.kratochvil@redhat.com> * gdb.base/foll-vfork.exp (tcatch_vfork_then_parent_follow) (tcatch_vfork_then_child_follow_exec) (tcatch_vfork_then_child_follow_exit): Revert back DWARF vfork identification. diff --git a/gdb/testsuite/gdb.base/foll-vfork.exp b/gdb/testsuite/gdb.base/foll-vfork.exp index efa1b39..ebbe4ad 100644 --- a/gdb/testsuite/gdb.base/foll-vfork.exp +++ b/gdb/testsuite/gdb.base/foll-vfork.exp @@ -222,8 +222,17 @@ proc tcatch_vfork_then_parent_follow {} { gdb_test_no_output "set follow-fork parent" gdb_test "tcatch vfork" "Catchpoint .*(vfork).*" - gdb_test "continue" "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*" \ - "continue to vfork" + + # It may stop in either "vfork" or "_vfork". + set test "continue to vfork" + gdb_test_multiple "continue" $test { + -re "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*$gdb_prompt " { + pass $test + } + -re "vfork \\(\\) at.*$gdb_prompt " { + pass $test + } + } set linenum [gdb_get_line_number "pid = vfork ();"] set test "finish" @@ -254,8 +263,17 @@ proc tcatch_vfork_then_child_follow_exec {} { gdb_test_no_output "set follow-fork child" gdb_test "tcatch vfork" "Catchpoint .*(vfork).*" - gdb_test "continue" "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*" \ - "continue to vfork" + + # It may stop in either "vfork" or "_vfork". + set test "continue to vfork" + gdb_test_multiple "continue" $test { + -re "vfork \\(\\) at .*$gdb_prompt $" { + pass $test + } + -re "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*$gdb_prompt " { + pass $test + } + } set linenum1 [gdb_get_line_number "pid = vfork ();"] set linenum2 [gdb_get_line_number "printf(\"Hello from vforked-prog" ${srcfile2}] @@ -290,8 +308,17 @@ proc tcatch_vfork_then_child_follow_exit {} { gdb_test_no_output "set follow-fork child" gdb_test "tcatch vfork" "Catchpoint .*(vfork).*" - gdb_test "continue" "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*" \ - "continue to vfork" + + # It may stop in either "vfork" or "_vfork". + set test "continue to vfork" + gdb_test_multiple "continue" $test { + -re "vfork \\(\\) at .*$gdb_prompt $" { + pass $test + } + -re "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*$gdb_prompt " { + pass $test + } + } set test "finish" gdb_test_multiple "finish" $test { ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [testsuite patch] Regression for foll-vfork.exp [Re: [PATCH] Remove HP-UX reference in foll-vfork.exp] 2016-01-08 20:52 ` [testsuite patch] Regression for foll-vfork.exp [Re: [PATCH] Remove HP-UX reference in foll-vfork.exp] Jan Kratochvil @ 2016-01-08 21:04 ` Simon Marchi 2016-01-11 12:22 ` Pedro Alves 1 sibling, 0 replies; 7+ messages in thread From: Simon Marchi @ 2016-01-08 21:04 UTC (permalink / raw) To: Jan Kratochvil; +Cc: Pedro Alves, gdb-patches On 16-01-08 03:52 PM, Jan Kratochvil wrote: > On Tue, 22 Dec 2015 16:53:23 +0100, Simon Marchi wrote: >> Thanks, pushed. > > fe33faff35a8ee19db823149e764e3373e603bb9 is the first bad commit > commit fe33faff35a8ee19db823149e764e3373e603bb9 > Author: Simon Marchi <simon.marchi@ericsson.com> > Date: Tue Dec 22 10:52:31 2015 -0500 > Remove HP-UX reference in foll-vfork.exp > > FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork > FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork > FAIL: gdb.base/foll-vfork.exp: exit: vfork parent follow, finish after tcatch vfork: continue to vfork > FAIL: gdb.base/foll-vfork.exp: exit: vfork child follow, finish after tcatch vfork: continue to vfork > > It happens for plain gdb.base/foll-vfork.exp runtest on Fedora 23 x86_64. > > -Temporary catchpoint 2 (vforked process 24562), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M > +Temporary catchpoint 2 (vforked process 25345), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M > 52 pushq %rdi^M > Current language: auto^M > The current source language is "auto; currently asm".^M > -(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork > +(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork > > -Temporary catchpoint 2 (vforked process 24629), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M > +Temporary catchpoint 2 (vforked process 25411), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M > 52 pushq %rdi^M > Current language: auto^M > The current source language is "auto; currently asm".^M > -(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork > +(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork > > > So I have reverted it and just simplified the comment, OK for check-in? > > The third case is not necessary during testing but I have changed back all the > 3 cases. > > > Jan I don't see this on Ubuntu 14.04.3 LTS, gdb master, gcc 4.8.4. But if it's still a valid test outcome, then yes it should be re-added. Sorry for breaking it. - ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [testsuite patch] Regression for foll-vfork.exp [Re: [PATCH] Remove HP-UX reference in foll-vfork.exp] 2016-01-08 20:52 ` [testsuite patch] Regression for foll-vfork.exp [Re: [PATCH] Remove HP-UX reference in foll-vfork.exp] Jan Kratochvil 2016-01-08 21:04 ` Simon Marchi @ 2016-01-11 12:22 ` Pedro Alves 2016-01-11 21:23 ` [commit] " Jan Kratochvil 1 sibling, 1 reply; 7+ messages in thread From: Pedro Alves @ 2016-01-11 12:22 UTC (permalink / raw) To: Jan Kratochvil, Simon Marchi; +Cc: gdb-patches On 01/08/2016 08:52 PM, Jan Kratochvil wrote: > On Tue, 22 Dec 2015 16:53:23 +0100, Simon Marchi wrote: >> > Thanks, pushed. > fe33faff35a8ee19db823149e764e3373e603bb9 is the first bad commit > commit fe33faff35a8ee19db823149e764e3373e603bb9 > Author: Simon Marchi <simon.marchi@ericsson.com> > Date: Tue Dec 22 10:52:31 2015 -0500 > Remove HP-UX reference in foll-vfork.exp > > FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork > FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork > FAIL: gdb.base/foll-vfork.exp: exit: vfork parent follow, finish after tcatch vfork: continue to vfork > FAIL: gdb.base/foll-vfork.exp: exit: vfork child follow, finish after tcatch vfork: continue to vfork > > It happens for plain gdb.base/foll-vfork.exp runtest on Fedora 23 x86_64. > > -Temporary catchpoint 2 (vforked process 24562), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M > +Temporary catchpoint 2 (vforked process 25345), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M > 52 pushq %rdi^M > Current language: auto^M > The current source language is "auto; currently asm".^M > -(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork > +(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork > > -Temporary catchpoint 2 (vforked process 24629), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M > +Temporary catchpoint 2 (vforked process 25411), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M > 52 pushq %rdi^M > Current language: auto^M > The current source language is "auto; currently asm".^M > -(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork > +(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork > > > So I have reverted it and just simplified the comment, OK for check-in? > > The third case is not necessary during testing but I have changed back all the > 3 cases. > > > Jan > > > 1 > > > gdb/testsuite/ChangeLog > 2016-01-08 Jan Kratochvil <jan.kratochvil@redhat.com> > > * gdb.base/foll-vfork.exp (tcatch_vfork_then_parent_follow) > (tcatch_vfork_then_child_follow_exec) > (tcatch_vfork_then_child_follow_exit): Revert back DWARF vfork > identification. > > diff --git a/gdb/testsuite/gdb.base/foll-vfork.exp b/gdb/testsuite/gdb.base/foll-vfork.exp > index efa1b39..ebbe4ad 100644 > --- a/gdb/testsuite/gdb.base/foll-vfork.exp > +++ b/gdb/testsuite/gdb.base/foll-vfork.exp > @@ -222,8 +222,17 @@ proc tcatch_vfork_then_parent_follow {} { > gdb_test_no_output "set follow-fork parent" > > gdb_test "tcatch vfork" "Catchpoint .*(vfork).*" > - gdb_test "continue" "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*" \ > - "continue to vfork" > + > + # It may stop in either "vfork" or "_vfork". > + set test "continue to vfork" > + gdb_test_multiple "continue" $test { > + -re "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*$gdb_prompt " { > + pass $test > + } > + -re "vfork \\(\\) at.*$gdb_prompt " { > + pass $test > + } > + } I know it was that way before, but would you mind moving this to a helper proc, like: proc continue_to_vfork {} { # A vfork catchpoint may stop in either "vfork" or "_vfork". set test "continue to vfork" gdb_test_multiple "continue" $test { -re "vfork \\(\\) at .*$gdb_prompt $" { pass $test } -re "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*$gdb_prompt " { pass $test } } } (note that expanded the "it") OK with that change. Thanks, Pedro Alves > > set linenum [gdb_get_line_number "pid = vfork ();"] > set test "finish" > @@ -254,8 +263,17 @@ proc tcatch_vfork_then_child_follow_exec {} { > gdb_test_no_output "set follow-fork child" > > gdb_test "tcatch vfork" "Catchpoint .*(vfork).*" > - gdb_test "continue" "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*" \ > - "continue to vfork" > + > + # It may stop in either "vfork" or "_vfork". > + set test "continue to vfork" > + gdb_test_multiple "continue" $test { > + -re "vfork \\(\\) at .*$gdb_prompt $" { > + pass $test > + } > + -re "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*$gdb_prompt " { > + pass $test > + } > + } > > set linenum1 [gdb_get_line_number "pid = vfork ();"] > set linenum2 [gdb_get_line_number "printf(\"Hello from vforked-prog" ${srcfile2}] > @@ -290,8 +308,17 @@ proc tcatch_vfork_then_child_follow_exit {} { > gdb_test_no_output "set follow-fork child" > > gdb_test "tcatch vfork" "Catchpoint .*(vfork).*" > - gdb_test "continue" "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*" \ > - "continue to vfork" > + > + # It may stop in either "vfork" or "_vfork". > + set test "continue to vfork" > + gdb_test_multiple "continue" $test { > + -re "vfork \\(\\) at .*$gdb_prompt $" { > + pass $test > + } > + -re "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*$gdb_prompt " { > + pass $test > + } > + } > > set test "finish" > gdb_test_multiple "finish" $test { ^ permalink raw reply [flat|nested] 7+ messages in thread
* [commit] [testsuite patch] Regression for foll-vfork.exp [Re: [PATCH] Remove HP-UX reference in foll-vfork.exp] 2016-01-11 12:22 ` Pedro Alves @ 2016-01-11 21:23 ` Jan Kratochvil 0 siblings, 0 replies; 7+ messages in thread From: Jan Kratochvil @ 2016-01-11 21:23 UTC (permalink / raw) To: Pedro Alves; +Cc: Simon Marchi, gdb-patches [-- Attachment #1: Type: text/plain, Size: 111 bytes --] On Mon, 11 Jan 2016 13:22:35 +0100, Pedro Alves wrote: > OK with that change. Done, checked in. Thanks, Jan [-- Attachment #2: Type: message/rfc822, Size: 5311 bytes --] From: Jan Kratochvil <jan.kratochvil@redhat.com> Subject: [PATCH] testsuite: Regression for foll-vfork.exp Date: Mon, 11 Jan 2016 22:20:16 +0100 fe33faff35a8ee19db823149e764e3373e603bb9 is the first bad commit commit fe33faff35a8ee19db823149e764e3373e603bb9 Author: Simon Marchi <simon.marchi@ericsson.com> Date: Tue Dec 22 10:52:31 2015 -0500 Remove HP-UX reference in foll-vfork.exp FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork FAIL: gdb.base/foll-vfork.exp: exit: vfork parent follow, finish after tcatch vfork: continue to vfork FAIL: gdb.base/foll-vfork.exp: exit: vfork child follow, finish after tcatch vfork: continue to vfork It happens for plain gdb.base/foll-vfork.exp runtest on Fedora 23 x86_64. -Temporary catchpoint 2 (vforked process 24562), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M +Temporary catchpoint 2 (vforked process 25345), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M 52 pushq %rdi^M Current language: auto^M The current source language is "auto; currently asm".^M -(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork +(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, finish after tcatch vfork: continue to vfork -Temporary catchpoint 2 (vforked process 24629), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M +Temporary catchpoint 2 (vforked process 25411), vfork () at ../sysdeps/unix/sysv/linux/x86_64/vfork.S:52^M 52 pushq %rdi^M Current language: auto^M The current source language is "auto; currently asm".^M -(gdb) PASS: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork +(gdb) FAIL: gdb.base/foll-vfork.exp: exec: vfork child follow, finish after tcatch vfork: continue to vfork So I have reverted it and just simplified the comment. The third case is not necessary during testing but I have changed back all the 3 cases. Pedro Alves: I know it was that way before, but would you mind moving this to a helper proc. gdb/testsuite/ChangeLog 2016-01-11 Jan Kratochvil <jan.kratochvil@redhat.com> Pedro Alves <palves@redhat.com> * gdb.base/foll-vfork.exp (tcatch_vfork_then_parent_follow) (tcatch_vfork_then_child_follow_exec) (tcatch_vfork_then_child_follow_exit): Revert back DWARF vfork identification. --- gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/gdb.base/foll-vfork.exp | 27 +++++++++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a0eba33..8b0425b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,4 +1,12 @@ 2016-01-11 Jan Kratochvil <jan.kratochvil@redhat.com> + Pedro Alves <palves@redhat.com> + + * gdb.base/foll-vfork.exp (tcatch_vfork_then_parent_follow) + (tcatch_vfork_then_child_follow_exec) + (tcatch_vfork_then_child_follow_exit): Revert back DWARF vfork + identification. + +2016-01-11 Jan Kratochvil <jan.kratochvil@redhat.com> * gdb.guile/scm-value.exp (test_value_in_inferior): Set print elements and repeats to unlimited. diff --git a/gdb/testsuite/gdb.base/foll-vfork.exp b/gdb/testsuite/gdb.base/foll-vfork.exp index ed25487..173a7c3 100644 --- a/gdb/testsuite/gdb.base/foll-vfork.exp +++ b/gdb/testsuite/gdb.base/foll-vfork.exp @@ -212,6 +212,21 @@ proc vfork_and_exec_child_follow_through_step {} { exec sleep 1 }} +proc continue_to_vfork {} { + global gdb_prompt + + # A vfork catchpoint may stop in either "vfork" or "_vfork". + set test "continue to vfork" + gdb_test_multiple "continue" $test { + -re "vfork \\(\\) at .*$gdb_prompt $" { + pass $test + } + -re "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*$gdb_prompt " { + pass $test + } + } +} + proc tcatch_vfork_then_parent_follow {} { with_test_prefix "vfork parent follow, finish after tcatch vfork" { global gdb_prompt @@ -222,8 +237,8 @@ proc tcatch_vfork_then_parent_follow {} { gdb_test_no_output "set follow-fork parent" gdb_test "tcatch vfork" "Catchpoint .*(vfork).*" - gdb_test "continue" "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*" \ - "continue to vfork" + + continue_to_vfork set linenum [gdb_get_line_number "pid = vfork ();"] set test "finish" @@ -254,8 +269,8 @@ proc tcatch_vfork_then_child_follow_exec {} { gdb_test_no_output "set follow-fork child" gdb_test "tcatch vfork" "Catchpoint .*(vfork).*" - gdb_test "continue" "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*" \ - "continue to vfork" + + continue_to_vfork set linenum1 [gdb_get_line_number "pid = vfork ();"] set linenum2 [gdb_get_line_number "printf(\"Hello from vforked-prog" ${srcfile2}] @@ -290,8 +305,8 @@ proc tcatch_vfork_then_child_follow_exit {} { gdb_test_no_output "set follow-fork child" gdb_test "tcatch vfork" "Catchpoint .*(vfork).*" - gdb_test "continue" "0x\[0-9a-fA-F\]*.*(vfork|__kernel_v?syscall).*" \ - "continue to vfork" + + continue_to_vfork set test "finish" gdb_test_multiple "finish" $test { -- 2.5.0 ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-01-11 21:23 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2015-12-21 20:10 [PATCH] Remove HP-UX reference in foll-vfork.exp Simon Marchi 2015-12-21 21:13 ` Pedro Alves 2015-12-22 15:53 ` Simon Marchi 2016-01-08 20:52 ` [testsuite patch] Regression for foll-vfork.exp [Re: [PATCH] Remove HP-UX reference in foll-vfork.exp] Jan Kratochvil 2016-01-08 21:04 ` Simon Marchi 2016-01-11 12:22 ` Pedro Alves 2016-01-11 21:23 ` [commit] " Jan Kratochvil
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).