[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ltp-list
Subject:    [LTP] [PATCH] syslog: rsyslog doesn't create empty log files
From:       Jiri Jaburek <jjaburek () redhat ! com>
Date:       2014-05-28 10:15:51
Message-ID: 1401272151-6563-1-git-send-email-jjaburek () redhat ! com
[Download RAW message or body]

Newer versions of rsyslog don't create empty log files during startup -
the files are created upon first logged entry instead.

(since rsyslog git commit de77494415ae8c169949d13ed0df0af3b1949b54)

Signed-off-by: Jiri Jaburek <jjaburek@redhat.com>
---
 testcases/kernel/syscalls/syslog/syslog01 | 15 +++++++++++----
 testcases/kernel/syscalls/syslog/syslog02 | 16 +++++++++++-----
 testcases/kernel/syscalls/syslog/syslog09 | 15 +++++++++++----
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/testcases/kernel/syscalls/syslog/syslog01 b/testcases/kernel/syscalls/syslog/syslog01
index b7bcd9e..b9c7c7f 100755
--- a/testcases/kernel/syscalls/syslog/syslog01
+++ b/testcases/kernel/syscalls/syslog/syslog01
@@ -67,10 +67,17 @@ syslog_case1()
 	restart_syslog_daemon
 
 	# check if $MAILLOG script exists
-	if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e $MAILLOG ]; then
-		tst_resm TBROK "$MAILLOG no such log file"
-		cleanup 1
-	fi
+	case "$CONFIG_FILE" in
+	/etc/syslog-ng/syslog-ng.conf|/etc/rsyslog.conf)
+		# syslog-ng and rsyslog don't create empty log files
+		;;
+	*)
+		if [ ! -e $MAILLOG ]; then
+			tst_resm TBROK "$MAILLOG no such log file"
+			cleanup 1
+		fi
+		;;
+	esac
 
 	# Grepping pattern has to be changed whenever the executable name
 	# changes, ex: syslogtst executable.
diff --git a/testcases/kernel/syscalls/syslog/syslog02 b/testcases/kernel/syscalls/syslog/syslog02
index a416344..c863daa 100755
--- a/testcases/kernel/syscalls/syslog/syslog02
+++ b/testcases/kernel/syscalls/syslog/syslog02
@@ -68,11 +68,17 @@ syslog_case2()
 		# Grepping pattern is as follows:
 		# syslogtst: mail $level test.
 		# check if $MAILLOG script exists
-		if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e $MAILLOG ]; then
-			tst_resm TBROK "$MAILLOG no such log file"
-			cleanup 1
-		fi
-
+		case "$CONFIG_FILE" in
+		/etc/syslog-ng/syslog-ng.conf|/etc/rsyslog.conf)
+			# syslog-ng and rsyslog don't create empty log files
+			;;
+		*)
+			if [ ! -e $MAILLOG ]; then
+				tst_resm TBROK "$MAILLOG no such log file"
+				cleanup 1
+			fi
+			;;
+		esac
 
 		# Grepping pattern has to be changed whenever the executable name
 		# changes, ex: syslogtst executable.
diff --git a/testcases/kernel/syscalls/syslog/syslog09 b/testcases/kernel/syscalls/syslog/syslog09
index de06fb1..c488f43 100755
--- a/testcases/kernel/syscalls/syslog/syslog09
+++ b/testcases/kernel/syscalls/syslog/syslog09
@@ -57,10 +57,17 @@ syslog_case9()
 	restart_syslog_daemon
 
 	# check if /var/log/messages script exists
-	if [ "$CONFIG_FILE" != "/etc/syslog-ng/syslog-ng.conf" -a ! -e /var/log/messages ]; then
-		tst_resm TBROK "/var/log/messages no such log file"
-		cleanup 1
-	fi
+	case "$CONFIG_FILE" in
+	/etc/syslog-ng/syslog-ng.conf|/etc/rsyslog.conf)
+		# syslog-ng and rsyslog don't create empty log files
+		;;
+	*)
+		if [ ! -e /var/log/messages ]; then
+			tst_resm TBROK "/var/log/messages no such log file"
+			cleanup 1
+		fi
+		;;
+	esac
 
 	allow1=`grep -c "syslogtst: error level is logged" /var/log/messages`
 	donot_allow1=`grep -c "syslogtst: warning level not to be logged" /var/log/messages`
-- 
1.8.3.1


------------------------------------------------------------------------------
Time is money. Stop wasting it! Get your web API in 5 minutes.
www.restlet.com/download
http://p.sf.net/sfu/restlet
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
[prev in list] [next in list] [prev in thread] [next in thread]