On Sat, Dec 21, 2019 at 05:55:18PM +0900, Kusanagi Kouichi wrote:
Make tests pass regardless of options set by MOUNT_OPTIONS.
Signed-off-by: Kusanagi Kouichi <slash@xxxxxxxxxxxxxxx>
---
common/rc | 3 +--
tests/generic/003 | 6 +++---
tests/generic/120 | 2 +-
tests/generic/192 | 1 +
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/rc b/common/rc
index 5cdd829b..e2f081c0 100644
--- a/common/rc
+++ b/common/rc
@@ -440,7 +440,7 @@ _test_cycle_mount()
return
fi
_test_unmount
- _test_mount
+ _test_mount "$@"
}
_scratch_mkfs_options()
It would be less confusing to have the same interface as
_scratch_cycle_mount().
@@ -3392,7 +3392,6 @@ _exclude_scratch_mount_option()
_require_atime()
{
- _exclude_scratch_mount_option "noatime"
case $FSTYP in
nfs|cifs)
_notrun "atime related mount options have no effect on $FSTYP"
diff --git a/tests/generic/003 b/tests/generic/003
index 767d7059..a634b1a4 100755
--- a/tests/generic/003
+++ b/tests/generic/003
@@ -66,7 +66,7 @@ _compare_stat_times() {
}
_scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed"
-_scratch_mount "-o relatime"
+_scratch_mount "-o atime,nostrictatime,relatime"
if [ "$FSTYP" = "btrfs" ]; then
TPATH=$SCRATCH_MNT/sub1
@@ -94,7 +94,7 @@ _compare_stat_times NNN "$file1_stat_after_first_access" \
"$file1_stat_after_second_access" "after accessing file1 second time"
# Mounting with nodiratime option
-_scratch_cycle_mount "nodiratime"
+_scratch_cycle_mount "atime,nodiratime"
file1_stat_after_remount=`_stat $TPATH/dir1/file1`
_compare_stat_times NNN "$file1_stat_after_second_access" \
"$file1_stat_after_remount" "for file1 after remount"
@@ -120,7 +120,7 @@ _compare_stat_times NNN "$dir2_stat_after_file_creation" \
"$dir2_stat_after_file_access" "for dir2 after file access"
# Mounting with noatime option, creating a file and accessing it
-_scratch_cycle_mount "noatime"
+_scratch_cycle_mount "noatime,nostrictatime"
echo "ccc" > $TPATH/dir2/file3
file3_stat_before_first_access=`_stat $TPATH/dir2/file3`
sleep 1
diff --git a/tests/generic/120 b/tests/generic/120
index 48ca9508..2f86d9fc 100755
--- a/tests/generic/120
+++ b/tests/generic/120
@@ -44,7 +44,7 @@ _compare_access_times()
}
-if ! _try_scratch_mount "-o noatime" >$tmp.out 2>&1
+if ! _try_scratch_mount "-o noatime,nostrictatime" >$tmp.out 2>&1
then
cat $tmp.out
echo "!!! mount failed"
I'm not sure about these parts, but personally I think it's OK to just
skip atime related tests when you explicitly specify
MOUNT_OPTIONS=noatime. So, you state you want to test FS behavior with
noatime by specifying the MOUNT_OPTIONS, then it would be no use to
run those atime related tests anyway.
Or, we need to add _exclude_scratch_mount_option "strictatime" also?
diff --git a/tests/generic/192 b/tests/generic/192
index 50b3d6fd..37197979 100755
--- a/tests/generic/192
+++ b/tests/generic/192
@@ -38,6 +38,7 @@ testfile=$TEST_DIR/testfile
rm -f $testfile
rm -f $seqres.full
+_test_cycle_mount -o atime
echo test >$testfile
time1=`_access_time $testfile | tee -a $seqres.full`
--
2.24.1
