From 52d309e45fbfb679db94900849c0d88f83b15279 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Thu, 11 Jul 2002 00:51:37 +0000 Subject: [PATCH] * gdb.base/attach.exp: Add patterns to match output from /proc-based systems. Move comments in expect statements to inside the actions, so that they don't get matched against. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.base/attach.exp | 24 +++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c0ba046..bdc0926 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2002-07-10 Paul N. Hilfinger + + * gdb.base/attach.exp: Add patterns to match output from /proc-based + systems. + Move comments in expect statements to inside the actions, so that they + don't get matched against. + 2002-07-10 Mark Kettenis * gdb.base/interrupt.exp: Setup xfail for all i386 BSD's on "call diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp index 2b341af..9c6bb97 100644 --- a/gdb/testsuite/gdb.base/attach.exp +++ b/gdb/testsuite/gdb.base/attach.exp @@ -113,6 +113,11 @@ proc do_attach_tests {} { gdb_expect { -re ".*Illegal process-id: abc.*$gdb_prompt $"\ {pass "attach to nonsense is prohibited"} + -re "Attaching to.*, process .*couldn't open /proc file.*$gdb_prompt $"\ + { + # Response expected from /proc-based systems. + pass "attach to nonsense is prohibited" + } -re "Attaching to.*$gdb_prompt $"\ {fail "attach to nonsense is prohibited (bogus pid allowed)"} -re "$gdb_prompt $" {fail "attach to nonsense is prohibited"} @@ -125,14 +130,23 @@ proc do_attach_tests {} { # send_gdb "attach 0\n" gdb_expect { - # This reponse is expected on HP-UX 10.20 (i.e., ptrace-based). -re "Attaching to.*, process 0.*No such process.*$gdb_prompt $"\ - {pass "attach to nonexistent process is prohibited"} - # This response is expected on HP-UX 11.0 (i.e., ttrace-based). + { + # Response expected on HP-UX 10.20 (i.e., ptrace-based). + pass "attach to nonexistent process is prohibited" + } -re "Attaching to.*, process 0 failed.*Hint.*$gdb_prompt $"\ - {pass "attach to nonexistent process is prohibited"} + { + # Response expected on HP-UX 11.0 (i.e., ttrace-based). + pass "attach to nonexistent process is prohibited" + } -re "Attaching to.*, process 0.*denied.*$gdb_prompt $"\ {pass "attach to nonexistent process is prohibited"} + -re "Attaching to.*, process .*couldn't open /proc file.*$gdb_prompt $"\ + { + # Response expected from /proc-based systems. + pass "attach to nonexistent process is prohibited" + } -re "$gdb_prompt $" {fail "attach to nonexistent process is prohibited"} timeout {fail "(timeout) attach to nonexistent process is prohibited"} } @@ -164,7 +178,7 @@ proc do_attach_tests {} { send_gdb "attach $testpid\n" gdb_expect { - -re "Attaching to program.*$binfile, process $testpid.*main.*at .*$srcfile:.*$gdb_prompt $"\ + -re "Attaching to program.*`?$binfile'?, process $testpid.*main.*at .*$srcfile:.*$gdb_prompt $"\ {pass "attach1, after setting file"} -re "$gdb_prompt $" {fail "attach1, after setting file"} timeout {fail "(timeout) attach1, after setting file"} -- 2.7.4