summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-11-15 12:13:16 +1100
committerDarren Tucker <dtucker@zip.com.au>2003-11-15 12:13:16 +1100
commit203c40b513853503417f030cd6557c6991431a97 (patch)
tree55ae1ffdab6dd4a20ed65c164fe6df9bfeda9413
parentae52b7ca596adf4f2b9a5c6a19062f42a2543b02 (diff)
- (dtucker) [regress/agent-ptrace.sh] Test for GDB output from Solaris and
HP-UX, skip test on AIX.
-rw-r--r--ChangeLog6
-rw-r--r--regress/agent-ptrace.sh4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5cffbbc2c..ae096d4a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120031115
2 - (dtucker) [regress/agent-ptrace.sh] Test for GDB output from Solaris and
3 HP-UX, skip test on AIX.
4
120031113 520031113
2 - (dtucker) [auth-pam.c] Append newlines to lines output by the 6 - (dtucker) [auth-pam.c] Append newlines to lines output by the
3 pam_chauthtok_conv(). 7 pam_chauthtok_conv().
@@ -1413,4 +1417,4 @@
1413 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1417 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1414 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1418 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1415 1419
1416$Id: ChangeLog,v 1.3096 2003/11/13 08:52:31 dtucker Exp $ 1420$Id: ChangeLog,v 1.3097 2003/11/15 01:13:16 dtucker Exp $
diff --git a/regress/agent-ptrace.sh b/regress/agent-ptrace.sh
index 3cfc680ca..bd79d7cb8 100644
--- a/regress/agent-ptrace.sh
+++ b/regress/agent-ptrace.sh
@@ -5,7 +5,7 @@ tid="disallow agent ptrace attach"
5 5
6if have_prog uname ; then 6if have_prog uname ; then
7 case `uname` in 7 case `uname` in
8 CYGWIN*) 8 AIX|CYGWIN*)
9 echo "skipped (not supported on this platform)" 9 echo "skipped (not supported on this platform)"
10 exit 0 10 exit 0
11 ;; 11 ;;
@@ -41,7 +41,7 @@ EOF
41 if [ $? -ne 0 ]; then 41 if [ $? -ne 0 ]; then
42 fail "gdb failed: exit code $?" 42 fail "gdb failed: exit code $?"
43 fi 43 fi
44 grep 'ptrace: Operation not permitted.' >/dev/null ${OBJ}/gdb.out 44 egrep 'ptrace: Operation not permitted.|procfs:.*Permission denied.|ttrace attach: Permission denied.' >/dev/null ${OBJ}/gdb.out
45 r=$? 45 r=$?
46 rm -f ${OBJ}/gdb.out 46 rm -f ${OBJ}/gdb.out
47 if [ $r -ne 0 ]; then 47 if [ $r -ne 0 ]; then