diff options
| author | Pedro Alves <palves@redhat.com> | 2014-09-11 13:04:14 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2014-09-11 13:04:14 +0100 |
| commit | 4c92ff2c35392b68ee9172af979483b32aaa3d7b (patch) | |
| tree | d0e6d784dc0924ee5c6aa2e5b9aa38cd56e2f4a0 /gdb/testsuite/gdb.multi | |
| parent | bd9269f70c70b1218b0eb73a6f487d6ca481e5ac (diff) | |
| download | gdb-4c92ff2c35392b68ee9172af979483b32aaa3d7b.zip gdb-4c92ff2c35392b68ee9172af979483b32aaa3d7b.tar.gz gdb-4c92ff2c35392b68ee9172af979483b32aaa3d7b.tar.bz2 | |
testsuite: refactor spawn and wait for attach
Several places in the testsuite have a copy of a snippet of code that
spawns a test program, waits a bit, and then does some PID munging for
Cygwin. This is in order to have GDB attach to the spawned program.
This refactors all that to a common procedure.
(multi-attach.exp wants to spawn multiple processes, so this makes the
new procedure's interface work with lists.)
Tested on x86_64 Fedora 20.
gdb/testsuite/ChangeLog:
2014-09-11 Pedro Alves <palves@redhat.com>
* lib/gdb.exp (spawn_wait_for_attach): New procedure.
* gdb.base/attach.exp (do_attach_tests, do_call_attach_tests)
(do_command_attach_tests): Use spawn_wait_for_attach.
* gdb.base/solib-overlap.exp: Likewise.
* gdb.multi/multi-attach.exp: Likewise.
* gdb.python/py-prompt.exp: Likewise.
* gdb.python/py-sync-interp.exp: Likewise.
* gdb.server/ext-attach.exp: Likewise.
Diffstat (limited to 'gdb/testsuite/gdb.multi')
| -rw-r--r-- | gdb/testsuite/gdb.multi/multi-attach.exp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gdb/testsuite/gdb.multi/multi-attach.exp b/gdb/testsuite/gdb.multi/multi-attach.exp index e933520..eaff2c9 100644 --- a/gdb/testsuite/gdb.multi/multi-attach.exp +++ b/gdb/testsuite/gdb.multi/multi-attach.exp @@ -30,15 +30,10 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug additiona # Start the programs running and then wait for a bit, to be sure that # they can be attached to. -set testpid1 [eval exec $binfile &] -set testpid2 [eval exec $binfile &] -exec sleep 2 -if { [istarget "*-*-cygwin*"] } { - # testpid{1,2} are the Cygwin PID, GDB uses the Windows PID, which might be - # different due to the way fork/exec works. - set testpid1 [ exec ps -e | gawk "{ if (\$1 == $testpid1) print \$4; }" ] - set testpid2 [ exec ps -e | gawk "{ if (\$1 == $testpid2) print \$4; }" ] -} + +set pid_list [spawn_wait_for_attach [list $binfile $binfile]] +set testpid1 [lindex $pid_list 0] +set testpid2 [lindex $pid_list 1] gdb_test "attach $testpid1" \ "Attaching to program: .*, process $testpid1.*(in|at).*" \ |