Date: Tue, 7 Apr 2020 16:15:54 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359693 - stable/12/usr.sbin/newsyslog/tests Message-ID: <202004071615.037GFsdY035463@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Tue Apr 7 16:15:53 2020 New Revision: 359693 URL: https://svnweb.freebsd.org/changeset/base/359693 Log: MFC r359277: Add regression tests for newsyslog.conf's p flag. Modified: stable/12/usr.sbin/newsyslog/tests/legacy_test.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/newsyslog/tests/legacy_test.sh ============================================================================== --- stable/12/usr.sbin/newsyslog/tests/legacy_test.sh Tue Apr 7 16:15:35 2020 (r359692) +++ stable/12/usr.sbin/newsyslog/tests/legacy_test.sh Tue Apr 7 16:15:53 2020 (r359693) @@ -194,7 +194,8 @@ ckstr() tmpdir_create() { - mkdir -p ${TMPDIR}/log ${TMPDIR}/alog + rm -rf ${TMPDIR}/log ${TMPDIR}/alog + mkdir ${TMPDIR}/log ${TMPDIR}/alog cd ${TMPDIR}/log } @@ -211,6 +212,8 @@ run_newsyslog() } tests_normal_rotate() { + local dir ext name_postfix newsyslog_args + ext="$1" dir="$2" @@ -286,6 +289,8 @@ tests_normal_rotate() { } tests_normal_rotate_keepn() { + local cnt dir ext name_postfix newsyslog_args + cnt="$1" ext="$2" dir="$3" @@ -354,6 +359,8 @@ tests_normal_rotate_keepn() { } tests_time_rotate() { + local dir ext name_postfix newsyslog_args + ext="$1" dir="$2" @@ -413,6 +420,8 @@ tests_time_rotate() { } tests_rfc5424() { + local dir ext name_postfix newsyslog_args + ext="$1" dir="$2" @@ -451,7 +460,73 @@ tests_rfc5424() { tmpdir_clean } -echo 1..180 +tests_p_flag_rotate() { + local ext + + ext="$1" + + tmpdir_create + + begin "create file" + run_newsyslog -C + ckfe $LOGFNAME + cknt ${LOGFNAME}.0 + cknt ${LOGFNAME}.0${ext} + end + + begin "rotate p flag 1 ${ext}" + run_newsyslog + ckfe $LOGFNAME + ckfe ${LOGFNAME}.0 + cknt ${LOGFNAME}.0${ext} + run_newsyslog + ckfe $LOGFNAME + ckfe ${LOGFNAME}.0 + cknt ${LOGFNAME}.0${ext} + ckfe ${LOGFNAME}.1${ext} + run_newsyslog + ckfe $LOGFNAME + ckfe ${LOGFNAME}.0 + cknt ${LOGFNAME}.0${ext} + ckfe ${LOGFNAME}.1${ext} + ckfe ${LOGFNAME}.2${ext} + end + + tmpdir_clean +} + +tests_normal_rotate_recompress() { + local ext + + ext=".gz" + + tmpdir_create + + begin "create file recompress" + run_newsyslog -C + ckfe $LOGFNAME + cknt ${LOGFNAME}.0${ext} + end + + begin "rotate normal 1" + run_newsyslog + ckfe $LOGFNAME + ckfe ${LOGFNAME}.0${ext} + cknt ${LOGFNAME}.1${ext} + end + + begin "rotate recompress 1" + gunzip ${LOGFNAME}.0${ext} + ckfe ${LOGFNAME}.0 + cknt ${LOGFNAME}.0${ext} + run_newsyslog + ckfe $LOGFNAME + ckfe ${LOGFNAME}.0${ext} + ckfe ${LOGFNAME}.1${ext} + end +} + +echo 1..185 mkdir -p ${TMPDIR} cd ${TMPDIR} @@ -556,5 +631,11 @@ tests_time_rotate "zst" "${TMPDIR}/alog/" echo "$LOGFPATH5424 640 3 * @T00 NCT" > newsyslog.conf echo "$LOGFPATH 640 3 * @T00 NC" >> newsyslog.conf tests_rfc5424 + +echo "$LOGFPATH 640 3 * @T00 NCpZ" > newsyslog.conf +tests_p_flag_rotate ".gz" + +echo "$LOGFPATH 640 3 * @T00 NCZ" > newsyslog.conf +tests_normal_rotate_recompress rm -rf "${TMPDIR}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004071615.037GFsdY035463>