linux-f2fs-devel.lists.sourceforge.net archive mirror
 help / color / mirror / Atom feed
From: Jaegeuk Kim <jaegeuk@kernel.org>
To: Dave Chinner <david@fromorbit.com>
Cc: fstests@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net,
	Jaegeuk Kim <jaegeuk@kernel.org>
Subject: [PATCH 6/8 v4] common/rc:  define dump.f2fs and logstate for f2fs
Date: Tue,  3 Feb 2015 15:07:18 -0800	[thread overview]
Message-ID: <1423004840-45315-7-git-send-email-jaegeuk@kernel.org> (raw)
In-Reply-To: <1423004840-45315-1-git-send-email-jaegeuk@kernel.org>

This patch defines dump.f2fs and logstate for f2fs's clean and dirty logs.
And, also it adds _link_out_file_fs to specify output according to filesystem.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
 common/config |  1 +
 common/log    | 20 +++++++++++++++++---
 common/rc     | 22 ++++++++++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/common/config b/common/config
index 9fb3703..cdc2214 100644
--- a/common/config
+++ b/common/config
@@ -221,6 +221,7 @@ case "$HOSTOS" in
         export MKFS_UDF_PROG="`set_prog_path mkudffs`"
         export MKFS_BTRFS_PROG="`set_btrfs_mkfs_prog_path_with_opts`"
         export MKFS_F2FS_PROG="`set_prog_path mkfs.f2fs`"
+        export DUMP_F2FS_PROG="`set_prog_path dump.f2fs`"
         export BMAP_F2FS_PROG="`set_prog_path fibmap.f2fs`"
         export BTRFS_UTIL_PROG="`set_prog_path btrfs`"
         export BTRFS_SHOW_SUPER_PROG="`set_prog_path btrfs-show-super`"
diff --git a/common/log b/common/log
index 87074d9..186eb4c 100644
--- a/common/log
+++ b/common/log
@@ -218,11 +218,25 @@ _check_log()
 
 _print_logstate()
 {
-    _scratch_xfs_logprint -t | tee -a $seqres.full >$tmp.logprint
-    if grep -q "<DIRTY>" $tmp.logprint; then
+    case "$FSTYP" in
+        xfs)
+            _scratch_xfs_logprint -t | tee -a $seqres.full >$tmp.logprint
+            DIRTY="<DIRTY>"
+            CLEAN="<CLEAN>"
+            ;;
+        f2fs)
+            _scratch_f2fs_logprint | tee -a $seqres.full >$tmp.logprint
+            DIRTY="sudden-power-off"
+            CLEAN="unmount"
+            ;;
+        *)
+            ;;
+    esac
+
+    if grep -q $DIRTY $tmp.logprint; then
 	echo "dirty log"
     fi
-    if grep -q "<CLEAN>" $tmp.logprint; then
+    if grep -q $CLEAN $tmp.logprint; then
 	echo "clean log"
     fi
 }
diff --git a/common/rc b/common/rc
index 72e2f99..04b05eb 100644
--- a/common/rc
+++ b/common/rc
@@ -770,6 +770,11 @@ _scratch_xfs_repair()
     $XFS_REPAIR_PROG $SCRATCH_OPTIONS $* $SCRATCH_DEV
 }
 
+_scratch_f2fs_logprint()
+{
+    $DUMP_F2FS_PROG $SCRATCH_DEV
+}
+
 _get_pids_by_name()
 {
     if [ $# -ne 1 ]
@@ -2091,6 +2096,16 @@ _link_out_file()
 	fi
 }
 
+_link_out_file_fs()
+{
+	if [ -z "$1" -o -z "$2" ]; then
+		echo Error must pass src and dst.
+		exit
+	fi
+	rm -f $2
+	ln -s $1.$FSTYP $2
+}
+
 _die()
 {
         echo $@
@@ -2435,6 +2450,13 @@ _require_dumpe2fs()
 	fi
 }
 
+_require_dumpf2fs()
+{
+	if [ -z "$DUMP_F2FS_PROG" ]; then
+		_notrun "This test requires dump.f2fs utility."
+	fi
+}
+
 _require_ugid_map()
 {
 	if [ ! -e /proc/self/uid_map ]; then
-- 
2.1.1


  parent reply	other threads:[~2015-02-03 23:07 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-03 23:07 [PATCH 0/8 v4] make xfs/tests generic by introducing shutdown for filesystems Jaegeuk Kim
2015-02-03 23:07 ` [PATCH 1/8 v4] common/rc: add _require_scratch_shtudown Jaegeuk Kim
2015-02-05  2:01   ` Dave Chinner
2015-02-03 23:07 ` [PATCH 2/8 v4] common/rc: add _require_bmap Jaegeuk Kim
2015-02-05  2:05   ` Dave Chinner
2015-02-03 23:07 ` [PATCH 3/8 v4] common/rc: add _require_norecovery Jaegeuk Kim
2015-02-05  2:08   ` Dave Chinner
2015-02-03 23:07 ` [PATCH 4/8 v4] tests/xfs: convert 10 xfs's tests to be generic ones Jaegeuk Kim
2015-02-05  2:11   ` Dave Chinner
2015-02-03 23:07 ` [PATCH 5/8 v4] tests/generic: relocate xfs's tests into tests/generic/ Jaegeuk Kim
2015-02-05  2:19   ` Dave Chinner
2015-02-03 23:07 ` Jaegeuk Kim [this message]
2015-02-05  2:48   ` [PATCH 6/8 v4] common/rc: define dump.f2fs and logstate for f2fs Dave Chinner
2015-02-03 23:07 ` [PATCH 7/8 v4] tests/xfs: add f2fs testcase and convert them being generic Jaegeuk Kim
2015-02-05  3:12   ` Dave Chinner
2015-02-03 23:07 ` [PATCH 8/8 v4] tests/generic: relocate four xfs's tests into tests/generic/ Jaegeuk Kim

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1423004840-45315-7-git-send-email-jaegeuk@kernel.org \
    --to=jaegeuk@kernel.org \
    --cc=david@fromorbit.com \
    --cc=fstests@vger.kernel.org \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).