Revert "xfstests: btrfs tests for basic informational commands"
authorRich Johnston <rjohnston@sgi.com>
Tue, 19 Mar 2013 13:13:12 +0000 (08:13 -0500)
committerRich Johnston <rjohnston@sgi.com>
Tue, 19 Mar 2013 13:13:12 +0000 (08:13 -0500)
This reverts commit 2730c49a3e80426167e6f9984b070883dc51d4b6.

Test number was not sequential.

Conflicts:

group

313 [deleted file]
313.out [deleted file]
btrfs.filter [deleted file]
common.filter
group

diff --git a/313 b/313
deleted file mode 100755 (executable)
index 579b0d3..0000000
--- a/313
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /bin/bash
-# FS QA Test No. 313
-#
-# run basic btrfs information commands in various ways
-# sanity tests: filesystem show, label, sync, and device stats
-#
-#-----------------------------------------------------------------------
-# Copyright (c) 2013 Red Hat, Inc.  All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#-----------------------------------------------------------------------
-#
-# creator
-owner=sandeen@redhat.com
-
-seq=`basename $0`
-echo "== QA output created by $seq"
-
-here=`pwd`
-tmp=/tmp/$$
-status=1       # failure is the default!
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
-_cleanup()
-{
-    cd /
-    rm -f $tmp.*
-}
-
-# get standard environment, filters and checks
-. ./common.rc
-. ./btrfs.filter
-
-# real QA test starts here
-
-# Modify as appropriate.
-_supported_fs btrfs
-_supported_os Linux
-_require_scratch
-_require_scratch_dev_pool
-
-rm -f $seq.full
-
-FIRST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
-LAST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $NF}'`
-TOTAL_DEVS=`echo $SCRATCH_DEV $SCRATCH_DEV_POOL | wc -w`
-LABEL=TestLabel.$seq
-
-echo "Scratch $SCRATCH_DEV First $FIRST_POOL_DEV last $LAST_POOL_DEV Total $TOTAL_DEVS" > $seq.full
-
-_scratch_mkfs $SCRATCH_DEV_POOL >> $seq.full 2>&1 || _fail "mkfs failed"
-
-# These have to be done unmounted...?
-echo "== Set filesystem label to $LABEL"
-$BTRFS_UTIL_PROG filesystem label $SCRATCH_DEV $LABEL
-echo "== Get filesystem label"
-$BTRFS_UTIL_PROG filesystem label $SCRATCH_DEV
-
-echo "== Mount."
-_scratch_mount
-
-echo "== Show filesystem by label"
-$BTRFS_UTIL_PROG filesystem show $LABEL | _filter_btrfs_filesystem_show $TOTAL_DEVS
-UUID=`$BTRFS_UTIL_PROG filesystem show $LABEL | grep uuid: | awk '{print $NF}'`
-
-echo "UUID $UUID" >> $seq.full
-
-echo "== Show filesystem by UUID"
-$BTRFS_UTIL_PROG filesystem show $UUID | _filter_btrfs_filesystem_show $TOTAL_DEVS $UUID
-
-echo "== Sync filesystem"
-$BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT | _filter_scratch
-
-echo "== Show device stats by mountpoint"
-$BTRFS_UTIL_PROG device stats $SCRATCH_MNT | _filter_btrfs_device_stats $TOTAL_DEVS
-echo "== Show device stats by first/scratch dev"
-$BTRFS_UTIL_PROG device stats $SCRATCH_DEV | _filter_btrfs_device_stats
-echo "== Show device stats by second dev"
-$BTRFS_UTIL_PROG device stats $FIRST_POOL_DEV | sed -e "s,$FIRST_POOL_DEV,FIRST_POOL_DEV,g"
-echo "== Show device stats by last dev"
-$BTRFS_UTIL_PROG device stats $LAST_POOL_DEV | sed -e "s,$LAST_POOL_DEV,LAST_POOL_DEV,g"
-
-# success, all done
-status=0
-exit
diff --git a/313.out b/313.out
deleted file mode 100644 (file)
index f513bdd..0000000
--- a/313.out
+++ /dev/null
@@ -1,41 +0,0 @@
-== QA output created by 313
-== Set filesystem label to TestLabel.313
-== Get filesystem label
-TestLabel.313
-== Mount.
-== Show filesystem by label
-Label: 'TestLabel.313'  uuid: <UUID>
-       Total devices <EXACTNUM> FS bytes used <SIZE>
-       devid     <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
-
-== Show filesystem by UUID
-Label: 'TestLabel.313'  uuid: <EXACTUUID>
-       Total devices <EXACTNUM> FS bytes used <SIZE>
-       devid     <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
-
-== Sync filesystem
-FSSync 'SCRATCH_MNT'
-== Show device stats by mountpoint
-      <NUMDEVS> [SCRATCH_DEV].corruption_errs <NUM>
-      <NUMDEVS> [SCRATCH_DEV].flush_io_errs   <NUM>
-      <NUMDEVS> [SCRATCH_DEV].generation_errs <NUM>
-      <NUMDEVS> [SCRATCH_DEV].read_io_errs    <NUM>
-      <NUMDEVS> [SCRATCH_DEV].write_io_errs   <NUM>
-== Show device stats by first/scratch dev
-[SCRATCH_DEV].corruption_errs <NUM>
-[SCRATCH_DEV].flush_io_errs   <NUM>
-[SCRATCH_DEV].generation_errs <NUM>
-[SCRATCH_DEV].read_io_errs    <NUM>
-[SCRATCH_DEV].write_io_errs   <NUM>
-== Show device stats by second dev
-[FIRST_POOL_DEV].write_io_errs   0
-[FIRST_POOL_DEV].read_io_errs    0
-[FIRST_POOL_DEV].flush_io_errs   0
-[FIRST_POOL_DEV].corruption_errs 0
-[FIRST_POOL_DEV].generation_errs 0
-== Show device stats by last dev
-[LAST_POOL_DEV].write_io_errs   0
-[LAST_POOL_DEV].read_io_errs    0
-[LAST_POOL_DEV].flush_io_errs   0
-[LAST_POOL_DEV].corruption_errs 0
-[LAST_POOL_DEV].generation_errs 0
diff --git a/btrfs.filter b/btrfs.filter
deleted file mode 100644 (file)
index ed4eb8f..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# Filters for btrfs command output
-
-. ./common.filter
-
-# Some, but not all, commands emit "Btrfs <version>"
-_filter_btrfs_version()
-{
-       sed -e "s/^Btrfs.*//g"
-}
-
-_filter_devid()
-{
-       sed -e "s/\(devid\s\+\)[0-9]\+/\1 <DEVID>/g"
-}
-
-# If passed a number as first arg, filter that number of devices
-# If passed a UUID as second arg, filter that exact UUID
-_filter_btrfs_filesystem_show()
-{
-       if [ ! -z $1 ]; then
-               NUMDEVS=$1
-               NUM_SUBST="<EXACTNUM>"
-       else
-               NUMDEVS="[0-9]\+"
-               NUM_SUBST="<NUM>"
-       fi
-
-       UUID=""
-       if [ ! -z $2 ]; then
-               UUID=$2
-       fi
-
-       # the uniq collapses all device lines into 1
-       _filter_uuid $UUID | _filter_scratch | _filter_scratch_pool | \
-       _filter_size | _filter_btrfs_version | _filter_devid | \
-       sed -e "s/\(Total devices\) $NUMDEVS/\1 $NUM_SUBST/g" | \
-       uniq
-}
-
-# This eliminates all numbers, and shows only unique lines,
-# to accomodate a varying nr. of devices.
-# If given an argument, make sure we saw that many devices
-# in total.
-_filter_btrfs_device_stats()
-{
-       if [ ! -z $1 ]; then
-               NUMDEVS=$1
-               UNIQ_OPT="-c"
-       else
-               NUMDEVS="thiswillnotmatch"
-               UNIQ_OPT=""
-       fi
-
-       _filter_scratch | _filter_scratch_pool | \
-       sed -e "s/[0-9]\+$/<NUM>/g" | sort | uniq $UNIQ_OPT | \
-       sed -e "s/$NUMDEVS /<NUMDEVS> /g"
-}
-
-# make sure this script returns success
-/bin/true
index c34809f8451d28ee97f55f91ebddc48447c3fbf6..c854a98cb11f54b4dd0a9f25e4859d5a42896c1f 100644 (file)
@@ -226,13 +226,6 @@ _filter_scratch()
        sed -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" -e "s,$SCRATCH_MNT,SCRATCH_MNT,g"
 }
 
-# Turn any device in the scratch pool into SCRATCH_DEV
-_filter_scratch_pool()
-{
-       FILTER_STRINGS=`echo $SCRATCH_DEV_POOL | sed -e 's/\s\+/\\\|/g'`
-       sed -e "s,$FILTER_STRINGS,SCRATCH_DEV,g"
-}
-
 _filter_spaces()
 {
        sed -e 's/ [ ]*/ /g'
@@ -245,23 +238,5 @@ _filter_ln()
            -e "s,failed to create,creating,"
 }
 
-# If given an arg, filter *that* UUID string
-# Otherwise look for something that looks like a generic UUID
-_filter_uuid()
-{
-       if [ ! -z $1 ]; then
-               UUID=$1
-               sed -e "s/\(uuid:\) $UUID/\1 <EXACTUUID>/i"
-       else
-               sed -e "s/\(uuid:\) *[0-9a-f-][0-9a-f-]*/\1 <UUID>/i"
-       fi
-}
-
-# Filter out sizes like 6.14MB etc
-_filter_size()
-{
-       sed -e "s/[0-9\.]\+\s\?[b|k|m|g|t][b]\?/<SIZE>/ig"
-}
-
 # make sure this script returns success
 /bin/true
diff --git a/group b/group
index a11e832e03f546f9da74755e20764866e843a429..3d60a72b8392362479ec51c2ce3176dfc087bcaa 100644 (file)
--- a/group
+++ b/group
@@ -430,4 +430,3 @@ stress
 304 aio dangerous ioctl rw stress
 305 aio dangerous enospc rw stress
 306 auto quick rw
-313 auto quick