libext2fs: don't use O_DIRECT for files on tmpfs

[tools/e2fsprogs.git] / tests / f_mmp / script

diff --git a/tests/f_mmp/script b/tests/f_mmp/script
index 3d4a041..f433bd5 100644 (file)
--- a/tests/f_mmp/script
+++ b/tests/f_mmp/script
@@ -1,29 +1,26 @@
 FSCK_OPT=-yf
 
-TMPFILE=test.img
-rm -f $test_name.failed $test_name.ok
-> $TMPFILE
-
-stat -f $TMPFILE | grep -q "Type: tmpfs"
-if [ $? = 0 ]; then
-       rm -f $TMPFILE
-       echo "skipped for tmpfs (no O_DIRECT support)"
-       return 0
-fi
-
 echo "make the test image ..." > $test_name.log
 $MKE2FS -q -F -o Linux -b 4096 -O mmp -E mmp_update_interval=1 $TMPFILE 100 >> $test_name.log 2>&1
 status=$?
 if [ "$status" != 0 ] ; then
        echo "mke2fs -O mmp failed" > $test_name.failed
-       echo "failed"
+       echo "$test_name: $test_description: failed"
        return $status
 fi
 
+kill_debugfs() {
+       trap 0
+       PID=$(ps -o pid,command | grep -v grep |
+               grep "debugfs -w $TMPFILE" | awk "{ print \$1 }")
+       [ "x$PID" != "x" ] && kill -9 $PID
+}
+
 # this will cause debugfs to create the $test_name.mark file once it has
 # passed the MMP startup, then continue reading input until it is killed
 MARKFILE=$test_name.new
 rm -f $MARKFILE
+trap kill_debugfs EXIT
 echo "set mmp sequence to EXT2_MMP_SEQ_FSCK..." >> $test_name.log
 ( { echo dump_mmp; echo "dump_inode <2> $MARKFILE"; cat /dev/zero; } |
        $DEBUGFS -w $TMPFILE >> $test_name.log 2>&1 & ) > /dev/null 2>&1 &
@@ -33,15 +30,22 @@ while [ ! -e $MARKFILE ]; do
 done
 rm -f $MARKFILE
 echo "kill debugfs abruptly (simulates e2fsck failure) ..." >> $test_name.log
-killall -9 debugfs >> $test_name.log
+kill_debugfs
 
+$E2MMPSTATUS $TMPFILE > $test_name.log 2>&1
+status=$?
+if [ "$status" != 1 ] ; then
+       echo "$E2MMPSTATUS with EXT2_MMP_SEQ_FSCK passed!" > $test_name.failed
+       echo "$test_name: $test_description: failed"
+       return 1
+fi
 
 echo "e2fsck (should fail mmp_seq = EXT2_MMP_SEQ_FSCK) ..." >> $test_name.log
 $FSCK $FSCK_OPT $TMPFILE >> $test_name.log 2>&1
 status=$?
 if [ "$status" = 0 ] ; then
        echo "e2fsck with MMP as EXT2_MMP_SEQ_FSCK ran!" > $test_name.failed
-       echo "failed"
+       echo "$test_name: $test_description: failed"
        return 1
 fi
 
@@ -50,7 +54,7 @@ $TUNE2FS -f -E clear_mmp $TMPFILE >> $test_name.log 2>&1
 status=$?
 if [ "$status" != 0 ] ; then
        echo "tune2fs clearing EXT2_MMP_SEQ_FSCK failed" > $test_name.failed
-       echo "failed"
+       echo "$test_name: $test_description: failed"
        return 1
 fi
 
@@ -59,9 +63,9 @@ $FSCK $FSCK_OPT $TMPFILE >> $test_name.log 2>&1
 status=$?
 if [ "$status" != 0 ] ; then
        echo "e2fsck after clearing EXT2_MMP_SEQ_FSCK failed"> $test_name.failed
-       echo "failed"
+       echo "$test_name: $test_description: failed"
        return $status
 fi
 
-echo "ok"
+echo "$test_name: $test_description: ok"
 rm -f $TMPFILE