public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] common/rc: add the function _require_noatime
@ 2018-05-18 11:10 XiaoLi Feng
  2018-05-21  7:50 ` Eryu Guan
  0 siblings, 1 reply; 6+ messages in thread
From: XiaoLi Feng @ 2018-05-18 11:10 UTC (permalink / raw)
  To: fstests; +Cc: xiaoli feng

From: xiaoli feng <xifeng@redhat.com>

In the generic/120, it will make the test not-pass if the filesystem
mounts failed with noatime. Now change this result to norun. The
filesystem cifs doesn't support noatime. Just make the test norun
until it supports noatime.

Signed-off-by: xiaoli feng <xifeng@redhat.com>
---
 common/rc         | 8 +++++++-
 tests/generic/120 | 7 +------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/rc b/common/rc
index ffe5323..9c45f1b 100644
--- a/common/rc
+++ b/common/rc
@@ -3244,7 +3244,13 @@ _require_atime()
 	_exclude_scratch_mount_option "noatime"
 	if [ "$FSTYP" == "nfs" ]; then
 		_notrun "atime related mount options have no effect on NFS"
-	fi
+}
+
+_require_noatime()
+{
+	_exclude_scratch_mount_option "atime"
+	 _try_scratch_mount -o noatime || \
+                _notrun "noatime not supported by the current tested filesystem"
 }
 
 _require_relatime()
diff --git a/tests/generic/120 b/tests/generic/120
index 1180c10..ddd61b3 100755
--- a/tests/generic/120
+++ b/tests/generic/120
@@ -60,12 +60,7 @@ _compare_access_times()
 
 }
 
-if ! _try_scratch_mount "-o noatime" >$tmp.out 2>&1
-then
-    cat $tmp.out
-    echo "!!! mount failed"
-    exit
-fi
+_require_noatime
 
 #executable file
 echo "*** copying file ***"
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-05-22  2:54 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-18 11:10 [PATCH] common/rc: add the function _require_noatime XiaoLi Feng
2018-05-21  7:50 ` Eryu Guan
2018-05-21  8:50   ` Fwd: " Xiaoli Feng
2018-05-21 23:54     ` Steve French
2018-05-22  2:21       ` Eryu Guan
2018-05-22  2:54       ` Xiaoli Feng

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox