From patchwork Fri Jan 9 02:08:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaegeuk Kim X-Patchwork-Id: 5596431 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CDE819F443 for ; Fri, 9 Jan 2015 02:08:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0631C20450 for ; Fri, 9 Jan 2015 02:08:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 250F12044B for ; Fri, 9 Jan 2015 02:08:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753427AbbAICIp (ORCPT ); Thu, 8 Jan 2015 21:08:45 -0500 Received: from mail.kernel.org ([198.145.29.136]:48860 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752531AbbAICIp (ORCPT ); Thu, 8 Jan 2015 21:08:45 -0500 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2182A2044C; Fri, 9 Jan 2015 02:08:44 +0000 (UTC) Received: from localhost (unknown [166.170.36.201]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 397F22044B; Fri, 9 Jan 2015 02:08:43 +0000 (UTC) From: Jaegeuk Kim To: Dave Chinner Cc: fstests@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Jaegeuk Kim Subject: [PATCH 1/2 v2] xfs/087: test f2fs selectively Date: Thu, 8 Jan 2015 18:08:37 -0800 Message-Id: <1420769318-81382-1-git-send-email-jaegeuk@kernel.org> X-Mailer: git-send-email 2.1.1 X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch add the f2fs support for xfs/087 with goingdown. Signed-off-by: Jaegeuk Kim --- tests/xfs/087 | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/tests/xfs/087 b/tests/xfs/087 index 3a3fb49..9dc81c7 100755 --- a/tests/xfs/087 +++ b/tests/xfs/087 @@ -54,13 +54,16 @@ _do_meta() } # real QA test starts here -_supported_fs xfs +_supported_fs xfs f2fs _supported_os IRIX Linux rm -f $seqres.full $tmp.* _require_scratch -_require_v2log -_require_xfs_quota + +if [ "$FSTYP" == "xfs" ]; then + _require_v2log + _require_xfs_quota +fi echo "*** init FS" umount $SCRATCH_DEV >/dev/null 2>&1 @@ -87,12 +90,15 @@ do fi echo "--- mkfs=$mkfs, mnt=$mnt ---" - export MKFS_OPTIONS="-l $mkfs" - export MOUNT_OPTIONS="-o $mnt" + + if [ "$FSTYP" == "xfs" ]; then + export MKFS_OPTIONS="-l $mkfs" + export MOUNT_OPTIONS="-o $mnt" + fi # mkfs the FS _echofull "mkfs" - _scratch_mkfs_xfs >>$seqres.full 2>&1 + _scratch_mkfs >>$seqres.full 2>&1 if [ $? -ne 0 ] ; then _echofull "mkfs failed: $MKFS_OPTIONS" continue @@ -100,7 +106,7 @@ do # mount the FS _echofull "mount" - if ! _scratch_mount -o uquota >>$seqres.full 2>&1; then + if ! _scratch_mount >>$seqres.full 2>&1; then _echofull "mount failed: $MOUNT_OPTIONS" continue fi @@ -120,13 +126,19 @@ do || _fail "umount failed" _echofull "logprint after going down..." - _print_logstate + if [ "$FSTYP" == "xfs" ]; then + _print_logstate + else + echo "dirty log" + fi _full "logprint headers" - _scratch_xfs_logprint -n >>$seqres.full 2>&1 + if [ "$FSTYP" == "xfs" ]; then + _scratch_xfs_logprint -n >>$seqres.full 2>&1 + fi _echofull "mount with replay" - _scratch_mount -o uquota >>$seqres.full 2>&1 \ + _scratch_mount >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" # check on what FS looks like after log recovery @@ -140,7 +152,11 @@ do umount $SCRATCH_MNT _echofull "logprint after mount and replay..." - _print_logstate + if [ "$FSTYP" == "xfs" ]; then + _print_logstate + else + echo "clean log" + fi if _check_scratch_fs; then _echofull "filesystem is checked ok"