From nobody Tue Jun 16 11:00:52 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 4gfkYc6qKnz6hR39 for ; Tue, 16 Jun 2026 11:00:52 +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 4gfkYc5Ds9z3H8l for ; Tue, 16 Jun 2026 11:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781607652; 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=sq3cKucUPHWBVLO8AOt7e7V0yHB2OJcuCH6TiU+xEEk=; b=Y99+sFUgE6oBl6CngFFIkK2oc4XasIr3ArxO+dhUkMf37lEV9VVIJUHeG6WiqhdGd6YSOt cVKNTRVRWZjbA0VqsYsC9P5TPm9wzXcrkZ6P8rT5mfUStwNBKDAcAS1FbqaeWY/KeFDGxC i7/CV7VWiO8OCblE648MwZ4b7OPeLaqvtu/NbKbM8bplVOpEdwPS5tXRX+J08p1khLeLDV XAyeD0Su3sVwH+8at3mQ+/P/iVE3Uwwaf9V1LpmUkQo2fAGGkOeMLhlPFqbai3QP1fbfn9 PtPYWyvygHU6QxiBxrVZ4PHUUrN4wX9W3D5gsxkmxZz5HmgcUk5Wu2arQN8Cjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781607652; a=rsa-sha256; cv=none; b=lMilUUP8+fWiTW9mBzEDMtONnuhb/KsEVg6U3PDbPcII9WLiAfM9jhKYbT45VRLbBy+KXq La9U2fHzJx0JUBWBgN4yD7BeRhEgl616SNr1c1JxfsUYaRcDMUwoPyu/b+bKJV2mn7f07E hNXzRWefPSFyOcDMPsFAFpaElkQB55ZOqml5rks+j5yQqFAfW8RuAsuKksoh/ztgBqjWxh ksSbZgj0nPPQP59z6xJ/orKSrQAHiAteynMRyRB+HIuJ+OD/yaoRHRVbAT+WvFJgaIyl/A 1HR/++T+VpB2NdnXuk2HADR6/Er6P/KJPER73LxYdNPkVHX1uRQc2RXqrebHxA== 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=1781607652; 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=sq3cKucUPHWBVLO8AOt7e7V0yHB2OJcuCH6TiU+xEEk=; b=lY5a2wt/t+bxRCJXSgMMNgIMEJX+2GhNbi52IVPgrcp73SRQpkzNvxJzD5Vj4AYsSbjENm qTwFkEdezDzLWrvwycBJDVtBgX5j1WVlbweN+ghDl1aDlRJjXTIy3LZP6Nx/c7eB/XRnP1 MaY5ZpqTzr+hma4TytUnEzbi7k06BiTErPsQ6MFklnDb+c7gRrm4076mtwFgYt4WO83B91 CLtULIXLLnhGwoLR7IyDKWYURz0WW46uit0hRjuSAgQ14EvBm9m8Ao0/8K/KErmwyy0QDf 01cz9F7rFxJQAl09xdiQ1MPK97r0LXFvGYKMl8AvWcW94AYb+Nk97RGS1xn0CA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gfkYc4rd8z79J for ; Tue, 16 Jun 2026 11:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d080 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Jun 2026 11:00:52 +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: 9262b124a26e - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 9262b124a26e1d4881e51da7fcbee5a571d88e49 Auto-Submitted: auto-generated Date: Tue, 16 Jun 2026 11:00:52 +0000 Message-Id: <6a312ce4.1d080.7a4f115d@gitrepo.freebsd.org> The branch stable/14 has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=9262b124a26e1d4881e51da7fcbee5a571d88e49 commit 9262b124a26e1d4881e51da7fcbee5a571d88e49 Author: Stefan Eßer AuthorDate: 2026-06-11 11:15:12 +0000 Commit: Stefan Eßer CommitDate: 2026-06-16 11:00:32 +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; }