From nobody Tue Jun 16 10:58:12 2026 X-Original-To: dev-commits-src-branches@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 4gfkVX6J2Yz6hR2c for ; Tue, 16 Jun 2026 10:58:12 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gfkVX4X0xz3Fnc for ; Tue, 16 Jun 2026 10:58:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781607492; 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=6PdlflSy0bwB/NS+dAVjWCY1cL+wWYQTjRsC1LLcGAI=; b=Xi9DgTdBT1vjjTcD/Jz3Tc+6DZ5/eT64Jj2NbL4fl/JXn3IgJzlDrXIl6lAIxVLKx0yWcM zkQ68eiMjv0P/JXrOXyaYzcKnqwSCkzSQnkBWP1Yauc576uJidcOrsKVSbiChXRrW7BLQG blbtY0bLs9xx/nIvxlige91rHhVCB90JOwIA2D9mRnq7f3SavxdYxy2OJ665pkzGLUTDna P3GF18Qtyl/a2bF9sFKRZ5YsLCieLILJVZkB2GqW/gomryxnLuxwTPte8gNlmo/KNvYpYU zCuCfmcBIpWQIubQIxdcyrrNThbdI9Yup0XQEaUAvEVZO0GQ5mYbTl6vJEHhig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781607492; a=rsa-sha256; cv=none; b=xSEqbxy8TV6kAx+QT3+3LcenLtt69oQc1JP+tdzHv9VVfePlFhA695O5f8DbMNtXZbm/3C S/gw2xr+ELxyrGJYDCxkEHgqLZB2hZnmIdgUvsfXAxbgNXYCaoNb44My9e3uLKXks60yrZ ruQvFcPSsWFo7oPNkJxqpBtFXThlgu8zaZTxFawcXrOSaihK6bMKNhFXgwys0Fc/s1/5yE NzuQSZDrjfsSYfiVUpVKJa9E9kjikJ/pMAqHu4yYeYlpuNl4kxJ9A9i7O7tBPqENJhKyjS jjaiWaMbTp/YOtVoV6oXnACeCSblqGVMv5S+ZqOJY0tC/2rZz/optkAabXeqKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781607492; 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=6PdlflSy0bwB/NS+dAVjWCY1cL+wWYQTjRsC1LLcGAI=; b=rP+9rQX4a4AIJHieNiIxTyNIxRQ2koiuPOu6hUj9ZrPMiTSRsl+XHc+ObVIn0RRADFkSqp Q4oezBl1z3MEHRVEtl5IiNFES7NFr86js7xLpNapVfDtUlGtFINctlCdruCPGaTazxR0cp zgEpfObb9tarUWAmdVwUn0buNoGkDkqHa8C0yAXMV7d5N3GzxTAebJnw6B09SiGSzCAkUj T59vByPKCJMGvUvx+RJ0+/6d3ss5Nwjk33OHFZsUPJ73XYLbrOYusmFyMRuI0YmN4hYwjW OSVRv5xs8O6TgnMo5MPp1+aFUmF69ufywIsg7UUv7wYLG2ZDIBFV8SqTMpNbSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gfkVX41xbz794 for ; Tue, 16 Jun 2026 10:58:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19b4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Jun 2026 10:58:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Stefa=?utf-8?Q?n E=C3=9Fer?= Subject: git: 3c1e899130a0 - stable/15 - tools/test/stress2/misc/all.debug.inc: skip undefined variables List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3c1e899130a0a141c9d166bff2d93bb07f621157 Auto-Submitted: auto-generated Date: Tue, 16 Jun 2026 10:58:12 +0000 Message-Id: <6a312c44.19b4c.f5d8b11@gitrepo.freebsd.org> The branch stable/15 has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=3c1e899130a0a141c9d166bff2d93bb07f621157 commit 3c1e899130a0a141c9d166bff2d93bb07f621157 Author: Stefan Eßer AuthorDate: 2026-06-11 11:15:12 +0000 Commit: Stefan Eßer CommitDate: 2026-06-16 10:57:44 +0000 tools/test/stress2/misc/all.debug.inc: skip undefined variables On my ZFS based systems, no allocations occur with tags "newblk" or "freework". This leads to errors executing the tests that check for memory leaks. Skip the checks if the output of wmstat -m does not contain lines corresponding to those allocations. MFC after: 3 days (cherry picked from commit 6e5b990c509777544b790cc8e490965166d04684) --- tools/test/stress2/misc/all.debug.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/test/stress2/misc/all.debug.inc b/tools/test/stress2/misc/all.debug.inc index 4042ca1f7718..419945154791 100644 --- a/tools/test/stress2/misc/all.debug.inc +++ b/tools/test/stress2/misc/all.debug.inc @@ -49,13 +49,15 @@ post_debug() { debug_statfs=$debug_new; } debug_new=`vmstat -m | grep -w freework | awk '{print $2}'` - [ $((debug_new - debug_freework)) -gt 0 -a $debug_new -gt 100 ] && + [ -n "$debug_new" ] && + [ $((debug_new - debug_freework)) -gt 0 -a $debug_new -gt 100 ] && { printf "stress2: freework leak: %d/%d.\r\n" \ $((debug_new - debug_freework)) $debug_new > $console debug_freework=$debug_new; } debug_new=`vmstat -m | grep -w newblk | awk '{print $2}'` - [ $((debug_new - debug_newblk)) -gt 0 -a $debug_new -gt 100 ] && + [ -n "$debug_new" ] && + [ $((debug_new - debug_newblk)) -gt 0 -a $debug_new -gt 100 ] && { printf "stress2: newblk leak: %d/%d.\r\n" \ $((debug_new - debug_newblk)) $debug_new > $console debug_newblk=$debug_new; }