Menu
▾
▴
[Ltp-cvs] ltp/testcases/kernel/syscalls/syslog syslog01,1.7,1.8 syslog02,1.8,1.9 syslog03,1.7,1.8 syslog04,1.7,1.8 syslog05,1.7,1.8 syslog06,1.8,1.9 syslog07,1.8,1.9 syslog08,1.8,1.9 syslog09,1.8,1.9 syslog10,1.9,1.10
Update of /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog
In directory sc8-pr-cvs1:/tmp/cvs-serv31604
Modified Files:
syslog01 syslog02 syslog03 syslog04 syslog05 syslog06 syslog07
syslog08 syslog09 syslog10
Log Message:
Removed check for successful syslog restart, b/c race condition occurs on
distros that restart 2 daemons (syslog and klog), instead of 1.
Index: syslog01
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog01,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- syslog01 4 Jun 2003 21:46:29 -0000 1.7
+++ syslog01 5 Jun 2003 15:42:03 -0000 1.8
@@ -31,6 +31,26 @@
# mail.info /usr/spool/adm/syslog #
##################################################################
+<<<<<<< syslog01
+cleanup()
+{
+if [ $status_flag -eq 0 ]
+then
+ tst_resm TPASS "success in generating messages"
+else
+ tst_resm TFAIL "failed to generate messages"
+fi
+
+#Restore syslog.conf
+mv /etc/syslog.conf.ltpbak /etc/syslog.conf
+
+#Restart syslog
+tst_resm TINFO "restart syslog"
+/etc/init.d/syslog restart 2>&1 1>/dev/null
+sleep 2
+}
+
+=======
cleanup()
{
if [ $status_flag -eq 0 ]
@@ -54,8 +74,10 @@
exit $status_flag
}
+>>>>>>> 1.7
syslog_case1()
{
+
RC=0
#set the trap to handle signals.
trap '
@@ -88,6 +110,10 @@
echo "mail.info /var/log/maillog" >> /etc/syslog.conf
#Restart syslog
+<<<<<<< syslog01
+ /etc/init.d/syslog restart 2>&1 1>/dev/null
+ sleep 2
+=======
/etc/init.d/syslog restart 2>&1 1>/dev/null || RC=$?
if [ $RC -ne 0 ]
then
@@ -96,6 +122,7 @@
cleanup
fi
+>>>>>>> 1.7
# check if /var/log/maillog script exists
find /var/log/ -name maillog 2>&1 1>/dev/null || RC=$?
Index: syslog02
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog02,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- syslog02 4 Jun 2003 21:46:29 -0000 1.8
+++ syslog02 5 Jun 2003 15:42:03 -0000 1.9
@@ -26,6 +26,27 @@
# created and that will be used as syslog.conf file. #
##################################################################
+<<<<<<< syslog02
+cleanup()
+{
+if [ $status_flag -eq 0 ]
+then
+ tst_resm TPASS "messages of all levels are logged"
+else
+ tst_resm TFAIL "failed to log messages of all levels."
+fi
+
+#Restore syslog.conf
+mv /etc/syslog.conf.ltpbak /etc/syslog.conf
+
+#Restart syslog
+tst_resm TINFO "Restart syslog"
+/etc/init.d/syslog restart 2>&1 1>/dev/null
+sleep 2
+exit $status_flag
+}
+
+=======
cleanup()
{
if [ $status_flag -eq 0 ]
@@ -49,6 +70,7 @@
exit $status_flag
}
+>>>>>>> 1.8
syslog_case2()
{
#set the trap to handle signals.
@@ -92,6 +114,10 @@
#Restart syslog
tst_resm TINFO "restarting syslog deamon"
+<<<<<<< syslog02
+ /etc/init.d/syslog restart 2>&1 1>/dev/null
+ sleep 2
+=======
/etc/init.d/syslog restart 2>&1 1>/dev/null || RC=$?
if [ $RC -ne 0 ]
then
@@ -100,6 +126,7 @@
cleanup
fi
+>>>>>>> 1.8
# Grepping pattern is as follows:
# syslogtst: mail $current test.
Index: syslog03
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog03,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- syslog03 4 Jun 2003 21:46:29 -0000 1.7
+++ syslog03 5 Jun 2003 15:42:03 -0000 1.8
@@ -29,6 +29,28 @@
# daemon.info /usr/spool/adm/syslog #
##################################################################
+<<<<<<< syslog03
+cleanup()
+{
+if [ $status_flag -eq 0 ]
+then
+ tst_resm TPASS "ident string is prepended to the mesage."
+else
+ tst_resm TFAIL "ident string is not prepended to the mesage."
+fi
+
+#Restore syslog.conf
+mv /etc/syslog.conf.ltpbak /etc/syslog.conf
+
+#Restart syslog
+
+tst_resm TINFO "Restart syslog"
+/etc/init.d/syslog restart 2>&1 1>/dev/null
+sleep 2
+exit $status_flag
+}
+
+=======
cleanup()
{
if [ $status_flag -eq 0 ]
@@ -53,6 +75,7 @@
exit $status_flag
}
+>>>>>>> 1.7
syslog_case3()
{
#set the trap to handle signals.
@@ -87,6 +110,10 @@
#Restart syslog
tst_resm TINFO "Restart syslog deamon"
+<<<<<<< syslog03
+ /etc/init.d/syslog restart 2>&1 1>/dev/null
+ sleep 2
+=======
/etc/init.d/syslog restart 2>&1 1>/dev/null || RC=$?
if [ $RC -ne 0 ]
then
@@ -94,6 +121,7 @@
status_flag=1
cleanup
fi
+>>>>>>> 1.7
# Grep for the ident prefix: SYSLOG_CASE3 in the log file.
oldvalue4=`grep -c "SYSLOG_CASE3" /var/log/messages`
Index: syslog04
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog04,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- syslog04 4 Jun 2003 21:46:29 -0000 1.7
+++ syslog04 5 Jun 2003 15:42:03 -0000 1.8
@@ -27,6 +27,26 @@
# is logged with message. #
##################################################################
+<<<<<<< syslog04
+cleanup()
+{
+if [ $status_flag -eq 0 ]
+then
+ tst_resm TPASS "pid is logged with message."
+else
+ tst_resm TFAIL "pid is not logged with message."
+fi
+
+#Restore syslog.conf
+mv /etc/syslog.conf.ltpbak /etc/syslog.conf
+
+#Restart syslog
+tst_resm TINFO "Restart syslog"
+/etc/init.d/syslog restart 2>&1 1>/dev/null
+sleep 2
+exit $status_flag
+}
+=======
cleanup()
{
if [ $status_flag -eq 0 ]
@@ -49,6 +69,7 @@
fi
exit $status_flag
}
+>>>>>>> 1.7
syslog_case4()
{
#set the trap to handle signals.
@@ -82,6 +103,10 @@
#Restart syslog
tst_resm TINFO "Restart syslog deamon"
+<<<<<<< syslog04
+ /etc/init.d/syslog restart 2>&1 1>/dev/null
+ sleep 2
+=======
/etc/init.d/syslog restart 2>&1 1>/dev/null || RC=$?
if [ $RC -ne 0 ]
then
@@ -89,6 +114,7 @@
status_flag=1
cleanup
fi
+>>>>>>> 1.7
# Run syslogtst in the background and get the process id.
syslogtst 4 2>/dev/null &
Index: syslog05
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog05,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- syslog05 4 Jun 2003 21:46:29 -0000 1.7
+++ syslog05 5 Jun 2003 15:42:03 -0000 1.8
@@ -31,6 +31,26 @@
# the file /usr/adm/ktlog/<this year>/<this month>/ #
# <to_day> #
##################################################################
+<<<<<<< syslog05
+cleanup()
+{
+if [ $status_flag -eq 0 ]
+then
+ tst_resm TPASS "wrote to console"
+else
+ tst_resm TFAIL "write to console failed"
+fi
+
+#Restore syslog.conf
+mv /etc/syslog.conf.ltpbak /etc/syslog.conf
+
+#Restart syslog
+tst_resm TINFO "Restart syslog"
+/etc/init.d/syslog restart 2>&1 1>/dev/null
+sleep 2
+exit $status_flag
+}
+=======
cleanup()
{
if [ $status_flag -eq 0 ]
@@ -53,6 +73,7 @@
fi
exit $status_flag
}
+>>>>>>> 1.7
syslog_case5()
{
@@ -87,6 +108,10 @@
#Restart syslog
tst_resm TINFO "Restart syslog deamon"
+<<<<<<< syslog05
+ /etc/init.d/syslog restart 2>&1 1>/dev/null
+ sleep 2
+=======
/etc/init.d/syslog restart 2>&1 1>/dev/null || RC=$?
if [ $RC -ne 0 ]
then
@@ -94,6 +119,7 @@
status_flag=1
cleanup
fi
+>>>>>>> 1.7
# check if /var/log/messages script exists
find /var/log/ -name messages 2>&1 1>/dev/null || RC=$?
Index: syslog06
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog06,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- syslog06 4 Jun 2003 21:46:29 -0000 1.8
+++ syslog06 5 Jun 2003 15:42:03 -0000 1.9
@@ -31,6 +31,27 @@
# It should be greater than 3. #
##################################################################
+<<<<<<< syslog06
+cleanup()
+{
+if [ $status_flag -eq 0 ]
+then
+ tst_resm TPASS "file descriptor is greater than 3"
+else
+ tst_resm TFAIL "file descriptor is not greater than 3"
+fi
+
+#Restore syslog.conf
+mv /etc/syslog.conf.ltpbak /etc/syslog.conf
+
+#Restart syslog
+tst_resm TINFO "Restart syslog"
+/etc/init.d/syslog restart 2>&1 1>/dev/null
+sleep 2
+
+exit $status_flag
+}
+=======
cleanup()
{
if [ $status_flag -eq 0 ]
@@ -54,6 +75,7 @@
exit $status_flag
}
+>>>>>>> 1.8
syslog_case6()
{
#set the trap to handle signals.
@@ -89,6 +111,10 @@
#Restart syslog
tst_resm TINFO "Restart syslog deamon"
+<<<<<<< syslog06
+ /etc/init.d/syslog restart 2>&1 1>/dev/null
+ sleep 2
+=======
/etc/init.d/syslog restart 2>&1 1>/dev/null || RC=$?
if [ $RC -ne 0 ]
then
@@ -96,6 +122,7 @@
status_flag=1
cleanup
fi
+>>>>>>> 1.8
# Just call syslogtst. It will do everything.
# It will return 0 to indicate that test has passed.
Index: syslog07
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog07,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- syslog07 4 Jun 2003 21:46:30 -0000 1.8
+++ syslog07 5 Jun 2003 15:42:03 -0000 1.9
@@ -28,6 +28,26 @@
# o Send syslog messages at all levels and see whether #
# higher level messages are logged. #
##################################################################
+<<<<<<< syslog07
+cleanup()
+{
+if [ $status_flag -eq 0 ]
+then
+ tst_resm TPASS "higher level messages are logged."
+else
+ tst_resm TFAIL "higher level messages are not logged."
+fi
+
+#Restore syslog.conf
+mv /etc/syslog.conf.ltpbak /etc/syslog.conf
+
+#Restart syslog
+tst_resm TINFO "Restart syslog"
+/etc/init.d/syslog restart 2>&1 1>/dev/null
+sleep 2
+exit $status_flag
+}
+=======
cleanup()
{
if [ $status_flag -eq 0 ]
@@ -50,6 +70,7 @@
fi
exit $status_flag
}
+>>>>>>> 1.8
syslog_case7()
{
@@ -87,6 +108,10 @@
#Restart syslog
tst_resm TINFO "Restart syslog"
+<<<<<<< syslog07
+ /etc/init.d/syslog restart 2>&1 1>/dev/null
+ sleep 2
+=======
/etc/init.d/syslog restart 2>&1 1>/dev/null || RC=$?
if [ $RC -ne 0 ]
then
@@ -94,6 +119,7 @@
status_flag=1
cleanup
fi
+>>>>>>> 1.8
# Grep for the following patterns in the log file...
# check if /var/log/maillog script exists
Index: syslog08
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog08,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- syslog08 4 Jun 2003 21:46:30 -0000 1.8
+++ syslog08 5 Jun 2003 15:42:03 -0000 1.9
@@ -31,6 +31,27 @@
# facility. #
# o Send the message and grep for the entry in log file. #
##################################################################
+<<<<<<< syslog08
+cleanup()
+{
+if [ $status_flag -eq 0 ]
+then
+ tst_resm TPASS "all facilities work"
+else
+ tst_resm TPASS "some facilities failed to work"
+fi
+
+#Restore syslog.conf
+mv /etc/syslog.conf.ltpbak /etc/syslog.conf
+
+
+#Restart syslog
+tst_resm TINFO "Restart syslog"
+/etc/init.d/syslog restart 2>&1 1>/dev/null
+sleep 2
+exit $status_flag
+}
+=======
cleanup()
{
if [ $status_flag -eq 0 ]
@@ -54,6 +75,7 @@
fi
exit $status_flag
}
+>>>>>>> 1.8
syslog_case8()
{
@@ -97,6 +119,10 @@
#Restart syslog
tst_resm TINFO "Restart syslog"
+<<<<<<< syslog08
+ /etc/init.d/syslog restart 2>&1 1>/dev/null
+ sleep 2
+=======
/etc/init.d/syslog restart 2>&1 1>/dev/null || RC=$?
if [ $RC -ne 0 ]
then
@@ -104,6 +130,7 @@
status_flag=1
cleanup
fi
+>>>>>>> 1.8
# Grepping pattern is as follows:
# syslogtst: $current info test.
Index: syslog09
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog09,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- syslog09 4 Jun 2003 21:46:30 -0000 1.8
+++ syslog09 5 Jun 2003 15:42:03 -0000 1.9
@@ -28,6 +28,27 @@
# o Send message which is lower priority than the one #
# set above, which should not be logged. #
##################################################################
+<<<<<<< syslog09
+cleanup()
+{
+if [ $status_flag -eq 0 ]
+then
+ tst_resm TPASS "lower priority message not logged."
+else
+ tst_resm TFAIL "lower priority message is logged."
+fi
+
+#Restore syslog.conf
+mv /etc/syslog.conf.ltpbak /etc/syslog.conf
+
+
+#Restart syslog
+tst_resm TINFO "Restart syslog"
+/etc/init.d/syslog restart 2>&1 1>/dev/null
+sleep 2
+exit $status_flag
+}
+=======
cleanup()
{
if [ $status_flag -eq 0 ]
@@ -51,6 +72,7 @@
fi
exit $status_flag
}
+>>>>>>> 1.8
syslog_case9()
{
@@ -87,6 +109,10 @@
#Restart syslog
tst_resm TINFO "Restart syslog"
+<<<<<<< syslog09
+ /etc/init.d/syslog restart 2>&1 1>/dev/null
+ sleep 2
+=======
/etc/init.d/syslog restart 2>&1 1>/dev/null || RC=$?
if [ $RC -ne 0 ]
then
@@ -94,6 +120,7 @@
status_flag=1
cleanup
fi
+>>>>>>> 1.8
# check if /var/log/messages script exists
find /var/log/ -name messages 2>&1 1>/dev/null || RC=$?
Index: syslog10
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog10,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- syslog10 4 Jun 2003 21:46:30 -0000 1.9
+++ syslog10 5 Jun 2003 15:42:03 -0000 1.10
@@ -30,6 +30,27 @@
# o Send message which is at other priority level to #
# the one set above, which should not be logged. #
##################################################################
+<<<<<<< syslog10
+cleanup()
+{
+if [ $status_flag -eq 0 ]
+then
+ tst_resm TPASS " setlogmask() with LOG_MASK macro worked"
+else
+ tst_resm TFAIL " setlogmask() with LOG_MASK macro failed"
+fi
+
+#Restore syslog.conf
+mv /etc/syslog.conf.ltpbak /etc/syslog.conf
+
+#Restart syslog
+tst_resm TINFO "Restart syslog"
+/etc/init.d/syslog restart 2>&1 1>/dev/null
+sleep 2
+
+exit $status_flag
+}
+=======
cleanup()
{
if [ $status_flag -eq 0 ]
@@ -53,6 +74,7 @@
exit $status_flag
}
+>>>>>>> 1.9
syslog_case10()
{
@@ -89,6 +111,10 @@
#Restart syslog
tst_resm TINFO "Restart syslog"
+<<<<<<< syslog10
+ /etc/init.d/syslog restart 2>&1 1>/dev/null
+ sleep 2
+=======
/etc/init.d/syslog restart 2>&1 1>/dev/null || RC=$?
if [ $RC -ne 0 ]
then
@@ -96,6 +122,7 @@
status_flag=1
cleanup
fi
+>>>>>>> 1.9
# check if /var/log/messages script exists
find /var/log/ -name messages 2>&1 1>/dev/null || RC=$?
|