From 99028414c3272ddd6fe0eb44cd75d8952538f713 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sat, 5 Mar 2022 16:33:52 +0100 Subject: [PATCH] test: run all syslogd with kernel logging disabled Since we currently cannot test kernel logging, and we don't want to risk any log messages from the kernel to suddenly pop up and disturb tests, this patch explicitly disables it. Signed-off-by: Joachim Wiberg --- test/fwd.sh | 2 +- test/lib.sh | 2 +- test/opts.sh | 2 +- test/remote.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/fwd.sh b/test/fwd.sh index 5d7170d..1088b89 100755 --- a/test/fwd.sh +++ b/test/fwd.sh @@ -19,7 +19,7 @@ kern.* /dev/null *.*;kern.none ${LOG2} ;RFC5424 EOF -../src/syslogd -a 127.0.0.2:* -b :${PORT2} -d -F -f ${CONF2} -p ${SOCK2} -m1 -C ${CACHE2} -P ${PID2} & +../src/syslogd -K -a 127.0.0.2:* -b :${PORT2} -d -F -f ${CONF2} -p ${SOCK2} -m1 -C ${CACHE2} -P ${PID2} & kill -HUP `cat ${PID}` sleep 2 diff --git a/test/lib.sh b/test/lib.sh index 9612cbd..2b5b196 100755 --- a/test/lib.sh +++ b/test/lib.sh @@ -99,7 +99,7 @@ setup() *.* @127.0.0.2:${PORT2} ;RFC3164 EOF - ../src/syslogd -m1 -b :${PORT} -d -sF -f ${CONF} -p ${SOCK} -p ${ALTSOCK} -C ${CACHE} -P ${PID} & + ../src/syslogd -K -m1 -b :${PORT} -d -sF -f ${CONF} -p ${SOCK} -p ${ALTSOCK} -C ${CACHE} -P ${PID} & sleep 2 cat ${PID} >> "$DIR/PIDs" diff --git a/test/opts.sh b/test/opts.sh index f3cfb24..c9e184a 100755 --- a/test/opts.sh +++ b/test/opts.sh @@ -10,7 +10,7 @@ cat < ${CONF} *.* -${LOG} ;rotate=10M:5,RFC5424 EOF -../src/syslogd -m1 -b :${PORT} -d -sF -f ${CONF} -p ${SOCK} -p ${ALTSOCK} >${LOG2} & +../src/syslogd -K -m1 -b :${PORT} -d -sF -f ${CONF} -p ${SOCK} -p ${ALTSOCK} >${LOG2} & echo "$!" > ${PID} cat ${PID} >> "$DIR/PIDs" diff --git a/test/remote.sh b/test/remote.sh index 0331b6d..82e4667 100755 --- a/test/remote.sh +++ b/test/remote.sh @@ -15,7 +15,7 @@ export MSG="kilroy" cat <<-EOF >${CONFD2}/50-default.conf *.* ${LOG2} EOF -../src/syslogd -a 127.0.0.2:* -b :${PORT2} -d -F -f ${CONF2} -p ${SOCK2} -m1 -C ${CACHE2} -P ${PID2} & +../src/syslogd -K -a 127.0.0.2:* -b :${PORT2} -d -F -f ${CONF2} -p ${SOCK2} -m1 -C ${CACHE2} -P ${PID2} & sleep 3 cat ${PID2} >> "$DIR/PIDs" kill -USR1 `cat ${PID2}`