Change 17826 by [EMAIL PROTECTED] on 2002/09/04 11:10:54
Subject: [PATCH 5.8.0] allow Sys::Syslog test to fail gracefully
From: "Brendan O'Dea" <[EMAIL PROTECTED]>
Date: Thu, 29 Aug 2002 22:42:39 +1000
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
.... //depot/perl/ext/Sys/Syslog/syslog.t#6 edit
Differences ...
==== //depot/perl/ext/Sys/Syslog/syslog.t#6 (xtext) ====
Index: perl/ext/Sys/Syslog/syslog.t
--- perl/ext/Sys/Syslog/syslog.t#5~13649~ Tue Dec 11 20:25:21 2001
+++ perl/ext/Sys/Syslog/syslog.t Wed Sep 4 04:10:54 2002
@@ -47,11 +47,21 @@
if (Sys::Syslog::_PATH_LOG()) {
if (-e Sys::Syslog::_PATH_LOG()) {
- print defined(eval { setlogsock('unix') }) ? "ok 1\n" : "not ok 1 # $!\n";
- print defined(eval { openlog('perl', 'ndelay', 'local0') }) ? "ok 2\n" : "not
ok 2 # $!\n";
- print defined(eval { syslog('info', $test_string ) }) ? "ok 3\n" : "not ok 3
# $!\n";
- }
- else {
+ print defined(eval { setlogsock('unix') })
+ ? "ok 1\n" : "not ok 1 # $!\n";
+ if (defined(eval { openlog('perl', 'ndelay', 'local0') })) {
+ print "ok 2\n";
+ print defined(eval { syslog('info', $test_string ) })
+ ? "ok 3\n" : "not ok 3 # $!\n";
+ } else {
+ if ($@ =~ /no connection to syslog available/) {
+ print "ok 2 # Skip: syslogd not running\n";
+ } else {
+ print "not ok 2 # $@\n";
+ }
+ print "ok 3 # Skip: openlog failed\n";
+ }
+ } else {
for (1..3) {
print
"ok $_ # Skip: file ",
End of Patch.
