From nobody Thu Oct 01 16:27:50 2026 X-Original-To: dev-commits-src-main@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 4hwclW1tTXz6vDFx for ; Thu, 01 Oct 2026 16:27:51 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hwclW0qkwz4Xm2 for ; Thu, 01 Oct 2026 16:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790872071; 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=E9D3ZIozMlYhrSxVfVnEiyIyj+B8oM4jOoGycGw25ww=; b=GTRktTjiy27/txCpWvbU5Qjnt6x7ewx6s3/za9r9QWatxgoGESJTPgyAUfXobuqOFrmDXB EYcMcQRR2Jet1NMKMpJmTO6zaFi3WwjL/ezg6Z5/3ItnwXTjPw/QjYeEvAVmmF16eWUm3g pvFivXCCX4XtdvFcmsMyLQOjgR1xntHyJfDzNfY7a0Qy/2WICQ2EAD1rldUhsPvo93TXhJ Ta3ytAObc5TbKanMQe6nVWbLk90Y3O/E/jOePvUOKWz61qaGtQt5rNSHGm/N0FvaPOrOGQ WDf/DprnIOCIwTOBGnf+gkSrXScl4FNaHJgCc7L15uV/1m1Vxg0N+XgGvioJrw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790872071; b=gTn0/6O06dGbXbMr0XUiG39XM9ofmsFZEnHJXQBA0lrysRyZDwKN1+IiInm/vDY2MnMSb2 nsN/2xgAohvONHLn+6v0wS/9K4jY2GsDyHhLMLP/LVmDEDYmcY2qY3V5E9uFyt5ymItzlZ Gp4j+QcbRg0o8bVGgPhxuooZdkiWUObwDWV4wMUQCBbMPZWTPndRGCLaoxOQqvdR/mEvH1 fNVHhzfzmt5IYE1d3Rx/iWh4WO8dd5mJnb2jTbguGQ8HtNt7lmPGmxNnCWeJNKF3tnLPQH ebsYShXkkGXgnjzoSXwdH3gfTNLEepPD+1GvQHVbvfKH+DhQcAXfcwQXWemVfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790872071; 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=E9D3ZIozMlYhrSxVfVnEiyIyj+B8oM4jOoGycGw25ww=; b=FdQfFbGs13ljhgAfI4MMP9V9RpYqhEcFDC1lNtm2G7eC2AyFruaQUBs0jlOBr4y7HYVWsJ zOPxNbr9+5+JV7Dc41LwREKC87GW1MUOKPzLHSDagE0kbCbB3xcIFtOptvEo7bxPiwIVsY 44unjEm+lMRqf+y5Meg+AZ4q/WQ91TOq9ksV4JqYtA+sS1Cts9ibyjahDauG4RNmqAoD9C Es98IziOekxfttIjN5ELQ0eOFH2pvRIO+Ce8+uf41vOxj8of1uhCFvA1IDgVGaMjzpoZMm PkarmTncPT8KNpJLqF3928/ETQ1HIoz+9FRgt+wprqaDfTq2wUxfHIudz+n6gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hwclV6kFdzgxj for ; Thu, 01 Oct 2026 16:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4226f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Oct 2026 16:27:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Sobolev Subject: git: a68d11d310dd - main - stress2: Fix script bugs in gnop6.sh, gnop7.sh and fdatasync*.sh List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a68d11d310dd5100a18f187c1108df6703315989 Auto-Submitted: auto-generated Date: Thu, 01 Oct 2026 16:27:50 +0000 Message-Id: <6abe8a06.4226f.5f0e81ed@gitrepo.freebsd.org> The branch main has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=a68d11d310dd5100a18f187c1108df6703315989 commit a68d11d310dd5100a18f187c1108df6703315989 Author: Maxim Sobolev AuthorDate: 2026-10-01 16:26:06 +0000 Commit: Maxim Sobolev CommitDate: 2026-10-01 16:26:06 +0000 stress2: Fix script bugs in gnop6.sh, gnop7.sh and fdatasync*.sh gnop6.sh recorded the checkfs result with "checkfs ... || s=1 && s=0", which the shell parses as "(checkfs || s=1) && s=0", so the test passed even when the file system check failed. gnop7.sh only sets s when unmount or fsck_ffs fails and ends with "exit $s". On a clean run s is unset, and the script exits with the status of the preceding "[ $notloaded ] && gnop unload", which is 1 whenever geom_nop was already loaded, for instance by an earlier test. fdatasync.sh and fdatasync2.sh ran "df -i $RUNDIR" before creating the directory. With a RUNDIR that does not exist yet, df failed, the test printed "[: -lt: unexpected operator" and the free inode check was skipped. Reviewed by: pho Differential Revision: https://reviews.freebsd.org/D60136 Sponsored by: Sippy Software, Inc. MFC after: 2 weeks --- tools/test/stress2/misc/fdatasync.sh | 3 +-- tools/test/stress2/misc/fdatasync2.sh | 3 +-- tools/test/stress2/misc/gnop6.sh | 2 +- tools/test/stress2/misc/gnop7.sh | 1 + 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/test/stress2/misc/fdatasync.sh b/tools/test/stress2/misc/fdatasync.sh index 9abd31e5bd94..28397f39252d 100755 --- a/tools/test/stress2/misc/fdatasync.sh +++ b/tools/test/stress2/misc/fdatasync.sh @@ -37,6 +37,7 @@ dir=$RUNDIR nfiles=500 +mkdir -p $dir && chmod 777 $dir [ `df -i $dir | tail -1 | awk '{print $7}'` -lt $nfiles ] && exit 0 odir=`pwd` @@ -46,8 +47,6 @@ rm -f /tmp/fdatasync mycc -o fdatasync -Wall -Wextra -O2 -g fdatasync.c -lpthread || exit 1 rm -f fdatasync.c -mkdir -p $dir && chmod 777 $dir - cd $dir jot $nfiles | xargs touch jot $nfiles | xargs chmod 666 diff --git a/tools/test/stress2/misc/fdatasync2.sh b/tools/test/stress2/misc/fdatasync2.sh index 42ade0cedbd3..d790885baf1a 100755 --- a/tools/test/stress2/misc/fdatasync2.sh +++ b/tools/test/stress2/misc/fdatasync2.sh @@ -35,6 +35,7 @@ dir=$RUNDIR nfiles=10000 +mkdir -p $dir && chmod 777 $dir [ `df -i $dir | tail -1 | awk '{print $7}'` -lt $nfiles ] && exit 0 odir=`pwd` @@ -44,8 +45,6 @@ rm -f /tmp/fdatasync2 mycc -o fdatasync2 -Wall -Wextra -O2 -g fdatasync2.c -lpthread || exit 1 rm -f fdatasync2.c -mkdir -p $dir && chmod 777 $dir - cd $dir jot $nfiles | xargs touch jot $nfiles | xargs chmod 666 diff --git a/tools/test/stress2/misc/gnop6.sh b/tools/test/stress2/misc/gnop6.sh index 4d32f584662e..f7a49251cf72 100755 --- a/tools/test/stress2/misc/gnop6.sh +++ b/tools/test/stress2/misc/gnop6.sh @@ -60,7 +60,7 @@ su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1 while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done -checkfs /dev/md$mdstart.nop || s=1 && s=0 +checkfs /dev/md$mdstart.nop; s=$? gnop destroy /dev/md$mdstart.nop mdconfig -d -u $mdstart diff --git a/tools/test/stress2/misc/gnop7.sh b/tools/test/stress2/misc/gnop7.sh index 76008aabe925..44de25e1cf56 100755 --- a/tools/test/stress2/misc/gnop7.sh +++ b/tools/test/stress2/misc/gnop7.sh @@ -49,6 +49,7 @@ newfs $newfs_flags /dev/md$mdstart.nop > /dev/null mount /dev/md$mdstart.nop $mntpoint chmod 777 $mntpoint set +e +s=0 export runRUNTIME=3m export RUNDIR=$mntpoint/stressX