From 7823f7c160d78ca1eaac35b37943721679bb46cd Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 5 Dec 2022 13:41:44 +0100 Subject: [PATCH] ext4/044: Fix failure when mount options are incompatible with ext3 There are some mount options that are incompatible with ext3 filesystem type. If they are used, this test fails because it tries to remount the filesystem as ext3. The test makes sense even without remounting as ext3 so just make the test silently skip the remount. Signed-off-by: Jan Kara Reviewed-by: David Disseldorp Signed-off-by: Zorro Lang --- tests/ext4/044 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/ext4/044 b/tests/ext4/044 index 50de5a40..96fa70cc 100755 --- a/tests/ext4/044 +++ b/tests/ext4/044 @@ -53,9 +53,10 @@ _within_tolerance "sec_ctime" $sec_ctime $sec 1 -v _scratch_unmount >> $seqres.full 2>&1 -# Test mount to ext3 then mount back to ext4 and check timestamp again -_mount -t ext3 `_scratch_mount_options $*` || _fail "ext3 mount failed" -_scratch_unmount >> $seqres.full 2>&1 +# Test mount to ext3 then mount back to ext4 and check timestamp again. We +# ignore if ext3 failed to mount. It can happen because some mount options are +# incompatible with ext3. Still the test makes sense. +_mount -t ext3 `_scratch_mount_options $*` >> $seqres.full 2>&1 && _scratch_unmount >> $seqres.full 2>&1 _scratch_mount nsec_atime2=`$here/src/t_get_file_time $SCRATCH_MNT/tmp_file atime nsec` -- 2.39.5