| Message ID | 20240315171325.2885-3-luis.henriques@linux.dev (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Ensure _scratch_fuzz_modify() works for other filesystems | expand |
On Fri, Mar 15, 2024 at 05:13:25PM +0000, Luis Henriques (SUSE) wrote: > 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> Thanks for updating the commit message, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > tests/ext4/006 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/ext4/006 b/tests/ext4/006 > index 8792167bd9c2..b73692aa5b81 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" >
diff --git a/tests/ext4/006 b/tests/ext4/006 index 8792167bd9c2..b73692aa5b81 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"
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> --- tests/ext4/006 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)