From nobody Tue Sep 23 19:33:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cWVX80P40z67pjc; Tue, 23 Sep 2025 19:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cWVX75qSsz3Sb5; Tue, 23 Sep 2025 19:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758656023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rWRRNjopRLMUoL96WAYYzis13t4vCf9Z/7S9ll7gWAQ=; b=majDA/mijLEtr7Y1pPpVW10OXKLwvKp3AYHrldgdwl5X1U3dqwaVnirqugi7J5D3Bz8T1P ivnYsMm052BqYJG+XVVqpxAsuJzZp36i6WKFz6+HTztRGpZLePcC3XcyskvkO6tHhtIgaj r9wr3MKXrkwuwCaatHQjnM8LD833Ce5hMIDIBOggBhjH/zVkuJx78W25t1DPAoCWbL19JR KcqQk6nygwAcR4JD+C4/e9NPDtN1MLEVlAqL+Sl557rBeAdcM9pRZnHAR4W2+3Goa1m8T1 9hAjbsbyN+GfZsaLCnlc2GUOFZVhvN1WIEhve4fmWFfWNGnbxTinuJOA6k342w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758656023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rWRRNjopRLMUoL96WAYYzis13t4vCf9Z/7S9ll7gWAQ=; b=r1PrPfjTJ1T6OFdHDZN5CX5gT5z4kZU0GvVQjfHX86T0FjtnzRkCZytAOv92Es0Trxb/gc Vy2brw+VFCPKlylVbDelQgzSkp0jZ2G2Fd4j/26pURsjlL5fcTnrCUaYrUI1ZgtBkQRfYu MsTdHRi1wQ/tToAJZ8Nfs/QmNCB9V+SFtocetCzOvHAXjnmd3GbCWQGdYXHHM6o2E/KQuh S0/JyRJ+3M4Z3e6Uj06Z9L7JZ71jhomNTE6/UAPHtWklEB3x+RsWSe5MdTZcA+/xxMZ8ft mXyIPt4DGR7XNVzyUgr34r8CRkIqVwgyCdfuxFPfmrnpnoiBOr34SuyIDw4zWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758656023; a=rsa-sha256; cv=none; b=Wz7pL2D1DruAnu6bUD2oLX/FFBvArfw/Vy0sywVUySoFY3FTlCN5q9sXGTuO1224E8FUZO og9D7fZD2UehABa0Cga/RXRs1eUZ43VfDmuInrOvtvFcmyC/t/DTcd+Ix3fPut8itQ8RHx cADaeYTkiMa5ctTOvXLW50bqxcfN5OaQYontPEYrkMhKnGdFwvkfzxSPGv12SiKqGC71Qi RPXqsnJRznipMrODIflICz/cAOINb8wG5vbUFq5lc00a7xxPgxYRkB3m9gj5HaKkgmxyQ7 lfMDPzHFNNESqHBkBfIVkwTg2kGd/K4cPoxdO+vijLkBT66OD+VjTjo77Tw8Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cWVX75RJyz102j; Tue, 23 Sep 2025 19:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58NJXhbJ058620; Tue, 23 Sep 2025 19:33:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NJXhgf058617; Tue, 23 Sep 2025 19:33:43 GMT (envelope-from git) Date: Tue, 23 Sep 2025 19:33:43 GMT Message-Id: <202509231933.58NJXhgf058617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: f221f410920d - main - tests/newsyslog: don't hardcode -F for newsyslog execution List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f221f410920df17a2044cd47a23a6f2a1268b44a Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f221f410920df17a2044cd47a23a6f2a1268b44a commit f221f410920df17a2044cd47a23a6f2a1268b44a Author: Gleb Smirnoff AuthorDate: 2025-09-23 09:23:00 +0000 Commit: Gleb Smirnoff CommitDate: 2025-09-23 19:32:26 +0000 tests/newsyslog: don't hardcode -F for newsyslog execution At the moment all tests need forced rotation, but future tests may not, so let the tests themselves decide if -F is needed. Should be no functional change. --- usr.sbin/newsyslog/tests/legacy_test.sh | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/usr.sbin/newsyslog/tests/legacy_test.sh b/usr.sbin/newsyslog/tests/legacy_test.sh index 1ec48d5a0cc7..c8c18a754977 100644 --- a/usr.sbin/newsyslog/tests/legacy_test.sh +++ b/usr.sbin/newsyslog/tests/legacy_test.sh @@ -206,7 +206,7 @@ tmpdir_clean() run_newsyslog() { - newsyslog -f ../newsyslog.conf -F -r "$@" + newsyslog -f ../newsyslog.conf -r "$@" } tests_normal_rotate() { @@ -216,17 +216,17 @@ tests_normal_rotate() { dir="$2" if [ -n "$dir" ]; then - newsyslog_args=" -a ${dir}" + newsyslog_args="-F -a ${dir}" name_postfix="${ext} archive dir" else - newsyslog_args="" + newsyslog_args="-F" name_postfix="${ext}" fi tmpdir_create begin "create file ${name_postfix}" -newdir - run_newsyslog -C + run_newsyslog -CF ckfe $LOGFNAME cknt ${dir}${LOGFNAME}.0${ext} end @@ -294,17 +294,17 @@ tests_normal_rotate_keepn() { dir="$3" if [ -n "$dir" ]; then - newsyslog_args=" -a ${dir}" + newsyslog_args="-F -a ${dir}" name_postfix="${ext} archive dir" else - newsyslog_args="" + newsyslog_args="-F" name_postfix="${ext}" fi tmpdir_create begin "create file ${name_postfix}" -newdir - run_newsyslog -C + run_newsyslog -CF ckfe $LOGFNAME cknt ${dir}${LOGFNAME}.0${ext} end @@ -363,10 +363,10 @@ tests_time_rotate() { dir="$2" if [ -n "$dir" ]; then - newsyslog_args="-t DEFAULT -a ${dir}" + newsyslog_args="-F -t DEFAULT -a ${dir}" name_postfix="${ext} archive dir" else - newsyslog_args="-t DEFAULT" + newsyslog_args="-F -t DEFAULT" name_postfix="${ext}" fi @@ -424,17 +424,17 @@ tests_rfc5424() { dir="$2" if [ -n "$dir" ]; then - newsyslog_args=" -a ${dir}" + newsyslog_args="-F -a ${dir}" name_postfix="${ext} archive dir" else - newsyslog_args="" + newsyslog_args="-F" name_postfix="${ext}" fi tmpdir_create begin "RFC-5424 - create file ${name_postfix}" -newdir - run_newsyslog -C + run_newsyslog -CF ckfe $LOGFNAME cknt ${dir}${LOGFNAME}.0${ext} ckfe $LOGFNAME5424 @@ -466,23 +466,23 @@ tests_p_flag_rotate() { tmpdir_create begin "create file" - run_newsyslog -C + run_newsyslog -CF ckfe $LOGFNAME cknt ${LOGFNAME}.0 cknt ${LOGFNAME}.0${ext} end begin "rotate p flag 1 ${ext}" - run_newsyslog + run_newsyslog -F ckfe $LOGFNAME ckfe ${LOGFNAME}.0 cknt ${LOGFNAME}.0${ext} - run_newsyslog + run_newsyslog -F ckfe $LOGFNAME ckfe ${LOGFNAME}.0 cknt ${LOGFNAME}.0${ext} ckfe ${LOGFNAME}.1${ext} - run_newsyslog + run_newsyslog -F ckfe $LOGFNAME ckfe ${LOGFNAME}.0 cknt ${LOGFNAME}.0${ext} @@ -501,13 +501,13 @@ tests_normal_rotate_recompress() { tmpdir_create begin "create file recompress" - run_newsyslog -C + run_newsyslog -CF ckfe $LOGFNAME cknt ${LOGFNAME}.0${ext} end begin "rotate normal 1" - run_newsyslog + run_newsyslog -F ckfe $LOGFNAME ckfe ${LOGFNAME}.0${ext} cknt ${LOGFNAME}.1${ext} @@ -517,7 +517,7 @@ tests_normal_rotate_recompress() { gunzip ${LOGFNAME}.0${ext} ckfe ${LOGFNAME}.0 cknt ${LOGFNAME}.0${ext} - run_newsyslog + run_newsyslog -F ckfe $LOGFNAME ckfe ${LOGFNAME}.0${ext} ckfe ${LOGFNAME}.1${ext}