fstests.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Biggers <ebiggers3@gmail.com>
To: fstests@vger.kernel.org
Cc: linux-xfs@vger.kernel.org, Eric Biggers <ebiggers@google.com>
Subject: [PATCH v2 03/15] tests: port xfs/095 to Linux
Date: Thu, 20 Jul 2017 21:38:41 -0700	[thread overview]
Message-ID: <20170721043853.364-4-ebiggers3@gmail.com> (raw)
In-Reply-To: <20170721043853.364-1-ebiggers3@gmail.com>

From: Eric Biggers <ebiggers@google.com>

This tests upgrading the XFS log to v2.  Switch from the IRIX xfs_chver
program to xfs_db.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 tests/xfs/095     | 11 +++++------
 tests/xfs/095.out |  3 +--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/xfs/095 b/tests/xfs/095
index d1373586..1f5a51f6 100755
--- a/tests/xfs/095
+++ b/tests/xfs/095
@@ -1,7 +1,7 @@
 #! /bin/bash
 # FS QA Test No. 095
 #
-# test out xfs_chver on IRIX
+# Test upgrading the XFS log to v2
 #
 #-----------------------------------------------------------------------
 # Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
@@ -46,7 +46,7 @@ _cleanup()
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os IRIX
+_supported_os Linux
 _require_scratch
 _require_v2log
 
@@ -54,14 +54,13 @@ export MOUNT_OPTIONS="-o logbsize=64k"
 
 # try and mount a v1 log with a v2 LRsize
 # expect failure
-_mkfs_log "-l version=1"
+_mkfs_log "-l version=1 -m crc=0 -d sectsize=512"
+_scratch_xfs_db -c 'version' | tr ',' '\n' | grep LOGV2
 _create_log
 
 # now make the fs a v2 fs and try to mount again
 # it should succeed this time
-xfs_chver -l 2 $SCRATCH_DEV | \
-sed -e "s#$SCRATCH_DEV#SCRATCH_DEV#g" \
-    -e 's/[0-9][0-9]* AGs/N AGs/'
+_scratch_xfs_db -x -c 'version log2' | tr ',' '\n' | grep LOGV2
 _create_log
 
 # success, all done
diff --git a/tests/xfs/095.out b/tests/xfs/095.out
index 36ffdecc..378876d8 100644
--- a/tests/xfs/095.out
+++ b/tests/xfs/095.out
@@ -2,5 +2,4 @@ QA output created by 095
 
 *** mount failed: -o logbsize=64k ***
 
-xfs_chver: SCRATCH_DEV: changing version 0x3084 to 0x3484 in N AGs
-xfs_chver: SCRATCH_DEV: changing feature2 0x0 to 0x0 in N AGs
+LOGV2
-- 
2.13.3


  parent reply	other threads:[~2017-07-21  4:40 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-21  4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
2017-07-21  4:38 ` [PATCH v2 01/15] tests: port generic/093 to Linux Eric Biggers
2017-07-21  4:38 ` [PATCH v2 02/15] tests: port generic/097 " Eric Biggers
2017-07-21  4:38 ` Eric Biggers [this message]
2017-07-21  4:38 ` [PATCH v2 04/15] tests: remove udf/098 Eric Biggers
2017-07-21  4:38 ` [PATCH v2 05/15] tests: remove udf/101 Eric Biggers
2017-07-21  4:38 ` [PATCH v2 06/15] tests: remove xfs/114 and xfs/115 Eric Biggers
2017-07-21  4:38 ` [PATCH v2 07/15] tests: remove xfs/057 and xfs/058 Eric Biggers
2017-07-21  4:38 ` [PATCH v2 08/15] tests: remove generic/099 Eric Biggers
2017-07-21  4:38 ` [PATCH v2 09/15] tests: make shared/051 a generic test Eric Biggers
2017-07-21  4:38 ` [PATCH v2 10/15] README: remove IRIX-specific documentation Eric Biggers
2017-07-21  4:38 ` [PATCH v2 11/15] tests: remove IRIX support from tests also supported on Linux Eric Biggers
2017-07-21  4:38 ` [PATCH v2 12/15] tests: clean up per-OS output files Eric Biggers
2017-07-21  4:38 ` [PATCH v2 13/15] common: remove IRIX-specific code Eric Biggers
2017-07-28 11:19   ` Eryu Guan
2017-07-28 16:50     ` Eric Biggers
2017-07-21  4:38 ` [PATCH v2 14/15] build: remove IRIX-specific build logic Eric Biggers
2017-07-21  4:38 ` [PATCH v2 15/15] include: remove some unused headers Eric Biggers
2017-07-24  4:43 ` [PATCH v2 00/15] xfstests: remove IRIX support Eryu Guan
2017-07-24 17:38   ` Eric Biggers

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=20170721043853.364-4-ebiggers3@gmail.com \
    --to=ebiggers3@gmail.com \
    --cc=ebiggers@google.com \
    --cc=fstests@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    /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).