From fdaa282462aa62743dd85b0e8be1266ba99a8e8a Mon Sep 17 00:00:00 2001 From: Bryan Cantrill Date: Tue, 29 Jan 2013 01:05:34 +0000 Subject: [PATCH] 4300 logadm test suite fails when running rsyslogd Reviewed by: Josef 'Jeff' Sipek Approved by: Richard Lowe --- usr/src/cmd/logadm/tester | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/usr/src/cmd/logadm/tester b/usr/src/cmd/logadm/tester index 1ff4985e6d..ab7c32cd0b 100644 --- a/usr/src/cmd/logadm/tester +++ b/usr/src/cmd/logadm/tester @@ -21,6 +21,7 @@ # # # Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, Joyent, Inc. All rights reserved. # # # tester - run logadm tests @@ -281,7 +282,7 @@ sub set_testconffile { # logadm typically runs early every morning via an entry in # root's crontab (see crontab(1)). # -/var/adm/messages -C 4 -P 'Thu Nov 1 16:56:42 2001' -a 'kill -HUP `cat /var/run/syslog.pid`' +/var/adm/messages -C 4 -P 'Thu Nov 1 16:56:42 2001' -a 'kill -HUP `cat /var/run/*syslog*pid`' /var/cron/log -s 512k -t /var/cron/olog /var/lp/logs/lpsched -C 2 -N -t '$file.$N' # @@ -289,7 +290,7 @@ sub set_testconffile { # /var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never apache -C 24 -a '/usr/apache/bin/apachectl graceful' -p 1m -t '/var/apache/old-logs/$basename.%Y-%m' '/var/apache/logs/*{access,error}_log' -/var/log/syslog -C 8 -P 'Thu Nov 1 09:16:38 2001' -a 'kill -HUP `cat /var/run/syslog.pid`' +/var/log/syslog -C 8 -P 'Thu Nov 1 09:16:38 2001' -a 'kill -HUP `cat /var/run/*syslog*pid`' /var/apache/logs/access_log -P 'Thu Nov 1 08:27:56 2001' /var/apache/logs/error_log -P 'Thu Nov 1 08:27:56 2001' /var/apache/logs/suexec_log -P 'Thu Nov 1 08:27:56 2001' @@ -818,12 +819,12 @@ sub logadmV1 { set_testconffile; set_file('std.out.expect', <<'EOF'); -/var/adm/messages -C 4 -P 'Thu Nov 1 16:56:42 2001' -a 'kill -HUP `cat /var/run/syslog.pid`' +/var/adm/messages -C 4 -P 'Thu Nov 1 16:56:42 2001' -a 'kill -HUP `cat /var/run/*syslog*pid`' /var/cron/log -s 512k -t /var/cron/olog /var/lp/logs/lpsched -C 2 -N -t '$file.$N' /var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never apache -C 24 -a '/usr/apache/bin/apachectl graceful' -p 1m -t '/var/apache/old-logs/$basename.%Y-%m' '/var/apache/logs/*{access,error}_log' -/var/log/syslog -C 8 -P 'Thu Nov 1 09:16:38 2001' -a 'kill -HUP `cat /var/run/syslog.pid`' +/var/log/syslog -C 8 -P 'Thu Nov 1 09:16:38 2001' -a 'kill -HUP `cat /var/run/*syslog*pid`' /var/apache/logs/access_log -P 'Thu Nov 1 08:27:56 2001' /var/apache/logs/error_log -P 'Thu Nov 1 08:27:56 2001' /var/apache/logs/suexec_log -P 'Thu Nov 1 08:27:56 2001' @@ -1179,8 +1180,8 @@ sub logadm7 { # logadm typically runs early every morning via an entry in # root's crontab (see crontab(1)). # -dir1/syslog -C 8 -a 'echo kill -HUP `cat /etc/syslog.pid` >> cmd.out' -dir2/messages -C 4 -a 'echo kill -HUP `cat /etc/syslog.pid` >> cmd.out' +dir1/syslog -C 8 -a 'echo kill -HUP `cat /var/run/*syslog*pid` >> cmd.out' +dir2/messages -C 4 -a 'echo kill -HUP `cat /var/run/*syslog*pid` >> cmd.out' # # The entry below is used by turnacct(1M) # @@ -1189,7 +1190,7 @@ EOF system("/bin/cp logadm.conf logadm.conf.orig"); - $pid=`cat /etc/syslog.pid`; + $pid=`cat /var/run/*syslog*pid`; chomp $pid; set_file('cmd.out.expect', <<"EOF"); kill -HUP $pid @@ -1260,7 +1261,7 @@ $bindir/logadm -f logadm.conf -F logadm.timestamps dir1/syslog dir2/messages >st echo something > dir1/syslog echo something > dir2/messages $bindir/logadm -f logadm.conf -F logadm.timestamps >std.out3 2>std.err3 || exit 1 -exec $bindir/logadm -f logadm.conf -F logadm.timestamps dir2/messages -p now -a 'echo second kill -HUP `cat /etc/syslog.pid` >> cmd.out' >std.out4 2>std.err4 +exec $bindir/logadm -f logadm.conf -F logadm.timestamps dir2/messages -p now -a 'echo second kill -HUP `cat /var/run/*syslog*pid` >> cmd.out' >std.out4 2>std.err4 EOF } @@ -1748,8 +1749,8 @@ sub logadm14 { # logadm typically runs early every morning via an entry in # root's crontab (see crontab(1)). # -dir1/syslog -C 8 -a 'echo kill -HUP `cat /etc/syslog.pid` >> cmd.out' -dir2/messages -C 4 -a 'echo kill -HUP `cat /etc/syslog.pid` >> cmd.out' +dir1/syslog -C 8 -a 'echo kill -HUP `cat /var/run/*syslog*pid` >> cmd.out' +dir2/messages -C 4 -a 'echo kill -HUP `cat /var/run/*syslog*pid` >> cmd.out' # # The entry below is used by turnacct(1M) # @@ -1806,7 +1807,7 @@ EOF chmod 664 dir2/messages # processing logname: /var/adm/pacct # using default template: $file.$n -sh -c echo kill -HUP `cat /etc/syslog.pid` >> cmd.out # -a cmd +sh -c echo kill -HUP `cat /var/run/*syslog*pid` >> cmd.out # -a cmd # logadm.conf and logadm.timestamps unchanged EOF @@ -2082,7 +2083,7 @@ EOF sub logadm20 { set_file('logadm.conf', <<'EOF'); # non-trivial entry -/var/log/syslog -C 8 -a 'kill -HUP `cat /var/run/syslog.pid`' +/var/log/syslog -C 8 -a 'kill -HUP `cat /var/run/*syslog*pid`' EOF set_file('std.err.expect', <<'EOF'); -- 2.11.4.GIT