From: Luis Henriques (SUSE) <luis.henriques@linux.dev>
Date: Fri, 15 Mar 2024 17:13:25 +0000 (+0000)
Subject: ext4/006: take into account updates to _scratch_fuzz_modify()
X-Git-Tag: v2024.03.31~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ec7853cd69369dd7da58924ba3d32391d068c161;p=xfstests-dev.git

ext4/006: take into account updates to _scratch_fuzz_modify()

Test ext4/006 takes into account the number of lines produced by its own
output.  However, changes introduced to function _scratch_fuzz_modify() by
commit 9bab148bb3c7 ("common/fuzzy: exercise the filesystem a little harder
after repairing"), modified the output.  Namely, the following three lines
were removed:

	echo "+++ touch ${nr} files"
	echo "+++ create files"
	echo "+++ remove files"

And a new one was added:

	echo "+++ stressing filesystem"

However, the usage of 'fsstress' also added an extra line with:

	printf("seed = %ld\n", seed);

So the delta is one line (-3 + 2).

Modify test ext4/006 to take this change into account.

Signed-off-by: "Luis Henriques (SUSE)" <luis.henriques@linux.dev>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>
---

diff --git a/tests/ext4/006 b/tests/ext4/006
index 8792167b..b73692aa 100755
--- a/tests/ext4/006
+++ b/tests/ext4/006
@@ -131,7 +131,7 @@ echo "++ check fs (2)" >> $seqres.full
 _check_scratch_fs >> $seqres.full 2>&1
 
 grep -E -q '(did not fix|makes no progress)' $seqres.full && echo "e2fsck failed" | tee -a $seqres.full
-if [ "$(wc -l < "$ROUND2_LOG")" -ne 8 ]; then
+if [ "$(wc -l < "$ROUND2_LOG")" -ne 7 ]; then
 	echo "e2fsck did not fix everything" | tee -a $seqres.full
 fi
 echo "finished fuzzing" | tee -a "$seqres.full"