| Message ID | 20240314172512.28293-3-luis.henriques@linux.dev (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Ensure _scratch_fuzz_modify() works for other filesystems | expand |
On Thu, Mar 14, 2024 at 05:25:12PM +0000, Luis Henriques (SUSE) wrote: > Since function _scratch_fuzz_modify() has been updated, its output has > changed. Modify test ext4/006 to take this change into account. Now that you've blocked off the XFS stuff, what line changed? --D > Signed-off-by: Luis Henriques (SUSE) <luis.henriques@linux.dev> > --- > 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" >
"Darrick J. Wong" <djwong@kernel.org> writes: > On Thu, Mar 14, 2024 at 05:25:12PM +0000, Luis Henriques (SUSE) wrote: >> Since function _scratch_fuzz_modify() has been updated, its output has >> changed. Modify test ext4/006 to take this change into account. > > Now that you've blocked off the XFS stuff, what line changed? Well, there are three lines that are gone with commit 9bab148bb3c7: echo "+++ touch ${nr} files" echo "+++ create files" echo "+++ remove files" And a new one was added: echo "+++ stressing filesystem" However, running fsstress will also add a new line with: printf("seed = %ld\n", seed); So the delta is one line (seven instead of eight). Cheers,
On Fri, Mar 15, 2024 at 09:11:32AM +0000, Luis Henriques wrote: > "Darrick J. Wong" <djwong@kernel.org> writes: > > > On Thu, Mar 14, 2024 at 05:25:12PM +0000, Luis Henriques (SUSE) wrote: > >> Since function _scratch_fuzz_modify() has been updated, its output has > >> changed. Modify test ext4/006 to take this change into account. > > > > Now that you've blocked off the XFS stuff, what line changed? > > Well, there are three lines that are gone with commit 9bab148bb3c7: > > echo "+++ touch ${nr} files" > echo "+++ create files" > echo "+++ remove files" > > And a new one was added: > > echo "+++ stressing filesystem" > > However, running fsstress will also add a new line with: > > printf("seed = %ld\n", seed); > > So the delta is one line (seven instead of eight). Ah, ok. Can you copy-paste that into the commit message so that we have some record of what caused the need for the adjustment, please? With that added, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > Cheers, > -- > Luís > > > > > --D > > > >> Signed-off-by: Luis Henriques (SUSE) <luis.henriques@linux.dev> > >> --- > >> 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"
Since function _scratch_fuzz_modify() has been updated, its output has changed. 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(-)