* [RFC] [PATCH 0/18] xfstests: move tests out of top level
@ 2012-07-26 9:27 Dave Chinner
2012-07-26 9:27 ` [PATCH 01/18] xfstests: remove remake script Dave Chinner
` (19 more replies)
0 siblings, 20 replies; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:27 UTC (permalink / raw)
To: xfs
Alt-Subject: Games with Sed, Grep and Awk.
This series is based on top of the large filesystem test series.
This moves all the tests into a ./tests subdirectory, and sorts them into
classes of related tests. Those are:
tests/generic: valid for all filesystems
tests/shared: valid for a limited number of filesystems
tests/xfs: xfs specific tests
tests/btrfs btrfs specific tests
tests/ext4 ext4 specific tests
tests/udf udf specific tests
Each directory has it's own group file to determine what groups the
tests are associated with. Tests are run in exactly the same was as
before, but when trying to run individual tests you need to specify
the class as well. e.g. the old way:
# ./check 001
The new way:
# ./check generic/001
The output also indicates what class the test came from:
$ sudo ./check -g auto
FSTYP -- xfs (debug)
PLATFORM -- Linux/x86_64 test-1 3.5.0-rc5-dgc+
MKFS_OPTIONS -- -f -bsize=4096 /dev/vdb
MOUNT_OPTIONS -- /dev/vdb /mnt/scratch
generic/001 3s
generic/002 0s
generic/005 1s
generic/006 10s
generic/007 2s
generic/010 [not run] dbtest was not built for this platform
generic/011 15s
generic/013 43s
generic/014 2s
generic/015 0s
generic/020 3s
generic/053 0s
....
[I'd post more example output, but a lightning strike took out power
a little while ago and so all the output in my scrollback buffers
went bye-bye...]
The test classes that are run are generic, shared and $FSTYP, hence
avoiding most "notrun, wrong filesystem" cases.
Further, the test result/status files (e.g. 001.full) are also moved
out of the top level directory into a new results directory. This
defaults to ./results ($RESULT_BASE) and duplicates the heirarchy of
the tests/ directory. It is created on demand. Each test is passed
$RESULT_DIR which points to the directory it should dump it's output
files in. i.e. "echo foo > $RESULT_DIR/$seq.full".
There's a bunch of cleanup at the start of the series, removing
stuff that I don't think has been used for years. e.g. i didn't even
know the remake script existed, but it's usefulness is minimal are
we rarely, if ever, regenerate every single .out file in the test
suite. Hence stuff is removed to make it easy to convert the
important stuff to use the new structure....
Feel free to debate things like the renaming of variables - I just
used sed scripts to do most of the conversion and most of them are
in the commit messages so I can easily re-run them to do global
search/replace if you've got better ideas for naming stuff ($seqres
is pretty 'orrible)....
Overall, this series shows the direction I want to take xfstests in.
The next steps are:
- remove remaining limitations on test naming (i.e. must be
numbered) so that we can have descriptive names
- move all of the output into the results directory and
enable it to be hosted externally so it can be archived
and data mined easily
- move all the common* files to a subdirectory
- allow running of test classes, not just groups
- re-introduce the expunged file functionailty (which I
didn't know existed) because I can see how useful that is
for running regular QA with a current xfstests on an older
distro (e.g. RHEL5) to avoid running tests that are known
to fail or test features that aren't in old kernels...
I sent the patches in git format for all the renames - you don't
need to see a patchset that is this size:
1280 files changed, 102397 insertions(+), 104307 deletions(-)
When turning on rename detection makes it this size:
686 files changed, 1722 insertions(+), 3632 deletions(-)
Which is much more manageable to review....
I'm certain there are problems still in there - I haven't done a lot
of weird command line testing and really only just enough testing to
make sure a typical auto group test run mostly passes.....
Comments, additional ideas, new functionality, modifications, etc
are all welcome.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 01/18] xfstests: remove remake script
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
@ 2012-07-26 9:27 ` Dave Chinner
2012-08-28 19:50 ` Christoph Hellwig
2012-07-26 9:27 ` [PATCH 02/18] xfstests: remove bench infrastructure Dave Chinner
` (18 subsequent siblings)
19 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:27 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
We don't ever do wholesale rebuilds of the output files anymore, so
kill the script that does it to reduce the dependency on common and
common.rc.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
remake | 72 ----------------------------------------------------------------
1 file changed, 72 deletions(-)
delete mode 100755 remake
diff --git a/remake b/remake
deleted file mode 100755
index a95aae7..0000000
--- a/remake
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/bash
-#
-# Copyright (c) 2000-2001 Silicon Graphics, 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
-#
-#
-# Rebuild NNN.out files
-#
-# $Header: /build2/depot/linux/pcp/dev/qa/RCS/remake,v 2.11 1999/09/20 03:42:19 kenmcd Exp $
-#
-
-tmp=/tmp/$$
-trap "rm -f NO-PREVIOUS-OUTPUT $tmp.*; exit" 0 1 2 3 15
-
-# generic initialization
-iam=remake
-. ./common.rc
-
-. ./common
-
-[ -f check.time ] || touch check.time
-
-for seq in $list
-do
- if [ ! -f $seq ]
- then
- echo "Remake: cannot find \"$seq\""
- else
- echo -n "$seq"
- lasttime=`sed -n -e "/^$seq /s/.* //p" <check.time`
- [ "X$lasttime" != X ] && echo -n " ${lasttime}s"
- rm -f $seq.bak $seq.full.bak
- if sh $seq >$seq.new 2>&1
- then
- if [ -f $seq.out ]
- then
- $diff $seq.out $seq.new
- rm -f $seq.out.bad
- else
- touch NO-PREVIOUS-OUTPUT
- $diff NO-PREVIOUS-OUTPUT $seq.new
- rm -f NO-PREVIOUS-OUTPUT
- fi
- echo ""
- [ -f $seq.out ] && mv $seq.out $seq.bak
- if [ -f $seq.full ]
- then
- [ -f $seq.full.ok ] && mv $seq.full.ok $seq.full.bak
- mv $seq.full $seq.full.ok
- fi
- mv $seq.new $seq.out
- else
- echo " - failed (exit status $?)"
- sed 's/^/ /' $seq.new
- exit 1
- fi
- fi
-done
-
-exit 0
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 02/18] xfstests: remove bench infrastructure
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
2012-07-26 9:27 ` [PATCH 01/18] xfstests: remove remake script Dave Chinner
@ 2012-07-26 9:27 ` Dave Chinner
2012-07-26 9:27 ` [PATCH 03/18] xfstests: kill useless test owner fields Dave Chinner
` (17 subsequent siblings)
19 siblings, 0 replies; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:27 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
The benchmark framework inside xfstests is basically unused,
bitrotted and not very useful. If we need benchmarks, lets use a
real benchmark framework, not xfstests. Kill it to remove
dependencies on common and common.rc.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
bench | 181 ------------------------------------------------
common.bonnie | 41 -----------
common.config | 3 +-
common.dbench | 73 -------------------
common.metaperf | 34 ---------
common.rc | 2 +-
run.bonnie_io | 66 ------------------
run.bonnie_ops | 84 ----------------------
run.dbench | 29 --------
run.dbench10 | 29 --------
run.dbench100 | 29 --------
run.dbench2 | 29 --------
run.dbench20 | 29 --------
run.dbench50 | 29 --------
run.dbenchmulti | 37 ----------
run.io | 61 ----------------
run.metaperf_10i_1000n | 31 ---------
run.metaperf_10i_1n | 31 ---------
run.metaperf_1i_1n | 30 --------
run.pio | 69 ------------------
run.rtio | 61 ----------------
run.tar | 40 -----------
22 files changed, 2 insertions(+), 1016 deletions(-)
delete mode 100755 bench
delete mode 100644 common.bonnie
delete mode 100755 common.dbench
delete mode 100755 common.metaperf
delete mode 100755 run.bonnie_io
delete mode 100755 run.bonnie_ops
delete mode 100755 run.dbench
delete mode 100755 run.dbench10
delete mode 100755 run.dbench100
delete mode 100755 run.dbench2
delete mode 100755 run.dbench20
delete mode 100755 run.dbench50
delete mode 100755 run.dbenchmulti
delete mode 100755 run.io
delete mode 100755 run.metaperf_10i_1000n
delete mode 100755 run.metaperf_10i_1n
delete mode 100755 run.metaperf_1i_1n
delete mode 100755 run.pio
delete mode 100755 run.rtio
delete mode 100755 run.tar
diff --git a/bench b/bench
deleted file mode 100755
index f415423..0000000
--- a/bench
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/bin/bash
-#
-# Wrapper for automating benchmarking runs.
-# Usage: bench passes user group [script]
-#
-# ..where passes is the number of times to run each script; uid/gid
-# gives credentials to use when running the script; and script is a
-# simple wrapper around each actual benchmark tool (eg. see run.*),
-# if this is ommited, all run.* scripts are used in turn.
-#
-# Each run.foo script should report a comma-separated-value list of
-# benchmark results on stdout or fail with a non-zero exit code;
-# unless the -i option is supplied in which case it should instead
-# report a comma-separated-value list of column headers (for report
-# generation purposes).
-#
-#-----------------------------------------------------------------------
-# Copyright (c) 2002-2003 Silicon Graphics, 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=nathans@sgi.com
-
-iam=bench
-tmp=/tmp/$$
-here=`pwd`; export here
-status=1 # failure is the default!
-
-# get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-
-_cleanup()
-{
- echo " *** umount"
- umount $SCRATCH_DEV >/dev/null 2>&1
- rm -f $tmp.*
-}
-
-OUT="bench.out"
-LOG="bench.log"
-FULL="bench.full"
-
-_log()
-{
- echo "$*" 1>&2
- echo "$*" >>$LOG
- echo "$*" >>$FULL
- sync
-}
-
-_logp()
-{
- tee -a $FULL
-}
-
-_fail()
-{
- _log "$*"
- status=1
- exit 1
-}
-
-_run_benchmark()
-{
- pass=1
- uid=`id -u $user`
- gid=`id -g $group`
-
- while [ $pass -le $passes -o $passes -lt 0 ]
- do
- _log " *** clean scratch device [$bench starting, pass $pass]"
- _scratch_mkfs 2>&1 | _fix_malloc >>$FULL
- _log " *** mounting scratch device"
- _scratch_mount || _fail " !!! failed to mount"
-
- _log " *** mkdir"
- mkdir $SCRATCH_MNT/bench \
- || _fail " !!! couldn't mkdir benchdir"
- chown -R $user.$group $SCRATCH_MNT/bench \
- || _fail " !!! couldn't chown benchdir"
-
- cd $SCRATCH_MNT/bench
- seq=`perl -e 'printf "results.%s.%03d\n", '$bench', '$pass`
- rm -f $seq $tmp.out
-
- _log " *** bench [$seq]"
- $here/src/runas -u $uid -g $gid $here/run.$bench >$tmp.out 2>>$FULL
- [ $? -eq 0 ] || _fail " !!! $bench pass $pass failed"
-
- cd $here
- _fix_malloc < $tmp.out > $seq
-
- _log " *** unmounting scratch device"
- umount $SCRATCH_DEV 2>&1 | _logp \
- || _fail " !!! failed to umount"
-
- _log " *** post-umount filesystem check"
- _check_scratch_fs
-
- let "pass = pass + 1"
- done
-}
-
-_merge_results()
-{
- echo Results for $bench benchmark
- $here/run.$bench -h
- echo results.$bench.* | sort -nu | xargs cat
- echo
-}
-
-# real QA test starts here
-
-if [ $# -lt 3 ]; then
- echo Usage: bench passes user group [script]
- exit 1
-fi
-
-passes=$1
-user=$2
-group=$3
-shift; shift; shift
-
-if [ $# -gt 0 ]; then
- benches="$@"
-else
- benches=`echo run.* | sed -e 's/run\.//g'`
-fi
-[ -z "$benches" -o "$benches" = "*" ] && _fail "no benchmark scripts found"
-
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
-_require_scratch
-rm -f bench.* results.*
-
-FULL_FSTYP_DETAILS=`_full_fstyp_details`
-FULL_HOST_DETAILS=`_full_platform_details`
-FULL_MKFS_OPTIONS=`_scratch_mkfs_options`
-FULL_MOUNT_OPTIONS=`_scratch_mount_options`
-
-# $OUT is the report which will ultimately be sent, keep it tidy.
-cat >$OUT <<EOF
-FSTYP -- $FULL_FSTYP_DETAILS
-PLATFORM -- $FULL_HOST_DETAILS
-MKFS_OPTIONS -- $FULL_MKFS_OPTIONS
-MOUNT_OPTIONS -- $FULL_MOUNT_OPTIONS
-
-EOF
-
-for bench in $benches
-do
- echo "" >>$FULL
- echo "" >$LOG
- _log "*** benchmark started [passes=$passes, benchmark=$bench]"
- _log "*** (`date`)"
- _log "MKFS_OPTIONS -- $FULL_MKFS_OPTIONS"
- _log "MOUNT_OPTIONS -- $FULL_MOUNT_OPTIONS"
- _log " *** unmounting scratch device"
- umount $SCRATCH_DEV 2>&1 | _fix_malloc >>$FULL
-
- _run_benchmark | _fix_malloc
- _merge_results >>$OUT
-
- _log "*** done $bench"
-done
-status=0
diff --git a/common.bonnie b/common.bonnie
deleted file mode 100644
index 96ca700..0000000
--- a/common.bonnie
+++ /dev/null
@@ -1,41 +0,0 @@
-##/bin/bash
-#
-# Copyright (c) 2002-2004 Silicon Graphics, 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
-#
-
-#check bonnie is installed
-if [ "`whereis bonnie++`" == "bonnie++:"]; then
- echo $0 error bonnie not installed.
- exit
-fi
-
-run_bonnie()
-{
- # dir, no hostname, quiet, fast (no per-char), ram (no sz checks)
- tmp=/var/tmp
-
- mkdir ./bonnie || exit 1
- defaults="-d ./bonnie -q -f -r 0"
- defaults="$defaults -u "`id -u`" -g "`id -g`
- bonnie++ -m '' $defaults $@ >$tmp/$$.bonnie.stdout 2>$tmp/$$.bonnie.stderr
- status=$?
- rm -fr ./bonnie
- [ $status -ne 0 ] && exit 1
- filter_stdout < $tmp/$$.bonnie.stdout
- filter_stderr < $tmp/$$.bonnie.stderr 1>&2
- rm -f $tmp/$$.bonnie.stdout $tmp/$$.bonnie.stderr
- exit 0
-}
diff --git a/common.config b/common.config
index bb9af93..4fbff81 100644
--- a/common.config
+++ b/common.config
@@ -40,7 +40,7 @@
# below or a separate local configuration file can be used (using
# the HOST_OPTIONS variable).
# - This script is shared by the stress test system and the auto-qa
-# system (includes both regression test and benchmark components).
+# system
# - TEST_DEV & TEST_DIR must be assigned.
# - this script shouldn't make any assertions about filesystem
# validity or mountedness.
@@ -150,7 +150,6 @@ export __XFSDUMP_PROG="`set_prog_path xfsdump`"
export XFSDUMP_PROG="$__XFSDUMP_PROG -e"
export XFSRESTORE_PROG="`set_prog_path xfsrestore`"
export XFSINVUTIL_PROG="`set_prog_path xfsinvutil`"
-export DBENCH_PROG="`set_prog_path dbench`"
export GETFATTR_PROG="`set_prog_path getfattr`"
export SETFATTR_PROG="`set_prog_path setfattr`"
export ATTR_PROG="`set_prog_path attr`"
diff --git a/common.dbench b/common.dbench
deleted file mode 100755
index b59be71..0000000
--- a/common.dbench
+++ /dev/null
@@ -1,73 +0,0 @@
-##/bin/bash
-#
-# Copyright (c) 2002-2005 Silicon Graphics, 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
-#
-
-#check dbench is installed
-if [ "`whereis dbench`" == "dbench:" ]; then
- echo $0 error dbench not installed.
- exit
-fi
-
-_run_dbench()
-{
- mkdir ./dbench || exit 1
- cd dbench
- dbench -x $1
- status=$?
- cd ..
- rm -fr ./dbench
- [ $status -ne 0 ] && exit 1
-}
-
-#
-# Sample dbench output:
-# "Throughput 40.6701 MB/sec (NB=50.8376 MB/sec 406.701 MBit/sec)"
-#
-
-# Output for a single-shot dbench run.
-_format_header()
-{
- printf "%8s, %s\n" clients MB/sec
-}
-_filter_dbench()
-{
- clients=$1
- perl -ne 'm/Throughput (\S+) MB\/sec/ &&
- { printf "%8u, %s\n", '$clients', $1 }'
-}
-
-# Output for a "multipass" dbench run.
-_format_header_multipass()
-{
- while [ $# -gt 1 ]; do
- printf "%4s::MB/sec," $1
- shift
- done
- printf "%4s::MB/sec\n" $1
-}
-_filter_dbench_multipass()
-{
- perl -ne '
- if (m/Throughput (\S+) MB\/sec/) {
- $results[$count++] = $1;
- }
- END { for ($i = 0; $i < $count - 1; $i++) {
- printf "%12.3f,", $results[$i];
- }
- printf "%12.3f\n", $results[$count-1];
- }'
-}
diff --git a/common.metaperf b/common.metaperf
deleted file mode 100755
index 9def379..0000000
--- a/common.metaperf
+++ /dev/null
@@ -1,34 +0,0 @@
-##/bin/bash
-#
-# Copyright (c) 2003-2005 Silicon Graphics, 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
-#
-
-_format_metaperf()
-{
- perl -ne 'm/(\S+): (\d+) times, (\d+) file\(s\) namelen (\d+), time = (\S+) sec, ops\/sec=(\S+), usec\/op = (\S+)/ && { $op{$1} = $7 };
- END { printf "%8.2f,%8.2f,%8.2f,%8.2f,%8.2f,%8.2f,%8.2f,%8.2f\n",
- $op{"chown"}, $op{"create"}, $op{"crunlink"}, $op{"linkun"},
- $op{"open"}, $op{"rename"}, $op{"stat"}, $op{"readdir"} }'
-}
-
-_format_header()
-{
- # note: we're reporting only the usec/op field
- printf "%8s,%8s,%8s,%8s,%8s,%8s,%8s,%8s\n" \
- chown create crulink linkun open rename stat readdir
-}
-
-allops="chown create crunlink linkun open rename stat readdir"
diff --git a/common.rc b/common.rc
index 1b23b66..2ffff41 100644
--- a/common.rc
+++ b/common.rc
@@ -1920,7 +1920,7 @@ _devmgt_add()
################################################################################
-if [ "$iam" != new -a "$iam" != bench ]
+if [ "$iam" != new ]
then
# make some further configuration checks here
diff --git a/run.bonnie_io b/run.bonnie_io
deleted file mode 100755
index e108650..0000000
--- a/run.bonnie_io
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2002-2003 Silicon Graphics, 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
-#
-#
-# Does a bonnie throughput run (80M file and 1K chunksize if the
-# BONNIE_FILESIZE and/or BONNIE_CHUNKSIZE variables are not set),
-# then massages the output into CSV format with the human-readable
-# output preceding it as a "comment" (ie. #-prefixed).
-#
-BONNIE_FILESIZE=${BONNIE_FILESIZE:=500M}
-BONNIE_CHUNKSIZE=${BONNIE_CHUNKSIZE:=1K}
-
-[ -z "$here" ] && here=`pwd`
-. $here/common.bonnie
-
-#
-# Sample bonnie throughput output (stderr):
-#Version 1.02c ------Sequential Output------ --Sequential Input- --Random-
-# -Per Chr- --Block-- -Rewrite- -Per Chr- --Block-- --Seeks--
-#Machine Size:chnk K/sec %CP K/sec %CP K/sec %CP K/sec %CP K/sec %CP /sec %CP
-# 150M:64k 52024 99 88969 99 245492 100 3746 264
-#
-filter_stderr()
-{
- sed -e 's/^..................../# /g' | awk '{print} END {print "#"}'
-}
-
-#
-# Sample bonnie throughput output (stdout):
-# ",150M:64k,,,52024,99,88969,99,,,245492,100,3746.0,264,,,,,,,,,,,,,"
-#
-filter_stdout()
-{
- perl -ne '
- chomp;
- s/,+/,/g; s/^,//; s/,$//;
- @values = split /,/;
- printf "%9s", shift @values;
- for ($i = 0; $i <= $#values; $i++) {
- if ($i % 2) { printf ",%4s%%", $values[$i] }
- else { printf ",%10s", $values[$i] }
- }
- printf "\n";
- '
-}
-
-if [ $# -gt 0 ]; then
- printf "%9s,%10s,%5s,%10s,%5s,%10s,%5s,%10s,%5s\n" size:chnk \
- writeK/s wCPU rewriteK/s rwCPU readK/s rCPU seek/s sCPU
- exit 0
-fi
-run_bonnie -n 0 -s $BONNIE_FILESIZE:$BONNIE_CHUNKSIZE
diff --git a/run.bonnie_ops b/run.bonnie_ops
deleted file mode 100755
index 609b93c..0000000
--- a/run.bonnie_ops
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2002-2003 Silicon Graphics, 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
-#
-#
-# Do a bonnie++ create/read/delete run using 8192 files (unless
-# BONNIE_KFILES environment variable is set -- note this number
-# is multiplied by 1024 by bonnie++). By default the files are
-# created in the same directory, BONNIE_NDIRS specifies a count
-# of subdirs to evenly spread files through. Regular files are
-# created by default (BONNIE_FILETYPE=regular), alternatively
-# the values "symlinks" and "hardlinks" can be used.
-#
-# The script then massages the output into CSV format with the
-# human-readable output preceding it as a "comment" (#-prefixed).
-#
-BONNIE_NDIRS=${BONNIE_NDIRS:=1}
-BONNIE_KFILES=${BONNIE_KFILES:=8}
-BONNIE_FILETYPE=${BONNIE_FILETYPE:=regular}
-
-[ -z "$here" ] && here=`pwd`
-. $here/common.bonnie
-
-#
-# Sample bonnie throughput output (stderr):
-#Version 1.02c ------Sequential Create------ --------Random Create--------
-# -Create-- --Read--- -Delete-- -Create-- --Read--- -Delete--
-# files /sec %CP /sec %CP /sec %CP /sec %CP /sec %CP /sec %CP
-# 4 525 27 +++++ +++ 517 26 526 25 +++++ +++ 230 12
-# [ Note: the "files" can also be "^files:max" and possibly other things ]
-filter_stderr()
-{
- sed -e 's/^..................../# /g' | awk '{print} END {print "#"}'
-}
-
-#
-# Sample bonnie IOPs output (stdout):
-# ",,,,,,,,,,,,,,4,525,27,+++++,+++,517,26,526,25,+++++,+++,230,12"
-# [ nathans note: always get +++ due to 0:0 for min:max file sizes. ]
-# [ I will need to fix the filter if I ever start using file sizes. ]
-#
-filter_stdout()
-{
- perl -ne '
- chomp;
- s/\+*//g; s/,+/,/g; s/^,//; s/,$//;
- @values = split /,/;
- printf "%9s", 1024 * shift @values;
- for ($i = 0; $i <= $#values; $i++) {
- if ($i % 2) { printf ",%4s%%", $values[$i] }
- else { printf ",%10s", $values[$i] }
- }
- printf "\n";
- '
-}
-
-if [ $# -gt 0 ]; then
- printf "%9s,%10s,%5s,%10s,%5s,%10s,%5s,%10s,%5s\n" files \
- seqCR/s scCPU seqRM/s srCPU randCR/s rcCPU randRM/s rrCPU
- exit 0
-fi
-
-case "$BONNIE_FILETYPE"
-in
- regular) BONNIE_FILETYPE=0 ;;
- symlink) BONNIE_FILETYPE=-2 ;;
- hardlink) BONNIE_FILETYPE=-1 ;;
- *) echo "BONNIE_FILETYPE has an unrecognised value" && exit 1 ;;
-esac
-
-run_bonnie -s 0 -n $BONNIE_KFILES:$BONNIE_FILETYPE:0:$BONNIE_NDIRS
diff --git a/run.dbench b/run.dbench
deleted file mode 100755
index 8e86807..0000000
--- a/run.dbench
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2002-2003 Silicon Graphics, 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
-#
-#
-# Does a single-client dbench run
-#
-
-[ -z "$here" ] && here=`pwd`
-. $here/common.dbench
-
-if [ $# -gt 0 ]; then
- _format_header
- exit 0
-fi
-_run_dbench 1 | _filter_dbench 1
diff --git a/run.dbench10 b/run.dbench10
deleted file mode 100755
index e3a08c4..0000000
--- a/run.dbench10
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2002-2003 Silicon Graphics, 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
-#
-#
-# Does a dbench run with 10 clients
-#
-
-[ -z "$here" ] && here=`pwd`
-. $here/common.dbench
-
-if [ $# -gt 0 ]; then
- _format_header
- exit 0
-fi
-_run_dbench 10 | _filter_dbench 10
diff --git a/run.dbench100 b/run.dbench100
deleted file mode 100755
index 51708d1..0000000
--- a/run.dbench100
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2002-2003 Silicon Graphics, 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
-#
-#
-# Does a dbench run with 100 clients
-#
-
-[ -z "$here" ] && here=`pwd`
-. $here/common.dbench
-
-if [ $# -gt 0 ]; then
- _format_header
- exit 0
-fi
-_run_dbench 100 | _filter_dbench 100
diff --git a/run.dbench2 b/run.dbench2
deleted file mode 100755
index c56c208..0000000
--- a/run.dbench2
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2002-2003 Silicon Graphics, 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
-#
-#
-# Does a dbench run with 2 clients
-#
-
-[ -z "$here" ] && here=`pwd`
-. $here/common.dbench
-
-if [ $# -gt 0 ]; then
- _format_header
- exit 0
-fi
-_run_dbench 2 | _filter_dbench 2
diff --git a/run.dbench20 b/run.dbench20
deleted file mode 100755
index 81f713c..0000000
--- a/run.dbench20
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2003 Silicon Graphics, 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
-#
-#
-# Does a dbench run with 20 clients
-#
-
-[ -z "$here" ] && here=`pwd`
-. $here/common.dbench
-
-if [ $# -gt 0 ]; then
- _format_header
- exit 0
-fi
-_run_dbench 20 | _filter_dbench 20
diff --git a/run.dbench50 b/run.dbench50
deleted file mode 100755
index 4c54e0b..0000000
--- a/run.dbench50
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2002-2003 Silicon Graphics, 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
-#
-#
-# Does a dbench run with 50 clients
-#
-
-[ -z "$here" ] && here=`pwd`
-. $here/common.dbench
-
-if [ $# -gt 0 ]; then
- _format_header
- exit 0
-fi
-_run_dbench 50 | _filter_dbench 50
diff --git a/run.dbenchmulti b/run.dbenchmulti
deleted file mode 100755
index 317a100..0000000
--- a/run.dbenchmulti
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2003 Silicon Graphics, 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
-#
-#
-# Does several dbench runs with increasing numbers of client
-#
-
-[ -z "$here" ] && here=`pwd`
-. $here/common.dbench
-
-if [ $# -gt 0 ]; then
- _format_header_multipass 1 2 10 20 #50
- exit 0
-fi
-tmpfile=/var/tmp/dbench.$$
-rm -f $tmpfile
-_run_dbench 1 >> $tmpfile
-_run_dbench 2 >> $tmpfile
-_run_dbench 10 >> $tmpfile
-_run_dbench 20 >> $tmpfile
-#_run_dbench 50 >> $tmpfile
-_filter_dbench_multipass < $tmpfile
-rm -f $tmpfile
diff --git a/run.io b/run.io
deleted file mode 100755
index 91e3b93..0000000
--- a/run.io
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2005 Silicon Graphics, 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
-#
-#
-# (very) simple file IO tests.
-# TODO: make file size multiple of physmem.
-
-filesize=1g
-iosize=64k
-
-if [ $# -gt 0 ]; then
- printf "%s,%s,%s,%s,%s\n" type bytes ops time bytes/sec ops/sec
- exit 0
-fi
-
-# buffered write
-echo -n bwrite,
-xfs_io iofile -Fft -c "pwrite -C -b $iosize 0 $filesize"
-
-# direct write
-echo -n dwrite,
-xfs_io iofile -Fftd -c "pwrite -C -b $iosize 0 $filesize"
-
-# buffered re-write
-echo -n brwrite,
-xfs_io iofile -F -c "pwrite -C -b $iosize 0 $filesize"
-
-# direct re-write
-echo -n drwrite,
-xfs_io iofile -Fd -c "pwrite -C -b $iosize 0 $filesize"
-
-# buffered read
-echo -n bread,
-xfs_io iofile -F -c "pread -C -b $iosize 0 $filesize"
-
-# buffered re-read
-echo -n brread,
-xfs_io iofile -F -c "pread -C -b $iosize 0 $filesize"
-
-# direct read
-echo -n dread,
-xfs_io iofile -Fd -c "pread -C -b $iosize 0 $filesize"
-
-# direct re-read
-echo -n drread,
-xfs_io iofile -Fd -c "pread -C -b $iosize 0 $filesize"
-
diff --git a/run.metaperf_10i_1000n b/run.metaperf_10i_1000n
deleted file mode 100755
index a420696..0000000
--- a/run.metaperf_10i_1000n
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2003 Silicon Graphics, 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
-#
-#
-# Runs the metaperf metadata micro-benchmark.
-# Use 1000 files, 10 iterations.
-#
-
-[ -z "$here" ] && here=`pwd`
-. $here/common.metaperf
-
-if [ $# -gt 0 ]; then
- _format_header
- exit 0
-fi
-
-$here/src/metaperf -d . -i 10 -n 1000 -l15 $allops | _format_metaperf
diff --git a/run.metaperf_10i_1n b/run.metaperf_10i_1n
deleted file mode 100755
index 296fd58..0000000
--- a/run.metaperf_10i_1n
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2003 Silicon Graphics, 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
-#
-#
-# Runs the metaperf metadata micro-benchmark.
-# Use 1 file, 10 iterations.
-#
-
-[ -z "$here" ] && here=`pwd`
-. $here/common.metaperf
-
-if [ $# -gt 0 ]; then
- _format_header
- exit 0
-fi
-
-$here/src/metaperf -d . -i 10 -n 1 -l15 $allops | _format_metaperf
diff --git a/run.metaperf_1i_1n b/run.metaperf_1i_1n
deleted file mode 100755
index ef02852..0000000
--- a/run.metaperf_1i_1n
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2003 Silicon Graphics, 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
-#
-#
-# Runs the metaperf metadata micro-benchmark.
-# Use 1 file, 1 iteration. (worst case)
-#
-
-. $here/common.metaperf
-
-if [ $# -gt 0 ]; then
- _format_header
- exit 0
-fi
-
-$here/src/metaperf -d . -i 1 -n 1 -l15 $allops | _format_metaperf
diff --git a/run.pio b/run.pio
deleted file mode 100755
index 1b67fbf..0000000
--- a/run.pio
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2005 Silicon Graphics, 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
-#
-#
-# (very) simple parallel IO tests.
-# TODO: make file size multiple of physmem.
-
-filesize=1g
-iosize=64k
-
-if [ $# -gt 0 ]; then
- printf "%s,%s,%s,%s,%s\n" type bytes ops time bytes/sec ops/sec
- exit 0
-fi
-
-# buffered write
-echo -n bwrite,
-xfs_io iofile1 -Fft -c "pwrite -C -b $iosize 0 $filesize" &
-xfs_io iofile2 -Fft -c "pwrite -C -b $iosize 0 $filesize"
-
-# direct write
-echo -n dwrite,
-xfs_io iofile1 -Fftd -c "pwrite -C -b $iosize 0 $filesize" &
-xfs_io iofile2 -Fftd -c "pwrite -C -b $iosize 0 $filesize"
-
-# buffered re-write
-echo -n brwrite,
-xfs_io iofile1 -F -c "pwrite -C -b $iosize 0 $filesize" &
-xfs_io iofile2 -F -c "pwrite -C -b $iosize 0 $filesize"
-
-# direct re-write
-echo -n drwrite,
-xfs_io iofile1 -Fd -c "pwrite -C -b $iosize 0 $filesize" &
-xfs_io iofile2 -Fd -c "pwrite -C -b $iosize 0 $filesize"
-
-# buffered read
-echo -n bread,
-xfs_io iofile1 -F -c "pread -C -b $iosize 0 $filesize" &
-xfs_io iofile2 -F -c "pread -C -b $iosize 0 $filesize"
-
-# buffered re-read
-echo -n brread,
-xfs_io iofile1 -F -c "pread -C -b $iosize 0 $filesize" &
-xfs_io iofile2 -F -c "pread -C -b $iosize 0 $filesize"
-
-# direct read
-echo -n dread,
-xfs_io iofile1 -Fd -c "pread -C -b $iosize 0 $filesize" &
-xfs_io iofile2 -Fd -c "pread -C -b $iosize 0 $filesize"
-
-# direct re-read
-echo -n drread,
-xfs_io iofile1 -Fd -c "pread -C -b $iosize 0 $filesize" &
-xfs_io iofile2 -Fd -c "pread -C -b $iosize 0 $filesize"
-
diff --git a/run.rtio b/run.rtio
deleted file mode 100755
index 14aded6..0000000
--- a/run.rtio
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2005 Silicon Graphics, 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
-#
-#
-# (very) simple file realtime IO tests.
-# TODO: make file size multiple of physmem.
-
-filesize=1g
-iosize=64k
-
-if [ $# -gt 0 ]; then
- printf "%s,%s,%s,%s,%s\n" type bytes ops time bytes/sec ops/sec
- exit 0
-fi
-
-# buffered write
-echo -n bwrite,
-xfs_io iofile -Rft -c "pwrite -C -b $iosize 0 $filesize"
-
-# direct write
-echo -n dwrite,
-xfs_io iofile -Rftd -c "pwrite -C -b $iosize 0 $filesize"
-
-# buffered re-write
-echo -n brwrite,
-xfs_io iofile -R -c "pwrite -C -b $iosize 0 $filesize"
-
-# direct re-write
-echo -n drwrite,
-xfs_io iofile -Rd -c "pwrite -C -b $iosize 0 $filesize"
-
-# buffered read
-echo -n bread,
-xfs_io iofile -R -c "pread -C -b $iosize 0 $filesize"
-
-# buffered re-read
-echo -n brread,
-xfs_io iofile -R -c "pread -C -b $iosize 0 $filesize"
-
-# direct read
-echo -n dread,
-xfs_io iofile -Rd -c "pread -C -b $iosize 0 $filesize"
-
-# direct re-read
-echo -n drread,
-xfs_io iofile -Rd -c "pread -C -b $iosize 0 $filesize"
-
diff --git a/run.tar b/run.tar
deleted file mode 100755
index 6e8afd3..0000000
--- a/run.tar
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-#
-# Produces a .tar file (if one doesn't exist as $TARFILE), then
-# times how long it takes to untar it onto the current directory.
-#
-TARFILE=${TARFILE:=/var/tmp/bench.tar.gz}
-
-barf()
-{
- echo $@ >2
- exit 1
-}
-
-new_tar()
-{
- source="bin sbin lib"
- if [ ! -f $TARFILE ]; then
- ( cd / && tar czf $TARFILE $source ) || barf "tar cz failed"
- fi
-}
-
-run_tar()
-{
- # %U=user %S=system %E=elapsed
- mkdir ./tar || exit 1
- size=`ls -Llh $TARFILE | awk '{print $5}'`
- time=`/usr/bin/time -f '%U, %S, %E' tar xzf $TARFILE 2>&1`
- status=$?
- cd ..
- rm -fr ./tar
- [ $status -eq 0 ] || exit 1
- printf "%6s, %s\n" "$size" "$time"
-}
-
-if [ $# -gt 0 ]; then
- printf "%6s,%5s,%5s,%8s\n" sz usr sys real
- exit 0
-fi
-new_tar
-run_tar
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 03/18] xfstests: kill useless test owner fields
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
2012-07-26 9:27 ` [PATCH 01/18] xfstests: remove remake script Dave Chinner
2012-07-26 9:27 ` [PATCH 02/18] xfstests: remove bench infrastructure Dave Chinner
@ 2012-07-26 9:27 ` Dave Chinner
2012-08-28 19:51 ` Christoph Hellwig
2012-07-26 9:27 ` [PATCH 04/18] xfstests: remove stale machine configs Dave Chinner
` (16 subsequent siblings)
19 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:27 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
Back many years ago, the owner field was used to email the test
owner when auto-qa failed that test. It is not needed anymore - if
you want to know who wrote the test, look it up in git....
Script used was:
$ sed -i -e "/^# creator/d" -e "/^owner/d" [0-2][0-9][0-9]
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
001 | 2 --
002 | 2 --
003 | 2 --
004 | 2 --
005 | 2 --
006 | 2 --
007 | 2 --
008 | 2 --
009 | 2 --
010 | 2 --
011 | 2 --
012 | 2 --
013 | 2 --
014 | 2 --
015 | 2 --
016 | 2 --
017 | 2 --
018 | 2 --
019 | 2 --
020 | 2 --
021 | 2 --
022 | 2 --
023 | 2 --
024 | 2 --
025 | 2 --
026 | 2 --
027 | 2 --
028 | 2 --
029 | 2 --
030 | 2 --
031 | 2 --
032 | 2 --
033 | 2 --
034 | 2 --
035 | 2 --
036 | 2 --
037 | 2 --
038 | 2 --
039 | 2 --
040 | 2 --
041 | 2 --
042 | 2 --
043 | 2 --
044 | 2 --
045 | 2 --
046 | 2 --
047 | 2 --
048 | 2 --
049 | 2 --
050 | 2 --
051 | 2 --
052 | 2 --
053 | 2 --
054 | 2 --
055 | 2 --
056 | 2 --
057 | 2 --
058 | 2 --
059 | 2 --
060 | 2 --
061 | 2 --
062 | 2 --
063 | 2 --
064 | 2 --
065 | 2 --
066 | 2 --
067 | 2 --
068 | 2 --
069 | 2 --
070 | 2 --
071 | 2 --
072 | 2 --
073 | 2 --
074 | 2 --
075 | 2 --
076 | 2 --
077 | 2 --
078 | 2 --
079 | 2 --
080 | 2 --
081 | 2 --
082 | 2 --
083 | 2 --
084 | 2 --
085 | 2 --
086 | 2 --
087 | 2 --
088 | 2 --
089 | 2 --
090 | 2 --
091 | 2 --
092 | 2 --
093 | 2 --
094 | 2 --
095 | 2 --
096 | 2 --
097 | 2 --
098 | 2 --
099 | 1 -
100 | 2 --
101 | 2 --
102 | 2 --
103 | 2 --
104 | 2 --
105 | 2 --
106 | 2 --
107 | 2 --
108 | 2 --
109 | 2 --
110 | 2 --
111 | 2 --
112 | 2 --
113 | 2 --
114 | 2 --
115 | 2 --
116 | 2 --
117 | 2 --
118 | 2 --
119 | 2 --
120 | 2 --
121 | 2 --
122 | 2 --
123 | 2 --
124 | 2 --
125 | 2 --
126 | 2 --
127 | 2 --
128 | 2 --
129 | 2 --
130 | 2 --
131 | 2 --
132 | 2 --
133 | 2 --
134 | 2 --
135 | 2 --
136 | 2 --
137 | 2 --
138 | 2 --
139 | 2 --
140 | 2 --
141 | 2 --
142 | 2 --
143 | 2 --
144 | 2 --
145 | 2 --
146 | 2 --
147 | 2 --
148 | 2 --
149 | 2 --
150 | 2 --
151 | 2 --
152 | 2 --
153 | 2 --
154 | 2 --
155 | 2 --
156 | 2 --
157 | 2 --
158 | 2 --
159 | 2 --
160 | 2 --
161 | 2 --
162 | 2 --
163 | 2 --
164 | 2 --
165 | 2 --
166 | 2 --
167 | 2 --
168 | 2 --
169 | 2 --
170 | 2 --
171 | 2 --
172 | 2 --
173 | 2 --
174 | 2 --
175 | 1 -
176 | 1 -
177 | 2 --
178 | 2 --
179 | 2 --
180 | 2 --
181 | 2 --
182 | 2 --
183 | 2 --
184 | 2 --
185 | 2 --
186 | 2 --
187 | 2 --
188 | 2 --
189 | 2 --
190 | 2 --
191 | 2 --
192 | 2 --
193 | 2 --
194 | 2 --
195 | 2 --
196 | 2 --
197 | 2 --
198 | 2 --
199 | 2 --
200 | 2 --
201 | 2 --
202 | 2 --
203 | 2 --
204 | 2 --
205 | 2 --
206 | 2 --
207 | 2 --
208 | 2 --
209 | 2 --
210 | 2 --
211 | 2 --
212 | 2 --
213 | 2 --
214 | 2 --
215 | 2 --
216 | 2 --
217 | 2 --
218 | 2 --
219 | 2 --
220 | 2 --
221 | 2 --
222 | 2 --
223 | 2 --
224 | 2 --
225 | 2 --
226 | 2 --
227 | 2 --
228 | 2 --
229 | 2 --
230 | 2 --
231 | 2 --
232 | 2 --
233 | 2 --
234 | 2 --
235 | 2 --
236 | 2 --
237 | 2 --
238 | 2 --
239 | 2 --
240 | 2 --
241 | 2 --
242 | 2 --
243 | 2 --
244 | 2 --
245 | 2 --
246 | 2 --
247 | 2 --
248 | 2 --
249 | 2 --
250 | 2 --
251 | 1 -
252 | 2 --
253 | 2 --
254 | 2 --
255 | 2 --
256 | 2 --
257 | 2 --
258 | 2 --
259 | 2 --
260 | 1 -
261 | 2 --
262 | 2 --
263 | 2 --
264 | 2 --
265 | 2 --
266 | 2 --
267 | 2 --
268 | 2 --
269 | 2 --
270 | 2 --
271 | 2 --
272 | 2 --
273 | 1 -
274 | 1 -
275 | 1 -
276 | 2 --
277 | 2 --
278 | 2 --
279 | 2 --
280 | 2 --
281 | 2 --
282 | 2 --
283 | 2 --
284 | 2 --
group | 60 ++++++++++++++++++++++++++++++------------------------------
new | 13 -------------
soak | 2 --
287 files changed, 30 insertions(+), 605 deletions(-)
diff --git a/001 b/001
index 8e3aabd..b9997f3 100755
--- a/001
+++ b/001
@@ -30,8 +30,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=kenmcd@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/002 b/002
index 896fd1e..db63fa0 100755
--- a/002
+++ b/002
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=kenmcd@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/003 b/003
index 61afac5..79b6bc5 100755
--- a/003
+++ b/003
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/004 b/004
index 23729da..d75c3c0 100755
--- a/004
+++ b/004
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/005 b/005
index 40b8b2e..27da3d3 100755
--- a/005
+++ b/005
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
#
# Note1: On Linux, ELOOP limit used to be 32 but changed to 8, and lately
diff --git a/006 b/006
index e4d5e32..1437b46 100755
--- a/006
+++ b/006
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/007 b/007
index 50a8418..2bb981f 100755
--- a/007
+++ b/007
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/008 b/008
index dfc938a..0dee9f5 100755
--- a/008
+++ b/008
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/009 b/009
index d2a19d8..1883f15 100755
--- a/009
+++ b/009
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/010 b/010
index 78813a8..245f407 100755
--- a/010
+++ b/010
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/011 b/011
index 2fcc9d3..4ede2d8 100755
--- a/011
+++ b/011
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/012 b/012
index 7d33f4c..10498d5 100755
--- a/012
+++ b/012
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/013 b/013
index 58426ea..0879a2a 100755
--- a/013
+++ b/013
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/014 b/014
index 057e4d9..93caaa6 100755
--- a/014
+++ b/014
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/015 b/015
index a99f1ed..52ab251 100755
--- a/015
+++ b/015
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/016 b/016
index 08a73f4..538ba14 100755
--- a/016
+++ b/016
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
#
# pv 796141
diff --git a/017 b/017
index b3a7f9c..59d092d 100755
--- a/017
+++ b/017
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/018 b/018
index 85df390..156cc1d 100755
--- a/018
+++ b/018
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/019 b/019
index 42e3c22..1fb0d83 100755
--- a/019
+++ b/019
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/020 b/020
index 8b8db30..2bd1d9f 100755
--- a/020
+++ b/020
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/021 b/021
index a6176f1..18fe40e 100755
--- a/021
+++ b/021
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/022 b/022
index b83b063..962316f 100755
--- a/022
+++ b/022
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/023 b/023
index b9eeafe..3e7fdd2 100755
--- a/023
+++ b/023
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/024 b/024
index 64b59bc..b7f1c10 100755
--- a/024
+++ b/024
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/025 b/025
index 90d3389..4ccb5de 100755
--- a/025
+++ b/025
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/026 b/026
index ef6aaa6..37a23cc 100755
--- a/026
+++ b/026
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/027 b/027
index 9df06c3..772705d 100755
--- a/027
+++ b/027
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/028 b/028
index 6628f66..0bf042f 100755
--- a/028
+++ b/028
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/029 b/029
index e4fe715..70c0d10 100755
--- a/029
+++ b/029
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/030 b/030
index a8fb92c..080d3fe 100755
--- a/030
+++ b/030
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/031 b/031
index fb6f15b..422a271 100755
--- a/031
+++ b/031
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/032 b/032
index d093b45..ad1909d 100755
--- a/032
+++ b/032
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/033 b/033
index 68a688e..dc5a32d 100755
--- a/033
+++ b/033
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/034 b/034
index c09f63b..27f3f22 100755
--- a/034
+++ b/034
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/035 b/035
index 34f5cac..b2fc417 100755
--- a/035
+++ b/035
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/036 b/036
index 4ed2ebc..e9bb411 100755
--- a/036
+++ b/036
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/037 b/037
index fd1e1af..e2e71c5 100755
--- a/037
+++ b/037
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/038 b/038
index f2af214..b62a4c9 100755
--- a/038
+++ b/038
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/039 b/039
index 016d2bc..428e8bb 100755
--- a/039
+++ b/039
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/040 b/040
index ea24ff5..0021c22 100755
--- a/040
+++ b/040
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/041 b/041
index 28dcb33..a9a9a23 100755
--- a/041
+++ b/041
@@ -23,8 +23,6 @@
#-----------------------------------------------------------------------
#
set +x
-# creator
-owner=ajag@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/042 b/042
index c583746..15fa5dc 100755
--- a/042
+++ b/042
@@ -24,8 +24,6 @@
#-----------------------------------------------------------------------
#
set +x
-# creator
-owner=ajag@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/043 b/043
index 189dc5b..ef92c0a 100755
--- a/043
+++ b/043
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/044 b/044
index 60a6e58..d0d8bd8 100755
--- a/044
+++ b/044
@@ -25,8 +25,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/045 b/045
index db40333..c20e3a8 100755
--- a/045
+++ b/045
@@ -22,8 +22,6 @@
#-----------------------------------------------------------------------
#
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/046 b/046
index 783459c..fb83b7a 100755
--- a/046
+++ b/046
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/047 b/047
index f5f6a52..7c5e896 100755
--- a/047
+++ b/047
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/048 b/048
index 9d360d6..6139361 100755
--- a/048
+++ b/048
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/049 b/049
index 149c4b5..0a6e69c 100755
--- a/049
+++ b/049
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/050 b/050
index cf70b5a..6a66032 100755
--- a/050
+++ b/050
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/051 b/051
index 9d35138..07d5a9b 100755
--- a/051
+++ b/051
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
diff --git a/052 b/052
index 2d8b73d..01d5469 100755
--- a/052
+++ b/052
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/053 b/053
index ac2162d..388c9b4 100755
--- a/053
+++ b/053
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ajag@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/054 b/054
index e5e500c..1ce6180 100755
--- a/054
+++ b/054
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/055 b/055
index 309b9c3..965b43a 100755
--- a/055
+++ b/055
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/056 b/056
index a19b85a..be65bfb 100755
--- a/056
+++ b/056
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/057 b/057
index f3219a3..faa4776 100755
--- a/057
+++ b/057
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/058 b/058
index 43b2293..dfce43b 100755
--- a/058
+++ b/058
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/059 b/059
index 1f3f8e3..a2a07c9 100755
--- a/059
+++ b/059
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=wkendall@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/060 b/060
index 4adc00f..f0d9870 100755
--- a/060
+++ b/060
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=wkendall@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/061 b/061
index 8f1d149..fa98085 100755
--- a/061
+++ b/061
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/062 b/062
index 9800e33..5a6081e 100755
--- a/062
+++ b/062
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/063 b/063
index 42a323a..cdaf524 100755
--- a/063
+++ b/063
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/064 b/064
index 8e9e694..c7e727c 100755
--- a/064
+++ b/064
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/065 b/065
index c1dee5d..12f2ac9 100755
--- a/065
+++ b/065
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/066 b/066
index a6e76c1..7a68f79 100755
--- a/066
+++ b/066
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/067 b/067
index eb91aa1..baaed77 100755
--- a/067
+++ b/067
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/068 b/068
index b595d1d..fe4684c 100755
--- a/068
+++ b/068
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ajones@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/069 b/069
index 820ca5f..3451715 100755
--- a/069
+++ b/069
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/070 b/070
index f48c33c..1d978cd 100755
--- a/070
+++ b/070
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/071 b/071
index ace0ee4..c135d1a 100755
--- a/071
+++ b/071
@@ -20,8 +20,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/072 b/072
index 981c408..930a983 100755
--- a/072
+++ b/072
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/073 b/073
index 9605662..d19c8f5 100755
--- a/073
+++ b/073
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/074 b/074
index b9fb9d5..0e5e820 100755
--- a/074
+++ b/074
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/075 b/075
index 87d273f..de581b6 100755
--- a/075
+++ b/075
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/076 b/076
index e472b26..a8b5d4a 100755
--- a/076
+++ b/076
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/077 b/077
index 3fb3e81..2b86a37 100755
--- a/077
+++ b/077
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/078 b/078
index 7af552e..901723e 100755
--- a/078
+++ b/078
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/079 b/079
index 8f6e179..048b220 100755
--- a/079
+++ b/079
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/080 b/080
index 8ece84d..3243fe1 100755
--- a/080
+++ b/080
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/081 b/081
index 96156c8..f0ee819 100755
--- a/081
+++ b/081
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/082 b/082
index c413c10..e21a793 100755
--- a/082
+++ b/082
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/083 b/083
index 7a73f30..dd60118 100755
--- a/083
+++ b/083
@@ -31,8 +31,6 @@
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/084 b/084
index e04a402..ba5743a 100755
--- a/084
+++ b/084
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/085 b/085
index f4a45b7..44123ad 100755
--- a/085
+++ b/085
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/086 b/086
index 9c3f22d..b59ad0a 100755
--- a/086
+++ b/086
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=root@icy.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/087 b/087
index 48e5eaa..30e117b 100755
--- a/087
+++ b/087
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/088 b/088
index 9fd0df5..b6266ef 100755
--- a/088
+++ b/088
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=root@icy.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/089 b/089
index 1714bec..2653183 100755
--- a/089
+++ b/089
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/090 b/090
index 0cdbe34..8ce50c0 100755
--- a/090
+++ b/090
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/091 b/091
index 8a14602..ad82b8e 100755
--- a/091
+++ b/091
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/092 b/092
index 02ccc71..2f849f3 100755
--- a/092
+++ b/092
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/093 b/093
index d730651..881a833 100755
--- a/093
+++ b/093
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
diff --git a/094 b/094
index 75fc565..4f4cf34 100755
--- a/094
+++ b/094
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/095 b/095
index b85b97f..9de4476 100755
--- a/095
+++ b/095
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/096 b/096
index 237edad..ecadd73 100755
--- a/096
+++ b/096
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/097 b/097
index 643d6f8..d3174e4 100755
--- a/097
+++ b/097
@@ -26,8 +26,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ajones@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/098 b/098
index 5efd78f..58d2a95 100755
--- a/098
+++ b/098
@@ -28,8 +28,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ajones@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/099 b/099
index b68bfcd..edd88a9 100755
--- a/099
+++ b/099
@@ -22,7 +22,6 @@
#
#_acl_list
# modifier
-owner=ajones@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/100 b/100
index f3504ce..1ba5eb7 100755
--- a/100
+++ b/100
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ajones@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/101 b/101
index e58f8b6..0d274e5 100755
--- a/101
+++ b/101
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ajones@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/102 b/102
index dab9b5c..68407a7 100755
--- a/102
+++ b/102
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ajones@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/103 b/103
index e383991..9750153 100755
--- a/103
+++ b/103
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/104 b/104
index 14f2669..4e61837 100755
--- a/104
+++ b/104
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/105 b/105
index 6c7f327..01bae98 100755
--- a/105
+++ b/105
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=fsgqa@snap.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/106 b/106
index 8278691..613b12c 100755
--- a/106
+++ b/106
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/107 b/107
index 74403e6..e887384 100755
--- a/107
+++ b/107
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/108 b/108
index 638cea9..6b656e6 100755
--- a/108
+++ b/108
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/109 b/109
index a9c174f..56364f4 100755
--- a/109
+++ b/109
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/110 b/110
index c58e6c9..8749afa 100755
--- a/110
+++ b/110
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/111 b/111
index 719a0e0..8f4c142 100755
--- a/111
+++ b/111
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/112 b/112
index 763b17a..bcdcfec 100755
--- a/112
+++ b/112
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/113 b/113
index b2ec510..fd301cd 100755
--- a/113
+++ b/113
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/114 b/114
index 7679222..fa64093 100755
--- a/114
+++ b/114
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@crackle.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/115 b/115
index 0679cfc..ebcc995 100755
--- a/115
+++ b/115
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@crackle.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/116 b/116
index cc2bb0f..2c3ab92 100755
--- a/116
+++ b/116
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=fsgqa@snap.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/117 b/117
index 2e3f658..8afc962 100755
--- a/117
+++ b/117
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ajones@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/118 b/118
index 403655e..d140a8b 100755
--- a/118
+++ b/118
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@crackle.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/119 b/119
index 1509ece..85af211 100755
--- a/119
+++ b/119
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@crackle.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/120 b/120
index 010a8f3..8389925 100755
--- a/120
+++ b/120
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/121 b/121
index 2137ebc..a590bb0 100755
--- a/121
+++ b/121
@@ -25,8 +25,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/122 b/122
index a57f8c3..1c4f3a4 100755
--- a/122
+++ b/122
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/123 b/123
index ee1194d..d45c516 100755
--- a/123
+++ b/123
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ajones@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/124 b/124
index adae304..6fbb028 100755
--- a/124
+++ b/124
@@ -25,8 +25,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ajones@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/125 b/125
index 9a29941..c7215a3 100755
--- a/125
+++ b/125
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ajones@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/126 b/126
index c2348f4..a95c1e4 100755
--- a/126
+++ b/126
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/127 b/127
index 62e584c..d1101df 100755
--- a/127
+++ b/127
@@ -25,8 +25,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/128 b/128
index 7760b95..85d0f45 100755
--- a/128
+++ b/128
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/129 b/129
index 38f12a6..18d891b 100755
--- a/129
+++ b/129
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/130 b/130
index ea5270d..943df72 100755
--- a/130
+++ b/130
@@ -30,8 +30,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/131 b/131
index 783765e..176c8b4 100755
--- a/131
+++ b/131
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/132 b/132
index e90f56c..98229a9 100755
--- a/132
+++ b/132
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/133 b/133
index 9dbcb64..ec225f3 100755
--- a/133
+++ b/133
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=lachlan@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/134 b/134
index 7317168..2117b4a 100755
--- a/134
+++ b/134
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/135 b/135
index 976619d..f0bf9b9 100755
--- a/135
+++ b/135
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=lachlan@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/136 b/136
index acf50b7..6479c8c 100755
--- a/136
+++ b/136
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@puffy.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/137 b/137
index 42fb853..0f65d08 100755
--- a/137
+++ b/137
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=lachlan@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/138 b/138
index e7b5609..f8af8dd 100755
--- a/138
+++ b/138
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=lachlan@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/139 b/139
index 706a112..7d2e409 100755
--- a/139
+++ b/139
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=lachlan@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/140 b/140
index 1f88302..a8cbd09 100755
--- a/140
+++ b/140
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=lachlan@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/141 b/141
index cc501d6..45c1b5e 100755
--- a/141
+++ b/141
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=bnaujok@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/142 b/142
index c09a968..526167d 100755
--- a/142
+++ b/142
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/143 b/143
index 7db6fea..63281f9 100755
--- a/143
+++ b/143
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/144 b/144
index 36b9263..52123cc 100755
--- a/144
+++ b/144
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/145 b/145
index 3d6c158..54b8198 100755
--- a/145
+++ b/145
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/146 b/146
index 477df83..bb4975c 100755
--- a/146
+++ b/146
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/147 b/147
index b775478..e366dc7 100755
--- a/147
+++ b/147
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/148 b/148
index 7bb1722..abc516a 100755
--- a/148
+++ b/148
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ddiss@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/149 b/149
index 193e6d7..b1793b7 100755
--- a/149
+++ b/149
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ddiss@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/150 b/150
index a865875..b6a04c5 100755
--- a/150
+++ b/150
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/151 b/151
index f10460d..4bfaff3 100755
--- a/151
+++ b/151
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/152 b/152
index 071be85..2317291 100755
--- a/152
+++ b/152
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/153 b/153
index 7c609d2..81be175 100755
--- a/153
+++ b/153
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/154 b/154
index 2384d26..62e79c2 100755
--- a/154
+++ b/154
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/155 b/155
index de88ecb..949bd98 100755
--- a/155
+++ b/155
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/156 b/156
index 0f3b229..549cac8 100755
--- a/156
+++ b/156
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/157 b/157
index 11488c6..9ae3c40 100755
--- a/157
+++ b/157
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/158 b/158
index 2b95ec6..e740654 100755
--- a/158
+++ b/158
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/159 b/159
index 203afca..bfc225d 100755
--- a/159
+++ b/159
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/160 b/160
index 095951b..3900299 100755
--- a/160
+++ b/160
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/161 b/161
index 8d0aed2..c419380 100755
--- a/161
+++ b/161
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/162 b/162
index 409d3a1..acd70e0 100755
--- a/162
+++ b/162
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/163 b/163
index faf02e4..d4eef64 100755
--- a/163
+++ b/163
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=allanr@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/164 b/164
index 2aea353..1ef4aaf 100755
--- a/164
+++ b/164
@@ -27,8 +27,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@puffy.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/165 b/165
index ec349da..3b321b9 100755
--- a/165
+++ b/165
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@puffy.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/166 b/166
index 65c46da..527686f 100755
--- a/166
+++ b/166
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dgc@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/167 b/167
index ccb6c2a..c2e15e8 100755
--- a/167
+++ b/167
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dgc@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/168 b/168
index e044091..8980f9b 100755
--- a/168
+++ b/168
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ddiss@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/169 b/169
index 627981e..413a86b 100755
--- a/169
+++ b/169
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=ddiss@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/170 b/170
index a807de0..b725d3a 100755
--- a/170
+++ b/170
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator - based on work from ddiss@sgi.co
-owner=dgc@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/171 b/171
index 7e70466..4f77a41 100755
--- a/171
+++ b/171
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dgc@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/172 b/172
index 3220697..b6b496c 100755
--- a/172
+++ b/172
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dgc@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/173 b/173
index 9156403..7146d2f 100755
--- a/173
+++ b/173
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dgc@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/174 b/174
index 4828854..7745a6a 100755
--- a/174
+++ b/174
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dgc@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/175 b/175
index 523dce1..4fc3ffb 100755
--- a/175
+++ b/175
@@ -24,7 +24,6 @@
#
#-----------------------------------------------------------------------
#
-owner=ddiss@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/176 b/176
index b988783..93083c4 100755
--- a/176
+++ b/176
@@ -21,7 +21,6 @@
#
#-----------------------------------------------------------------------
#
-owner=ddiss@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/177 b/177
index b6f4789..ec8aca7 100755
--- a/177
+++ b/177
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=mohamedb@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/178 b/178
index e4e104e..8856656 100755
--- a/178
+++ b/178
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=mohamedb@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/179 b/179
index 5cec718..f3facca 100755
--- a/179
+++ b/179
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=lachlan@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/180 b/180
index c303169..0f82306 100755
--- a/180
+++ b/180
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=lachlan@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/181 b/181
index 6db52ac..fb65100 100755
--- a/181
+++ b/181
@@ -25,8 +25,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/182 b/182
index ae1f920..33e8010 100755
--- a/182
+++ b/182
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=lachlan@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/183 b/183
index 5558eb9..4624ab4 100755
--- a/183
+++ b/183
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=xaiki@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/184 b/184
index 8544dc1..a37f700 100755
--- a/184
+++ b/184
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dgc@sgi.com
seq=`basename $0`
echo "QA output created by $seq - silence is golden"
diff --git a/185 b/185
index ed0793c..928eb24 100755
--- a/185
+++ b/185
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=xaiki@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/186 b/186
index a2d7e14..2c66026 100755
--- a/186
+++ b/186
@@ -32,8 +32,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@emu.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/187 b/187
index 8086c8e..bff0caa 100755
--- a/187
+++ b/187
@@ -26,8 +26,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@emu.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/188 b/188
index ed93e65..4ebbfc1 100755
--- a/188
+++ b/188
@@ -28,8 +28,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=bnaujok@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/189 b/189
index e91d5cd..a5a5682 100755
--- a/189
+++ b/189
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/190 b/190
index 096b871..5bb4743 100755
--- a/190
+++ b/190
@@ -25,8 +25,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=pleckie@sgi.com
#This is the list of holes to punch in the file limited to $filesize
#NOTE holes cannot overlap or this script will fail.
diff --git a/191 b/191
index b1e66bf..3120dcb 100755
--- a/191
+++ b/191
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@emu.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/192 b/192
index 4b69147..691ab7d 100755
--- a/192
+++ b/192
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=tes@emu.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/193 b/193
index 9891256..88ab971 100755
--- a/193
+++ b/193
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/194 b/194
index 931068d..595da25 100755
--- a/194
+++ b/194
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/195 b/195
index b910f72..cd64db1 100755
--- a/195
+++ b/195
@@ -22,8 +22,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/196 b/196
index 6b9998f..321fe47 100755
--- a/196
+++ b/196
@@ -23,8 +23,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/197 b/197
index 0996630..8c2ebd2 100755
--- a/197
+++ b/197
@@ -26,8 +26,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/198 b/198
index 2c72677..31de96c 100755
--- a/198
+++ b/198
@@ -21,8 +21,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/199 b/199
index 2151cd2..127f307 100755
--- a/199
+++ b/199
@@ -23,8 +23,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/200 b/200
index d1f7e9d..34139cc 100755
--- a/200
+++ b/200
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/201 b/201
index 99bcde8..e868d99 100755
--- a/201
+++ b/201
@@ -23,8 +23,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/202 b/202
index f3030fc..27f9e67 100755
--- a/202
+++ b/202
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/203 b/203
index 4d60bb0..ed89600 100755
--- a/203
+++ b/203
@@ -21,8 +21,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/204 b/204
index 9f4839c..6c4a3f0 100755
--- a/204
+++ b/204
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/205 b/205
index bd916a1..7c953db 100755
--- a/205
+++ b/205
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=david@fromorbit.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/206 b/206
index e8bc922..1c25305 100755
--- a/206
+++ b/206
@@ -26,8 +26,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/207 b/207
index 6fff833..6eaf50c 100755
--- a/207
+++ b/207
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/208 b/208
index ca01558..7ea7514 100755
--- a/208
+++ b/208
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/209 b/209
index 650e300..8b2a4e1 100755
--- a/209
+++ b/209
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/210 b/210
index a0873f8..56ac8ad 100755
--- a/210
+++ b/210
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/211 b/211
index bb8d2aa..5667d20 100755
--- a/211
+++ b/211
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/212 b/212
index 1b4bb8a..e211cc4 100755
--- a/212
+++ b/212
@@ -21,8 +21,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/213 b/213
index 9982dd4..e297fdf 100755
--- a/213
+++ b/213
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/214 b/214
index cef7626..0a27fc5 100755
--- a/214
+++ b/214
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/215 b/215
index c61f7a5..749b27b 100755
--- a/215
+++ b/215
@@ -22,8 +22,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/216 b/216
index 71e6dd7..a997d5a 100755
--- a/216
+++ b/216
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=dgc@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/217 b/217
index ef0761e..b33c2e7 100755
--- a/217
+++ b/217
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=dgc@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/218 b/218
index 77782c6..4b46452 100755
--- a/218
+++ b/218
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/219 b/219
index ad4e64d..047e285 100755
--- a/219
+++ b/219
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/220 b/220
index b913434..061b395 100755
--- a/220
+++ b/220
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/221 b/221
index 6681237..9cab3c4 100755
--- a/221
+++ b/221
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/222 b/222
index a65c845..133f221 100755
--- a/222
+++ b/222
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=david@fromorbit.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/223 b/223
index 2e0a245..8eba2d7 100755
--- a/223
+++ b/223
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/224 b/224
index 00ebd2e..23ee7c2 100755
--- a/224
+++ b/224
@@ -26,8 +26,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=david@fromorbit.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/225 b/225
index e7f1d9c..c09bd2a 100755
--- a/225
+++ b/225
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/226 b/226
index 6f28ac9..2179f2a 100755
--- a/226
+++ b/226
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/227 b/227
index dfcb1a5..8403724 100755
--- a/227
+++ b/227
@@ -26,8 +26,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=david@fromorbit.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/228 b/228
index fa230b0..2704934 100755
--- a/228
+++ b/228
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=aarora@in.ibm.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/229 b/229
index 81a2491..52be5c3 100755
--- a/229
+++ b/229
@@ -27,8 +27,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/230 b/230
index e66c5b9..a442857 100755
--- a/230
+++ b/230
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=jack@suse.cz
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/231 b/231
index 115b4c0..6d8bda7 100755
--- a/231
+++ b/231
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=jack@suse.cz
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/232 b/232
index 2795da7..81cd3ca 100755
--- a/232
+++ b/232
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=jack@suse.cz
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/233 b/233
index 28e6ac7..52d2259 100755
--- a/233
+++ b/233
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=jack@suse.cz
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/234 b/234
index 4e98035..dbb13f6 100755
--- a/234
+++ b/234
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=jack@suse.cz
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/235 b/235
index 0c2ae8f..f4a1fce 100755
--- a/235
+++ b/235
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=jack@suse.cz
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/236 b/236
index a7500ed..ec70cdb 100755
--- a/236
+++ b/236
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=shiwh@cn.fujitsu.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/237 b/237
index 4d7bb40..7ebb88e 100755
--- a/237
+++ b/237
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=shiwh@cn.fujitsu.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/238 b/238
index 4daca89..e1a8749 100755
--- a/238
+++ b/238
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=dchinner@redhat.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/239 b/239
index 6457c46..8aa4ed0 100755
--- a/239
+++ b/239
@@ -21,8 +21,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/240 b/240
index dafcef3..d5f8940 100755
--- a/240
+++ b/240
@@ -27,8 +27,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/241 b/241
index bb920fe..ee572a7 100755
--- a/241
+++ b/241
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/242 b/242
index 9a0c89e..eb5f9df 100755
--- a/242
+++ b/242
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dchinner@redhat.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/243 b/243
index 48f7932..6a1b6d7 100755
--- a/243
+++ b/243
@@ -40,8 +40,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=alal@google.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/244 b/244
index cd5f5e8..c96d4eb 100755
--- a/244
+++ b/244
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=arekm@maven.pl
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/245 b/245
index 02b3173..fb81d39 100755
--- a/245
+++ b/245
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/246 b/246
index faa5cca..d82e27d 100755
--- a/246
+++ b/246
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=hch@lst.de
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/247 b/247
index 91410b6..3a2f735 100755
--- a/247
+++ b/247
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=lmcilroy@redhat.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/248 b/248
index 38eb442..f245c1c 100755
--- a/248
+++ b/248
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=xin.zhong@intel.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/249 b/249
index 100cd4c..e72092d 100755
--- a/249
+++ b/249
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=dchinner@redhat.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/250 b/250
index 9eca2b6..2dd12e8 100755
--- a/250
+++ b/250
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=dchinner@redhat.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/251 b/251
index f46b6e2..c5fc79e 100755
--- a/251
+++ b/251
@@ -23,7 +23,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
-owner=lczerner@redhat.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/252 b/252
index 441bed0..9f0424d 100755
--- a/252
+++ b/252
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=josef@redhat.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/253 b/253
index d8c94a2..b63b7f6 100755
--- a/253
+++ b/253
@@ -31,8 +31,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=aelder@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/254 b/254
index 7b74a02..73089d1 100755
--- a/254
+++ b/254
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=josef@redhat.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/255 b/255
index 0083963..e08c726 100755
--- a/255
+++ b/255
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=josef@redhat.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/256 b/256
index ffe172a..0d72795 100755
--- a/256
+++ b/256
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=achender@linux.vnet.ibm.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/257 b/257
index fb81e07..b58bd56 100755
--- a/257
+++ b/257
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=notasas@gmail.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/258 b/258
index e0441a5..87817bc 100755
--- a/258
+++ b/258
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@redhat.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/259 b/259
index d260b79..91503a0 100755
--- a/259
+++ b/259
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=branto@redhat.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/260 b/260
index b005cd3..5bd3b39 100755
--- a/260
+++ b/260
@@ -21,7 +21,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
-owner=lczerner@redhat.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/261 b/261
index 121b9e1..8903ec8 100755
--- a/261
+++ b/261
@@ -24,8 +24,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=aelder@sgi.com
seq=$(basename $0)
echo "QA output created by ${seq}"
diff --git a/262 b/262
index 6de514d..5a060f1 100755
--- a/262
+++ b/262
@@ -25,8 +25,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=aelder@sgi.com
seq=$(basename $0)
echo "QA output created by ${seq}"
diff --git a/263 b/263
index 315a938..18cd5de 100755
--- a/263
+++ b/263
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=nathans@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/264 b/264
index d655d1e..a589c7c 100755
--- a/264
+++ b/264
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=anand.jain@oracle.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/265 b/265
index 10f214f..f28d4e5 100755
--- a/265
+++ b/265
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=anand.jain@oracle.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/266 b/266
index 232e729..89c590f 100755
--- a/266
+++ b/266
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=wkendall@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/267 b/267
index 2ef8dd3..c52d810 100755
--- a/267
+++ b/267
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=wkendall@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/268 b/268
index e1decd9..36391a3 100755
--- a/268
+++ b/268
@@ -22,8 +22,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=wkendall@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/269 b/269
index 7e13ed9..5bf24af 100755
--- a/269
+++ b/269
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dmonakhov@openvz.org
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/270 b/270
index b9ada27..c095606 100755
--- a/270
+++ b/270
@@ -22,8 +22,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dmonakhov@openvz.org
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/271 b/271
index b96d702..50b4c0b 100755
--- a/271
+++ b/271
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dmonakhov@openvz.org
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/272 b/272
index 26dfa3b..ed85216 100755
--- a/272
+++ b/272
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dmonakhov@openvz.org
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/273 b/273
index 67f3d6b..9a40394 100755
--- a/273
+++ b/273
@@ -22,7 +22,6 @@
#-----------------------------------------------------------------------
#
#creator
-owner=wu.bo@cn.fujitsu.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/274 b/274
index dcad90e..9b0fb71 100755
--- a/274
+++ b/274
@@ -24,7 +24,6 @@
#-----------------------------------------------------------------------
#
#creator
-owner=wu.bo@cn.fujitsu.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/275 b/275
index 214262e..5bf06e4 100755
--- a/275
+++ b/275
@@ -23,7 +23,6 @@
#-----------------------------------------------------------------------
#
#creator
-owner=wu.bo@cn.fujitsu.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/276 b/276
index 082f943..fc87c28 100755
--- a/276
+++ b/276
@@ -24,8 +24,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=list.btrfs@jan-o-sch.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/277 b/277
index 8021214..8ef809c 100755
--- a/277
+++ b/277
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=lizf@cn.fujitsu.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/278 b/278
index 73cd117..559e174 100755
--- a/278
+++ b/278
@@ -23,8 +23,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=cmaiolino@redhat.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/279 b/279
index 7d30251..8ee3328 100755
--- a/279
+++ b/279
@@ -21,8 +21,6 @@
# 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"
diff --git a/280 b/280
index 55849ed..69c9afd 100755
--- a/280
+++ b/280
@@ -21,8 +21,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=sandeen@sandeen.net
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/281 b/281
index 137f69f..2af3533 100755
--- a/281
+++ b/281
@@ -21,8 +21,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=wkendall@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/282 b/282
index 024bad8..4938408 100755
--- a/282
+++ b/282
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=wkendall@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/283 b/283
index 27251bb..d1ce8ad 100755
--- a/283
+++ b/283
@@ -23,8 +23,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=wkendall@sgi.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/284 b/284
index c00e6f1..f8d0340 100644
--- a/284
+++ b/284
@@ -20,8 +20,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#-----------------------------------------------------------------------
#
-# creator
-owner=liubo2009@cn.fujitsu.com
seq=`basename $0`
echo "QA output created by $seq"
diff --git a/group b/group
index 104ed35..538e10d 100644
--- a/group
+++ b/group
@@ -5,97 +5,97 @@
#
# catch-all
-other fsg@melbourne.sgi.com
+other
# read/write integrity
-rw dxm@sgi.com
+rw
# directory operations, e.g. create/unlink
-dir dxm@sgi.com
+dir
# metadata and inodes in particular
-metadata dxm@sgi.com
+metadata
# xfs_db
-db nathans@sgi.com dxm@sgi.com
+db
# extended attributes
-attr nathans@sgi.com dxm@sgi.com
+attr
# xfs_logprint
-logprint tes@sgi.com dxm@sgi.com
+logprint
# XFS log related testing
-log tes@sgi.com
+log
# XFS log related testing
-v2log tes@sgi.com
+v2log
# xfsdump, xfsrestore, xfsinvutil
-dump tes@sgi.com ivanr@sgi.com
+dump
# xfsdump, xfsrestore to tapes
-tape tes@sgi.com ivanr@sgi.com
+tape
# xfsdump, xfsrestore to remote tapes
-remote tes@sgi.com ivanr@sgi.com
+remote
# xfs_copy
-copy harshula@sgi.com
+copy
# chacl, libacl
-acl tes@sgi.com
+acl
# capabilities
-cap tes@sgi.com
+cap
# permissions
-perms tes@sgi.com
+perms
# xfs_growfs
-growfs ajag@sgi.com
+growfs
# fsr.xfs
-fsr ajag@sgi.com
+fsr
# mkfs.xfs
-mkfs nathans@sgi.com
+mkfs
# xfs_repair
-repair nathans@sgi.com
+repair
# quota tools and XFS quota kernel code (XQM)
-quota nathans@sgi.com
+quota
# auto - tests to be run as part of nightly qa
-auto dxm@sgi.com
+auto
# ioctl - tests which use ioctl commands (directly/indirectly)
-ioctl nathans@sgi.com
+ioctl
# udf filesystem
-udf ajones@sgi.com
+udf
# AIO operations
-aio nathans@sgi.com
+aio
# Pattern writing and checking
-pattern ajones@sgi.com
+pattern
# dmapi based tests
dmapi
# filestreams based tests
-filestreams dgc@sgi.com
+filestreams
# case-insensitive based tests
-ci bnaujok@sgi.com
+ci
# test the mount/remount path
-mount tes@sgi.com
+mount
# test the NFS v4 ACL code if it exists
-nfs4acl tes@sgi.com donaldd@sgi.com
+nfs4acl
# test access time
atime
diff --git a/new b/new
index eb5e0cb..8dde6c5 100755
--- a/new
+++ b/new
@@ -32,17 +32,6 @@ _cleanup()
:
}
-# fqdn for localhost
-_get_fqdn()
-{
- NSLOOKUP_PROG="`set_prog_path nslookup`"
- if [ "$NSLOOKUP_PROG" = "" ]; then
- getent hosts `uname -n` | awk '{print $2}'
- else
- $NSLOOKUP_PROG `hostname` | $AWK_PROG '{ if ($1 == "Name:") print $2 }'
- fi
-}
-
if [ ! -f group ]
then
echo "Creating the group index ..."
@@ -116,8 +105,6 @@ cat <<End-of-File >$id
#-----------------------------------------------------------------------
#
# creator
-owner=$USER@`_get_fqdn`
-
seq=\`basename \$0\`
echo "QA output created by \$seq"
diff --git a/soak b/soak
index 28a2e2e..0cf27a7 100755
--- a/soak
+++ b/soak
@@ -17,8 +17,6 @@
#
#-----------------------------------------------------------------------
#
-# creator
-owner=dxm@sgi.com
# get standard environment, filters and checks
. ./common.rc
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 04/18] xfstests: remove stale machine configs
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (2 preceding siblings ...)
2012-07-26 9:27 ` [PATCH 03/18] xfstests: kill useless test owner fields Dave Chinner
@ 2012-07-26 9:27 ` Dave Chinner
2012-08-28 19:51 ` Christoph Hellwig
2012-07-26 9:27 ` [PATCH 05/18] xfstests: fold common into check Dave Chinner
` (15 subsequent siblings)
19 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:27 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
Left over from the days of ASG, all stale. Remove them, leaving just
an simple example that defines all the variables that can be
configured. Also, add a localhost defined config set up for simple
KVM based guest test configs using virtio for their block devices to
simplify test setup in such scenarios..
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
configs/134.14.54.101.config | 8 --------
configs/134.14.54.86.config | 8 --------
configs/bongo.config | 8 --------
configs/break.config | 10 ----------
configs/bruce.config | 16 ----------------
configs/burst.config | 6 ------
configs/carrot.config | 12 ------------
configs/chapter11.config | 11 -----------
configs/chook.config | 10 ----------
configs/cocky.config | 15 ---------------
configs/crackle.config | 7 -------
configs/cxfsirix1.config | 7 -------
configs/dassi.config | 8 --------
configs/dibbler.config | 10 ----------
configs/dmfnt2.config | 10 ----------
configs/dribble.config | 12 ------------
configs/emu.config | 8 --------
configs/example.config | 15 +++++++++++++++
configs/flame.config | 9 ---------
configs/frodo.config | 9 ---------
configs/galah.config | 10 ----------
configs/gaspode.config | 13 -------------
configs/giro.config | 11 -----------
configs/goldfish.config | 8 --------
configs/gonzo1.config | 10 ----------
configs/growler.config | 10 ----------
configs/hammer.config | 7 -------
configs/hellfire.config | 15 ---------------
configs/howler.config | 8 --------
configs/indra.config | 6 ------
configs/kermit1.config | 10 ----------
configs/lab343.config | 10 ----------
configs/linux-chatz.config | 12 ------------
configs/lite.config | 8 --------
configs/localhost.config | 15 +++++++++++++++
configs/lumpy.config | 6 ------
configs/mallet.config | 7 -------
configs/melt.config | 7 -------
configs/molten.config | 8 --------
configs/nobbs.config | 13 -------------
configs/permit.config | 6 ------
configs/puffy.config | 9 ---------
configs/rizzo1.config | 7 -------
configs/rooster.config | 12 ------------
configs/rosella.config | 12 ------------
configs/scaly.config | 9 ---------
configs/screamer.config | 12 ------------
configs/surly.config | 11 -----------
configs/tinkle.config | 7 -------
configs/usermode.config | 8 --------
configs/vimes.config | 12 ------------
51 files changed, 30 insertions(+), 468 deletions(-)
delete mode 100644 configs/134.14.54.101.config
delete mode 100644 configs/134.14.54.86.config
delete mode 100644 configs/bongo.config
delete mode 100644 configs/break.config
delete mode 100644 configs/bruce.config
delete mode 100644 configs/burst.config
delete mode 100644 configs/carrot.config
delete mode 100644 configs/chapter11.config
delete mode 100644 configs/chook.config
delete mode 100644 configs/cocky.config
delete mode 100644 configs/crackle.config
delete mode 100644 configs/cxfsirix1.config
delete mode 100644 configs/dassi.config
delete mode 100644 configs/dibbler.config
delete mode 100644 configs/dmfnt2.config
delete mode 100644 configs/dribble.config
delete mode 100644 configs/emu.config
create mode 100644 configs/example.config
delete mode 100644 configs/flame.config
delete mode 100644 configs/frodo.config
delete mode 100644 configs/galah.config
delete mode 100644 configs/gaspode.config
delete mode 100644 configs/giro.config
delete mode 100644 configs/goldfish.config
delete mode 100644 configs/gonzo1.config
delete mode 100644 configs/growler.config
delete mode 100644 configs/hammer.config
delete mode 100644 configs/hellfire.config
delete mode 100644 configs/howler.config
delete mode 100644 configs/indra.config
delete mode 100644 configs/kermit1.config
delete mode 100644 configs/lab343.config
delete mode 100644 configs/linux-chatz.config
delete mode 100644 configs/lite.config
create mode 100644 configs/localhost.config
delete mode 100644 configs/lumpy.config
delete mode 100644 configs/mallet.config
delete mode 100644 configs/melt.config
delete mode 100644 configs/molten.config
delete mode 100644 configs/nobbs.config
delete mode 100644 configs/permit.config
delete mode 100644 configs/puffy.config
delete mode 100644 configs/rizzo1.config
delete mode 100644 configs/rooster.config
delete mode 100644 configs/rosella.config
delete mode 100644 configs/scaly.config
delete mode 100644 configs/screamer.config
delete mode 100644 configs/surly.config
delete mode 100644 configs/tinkle.config
delete mode 100644 configs/usermode.config
delete mode 100644 configs/vimes.config
diff --git a/configs/134.14.54.101.config b/configs/134.14.54.101.config
deleted file mode 100644
index 6f6b610..0000000
--- a/configs/134.14.54.101.config
+++ /dev/null
@@ -1,8 +0,0 @@
-# Autogenerated config for host 134.14.54.101, by xaiki's hack.pl
-#The IP for file system resource on HA cluster.
-EMAIL="leenap@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/lxvm/test
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/lxvm/scratch
-
diff --git a/configs/134.14.54.86.config b/configs/134.14.54.86.config
deleted file mode 100644
index c2fec06..0000000
--- a/configs/134.14.54.86.config
+++ /dev/null
@@ -1,8 +0,0 @@
-# Autogenerated config for host 134.14.54.86, by xaiki's hack.pl
-#The IP for file system resource on HA cluster.
-EMAIL="leenap@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/lxvm/test
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/lxvm/scratch
-
diff --git a/configs/bongo.config b/configs/bongo.config
deleted file mode 100644
index d972181..0000000
--- a/configs/bongo.config
+++ /dev/null
@@ -1,8 +0,0 @@
-# Autogenerated config for host bongo, by xaiki's hack.pl
-TEST_DEV=/dev/hda8
-TEST_DIR=/xfs1
-SCRATCH_DEV=/dev/hda9
-SCRATCH_MNT=/xfs2
-SCRATCH_LOGDEV=/dev/hda10
-SCRATCH_RTDEV=/dev/hda11
-
diff --git a/configs/break.config b/configs/break.config
deleted file mode 100644
index 64f6d59..0000000
--- a/configs/break.config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated config for host break, by xaiki's hack.pl
-MODULAR=1
-EMAIL="nathans@larry"
-SCRATCH_MNT=/mnt/scratch
-#SCRATCH_DEV=/dev/sda6
-SCRATCH_DEV=budgie:/mnt/scratch
-TEST_DIR=/mnt/test
-#TEST_DEV=/dev/sda5
-TEST_DEV=budgie:/mnt/test
-
diff --git a/configs/bruce.config b/configs/bruce.config
deleted file mode 100644
index f4f37c4..0000000
--- a/configs/bruce.config
+++ /dev/null
@@ -1,16 +0,0 @@
-# Autogenerated config for host bruce, by xaiki's hack.pl
-MODULAR=0
-EMAIL="nathans@larry"
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/sdb5
-SCRATCH_RTDEV=/dev/sdc1
-SCRATCH_LOGDEV=/dev/ram0
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/sdc3
-TEST_RTDEV=/dev/sdb6
-TEST_LOGDEV=/dev/ram1
-#TAPE_DEV=/dev/st0
-#RMT_TAPE_DEV=bruce:/dev/st0
-#RMT_IRIXTAPE_DEV=snort:/dev/tape
-#RMT_TAPE_USER=guest
-
diff --git a/configs/burst.config b/configs/burst.config
deleted file mode 100644
index 95bb09d..0000000
--- a/configs/burst.config
+++ /dev/null
@@ -1,6 +0,0 @@
-# Autogenerated config for host burst, by xaiki's hack.pl
-TEST_DIR=/xfs
-TEST_DEV=/dev/hda3
-SCRATCH_DEV=/dev/hda7
-SCRATCH_MNT=/scratch
-
diff --git a/configs/carrot.config b/configs/carrot.config
deleted file mode 100644
index 26f8e49..0000000
--- a/configs/carrot.config
+++ /dev/null
@@ -1,12 +0,0 @@
-# Autogenerated config for host carrot, by xaiki's hack.pl
-#dedicated qa machine, used to be dribble
-MODULAR=0
-EMAIL="ddiss@sgi.com"
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/dsk/dks0d2s0
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/dsk/dks0d2s6
-#TAPE_DEV=/dev/tape
-#RMT_TAPE_DEV=icy:/dev/st0
-#RMT_TAPE_USER=guest
-
diff --git a/configs/chapter11.config b/configs/chapter11.config
deleted file mode 100644
index 70039e4..0000000
--- a/configs/chapter11.config
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autogenerated config for host chapter11, by xaiki's hack.pl
-[ -z "$MODULAR" ] && MODULAR=1
-EMAIL="ddiss@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb5
-[ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb7
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb6
-[ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb8
-[ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb9
-
diff --git a/configs/chook.config b/configs/chook.config
deleted file mode 100644
index 64f6d59..0000000
--- a/configs/chook.config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated config for host break, by xaiki's hack.pl
-MODULAR=1
-EMAIL="nathans@larry"
-SCRATCH_MNT=/mnt/scratch
-#SCRATCH_DEV=/dev/sda6
-SCRATCH_DEV=budgie:/mnt/scratch
-TEST_DIR=/mnt/test
-#TEST_DEV=/dev/sda5
-TEST_DEV=budgie:/mnt/test
-
diff --git a/configs/cocky.config b/configs/cocky.config
deleted file mode 100644
index 0d2e432..0000000
--- a/configs/cocky.config
+++ /dev/null
@@ -1,15 +0,0 @@
-# Autogenerated config for host cocky, by xaiki's hack.pl
-MODULAR=1
-EMAIL="ajones@sgi.com"
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/sdb1
-TEST_LOGDEV=/dev/sdb3
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/sdb2
-SCRATCH_LOGDEV=/dev/sdb4
-#SCRATCH_RTDEV=/dev/sdb5
-TAPE_DEV=/dev/st0
-#RMT_IRIXTAPE_DEV=snort:/dev/tape
-#RMT_TAPE_DEV=icy:/dev/st0
-#RMT_TAPE_USER=guest
-
diff --git a/configs/crackle.config b/configs/crackle.config
deleted file mode 100644
index ee3c0da..0000000
--- a/configs/crackle.config
+++ /dev/null
@@ -1,7 +0,0 @@
-# Autogenerated config for host crackle, by xaiki's hack.pl
-#irix-crackle
-TEST_DIR=/mnt/xfs
-SCRATCH_MNT=/mnt/xfs2
-TEST_DEV=/dev/dsk/dks0d1s3
-SCRATCH_DEV=/dev/dsk/dks0d1s4
-
diff --git a/configs/cxfsirix1.config b/configs/cxfsirix1.config
deleted file mode 100644
index c36568a..0000000
--- a/configs/cxfsirix1.config
+++ /dev/null
@@ -1,7 +0,0 @@
-# Autogenerated config for host cxfsirix1, by xaiki's hack.pl
-EMAIL="ajones@sgi.com"
-TEST_DIR=/mnt/xfs_test0
-TEST_DEV=/dev/cxvm/xfs_test0
-SCRATCH_MNT=/mnt/xfs_test1
-SCRATCH_DEV=/dev/cxvm/xfs_test1
-
diff --git a/configs/dassi.config b/configs/dassi.config
deleted file mode 100644
index 638c06a..0000000
--- a/configs/dassi.config
+++ /dev/null
@@ -1,8 +0,0 @@
-# Autogenerated config for host dassi, by xaiki's hack.pl
-MODULAR=0
-EMAIL="ddiss@sgi.com"
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/dsk/dks0d2s0
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/dsk/dks0d2s1
-
diff --git a/configs/dibbler.config b/configs/dibbler.config
deleted file mode 100644
index 2068c19..0000000
--- a/configs/dibbler.config
+++ /dev/null
@@ -1,10 +0,0 @@
-# configuration file for dibbler
-[ -z "$MODULAR" ] && MODULAR=1
-EMAIL="mohamedb@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
-[ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
-[ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
-
diff --git a/configs/dmfnt2.config b/configs/dmfnt2.config
deleted file mode 100644
index de6af2e..0000000
--- a/configs/dmfnt2.config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated config for host dmfnt2, by xaiki's hack.pl
-TEST_DEV=/dev/sda6
-TEST_DIR=/mnt/test
-SCRATCH_DEV=/dev/sdc6
-SCRATCH_MNT=/mnt/scratch
-TAPE_DEV=/dev/st0
-RMT_TAPE_DEV=longhorn:/dev/tape
-# RMT_IRIXTAPE_DEV=longhorn:/dev/tape
-RMT_TAPE_USER=guest
-
diff --git a/configs/dribble.config b/configs/dribble.config
deleted file mode 100644
index b548b8e..0000000
--- a/configs/dribble.config
+++ /dev/null
@@ -1,12 +0,0 @@
-# Autogenerated config for host dribble, by xaiki's hack.pl
-#dedicated qa machine
-MODULAR=0
-EMAIL="ddiss@sgi.com"
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/dsk/dks0d2s0
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/dsk/dks0d2s6
-#TAPE_DEV=/dev/tape
-#RMT_TAPE_DEV=icy:/dev/st0
-#RMT_TAPE_USER=guest
-
diff --git a/configs/emu.config b/configs/emu.config
deleted file mode 100644
index 6b21ff3..0000000
--- a/configs/emu.config
+++ /dev/null
@@ -1,8 +0,0 @@
-# Autogenerated config for host emu, by xaiki's hack.pl
-MODULAR=0
-EMAIL="tes@sgi.com"
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/sdb1
-SCRATCH_MNT=/mnt/scratch1
-SCRATCH_DEV=/dev/sdb2
-
diff --git a/configs/example.config b/configs/example.config
new file mode 100644
index 0000000..7b6e142
--- /dev/null
+++ b/configs/example.config
@@ -0,0 +1,15 @@
+# Example config file with all typical device options set for full
+# XFS kernel, progs and dump testing.
+MODULAR=0
+SCRATCH_MNT=/mnt/scratch
+SCRATCH_DEV=/dev/sdb5
+SCRATCH_RTDEV=/dev/sdc1
+SCRATCH_LOGDEV=/dev/ram0
+TEST_DIR=/mnt/test
+TEST_DEV=/dev/sdc3
+TEST_RTDEV=/dev/sdb6
+TEST_LOGDEV=/dev/ram1
+TAPE_DEV=/dev/st0
+RMT_TAPE_DEV=bruce:/dev/st0
+RMT_IRIXTAPE_DEV=snort:/dev/tape
+RMT_TAPE_USER=guest
diff --git a/configs/flame.config b/configs/flame.config
deleted file mode 100644
index ad44006..0000000
--- a/configs/flame.config
+++ /dev/null
@@ -1,9 +0,0 @@
-# Autogenerated config for host flame, by xaiki's hack.pl
-#dedicated qa machine (has some values already set)
-[ -z "$MODULAR" ] && MODULAR=1
-EMAIL="ddiss@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/xfs_test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/lxvm/xfs_test
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/xfs_scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/lxvm/xfs_scratch
-
diff --git a/configs/frodo.config b/configs/frodo.config
deleted file mode 100644
index a8c262c..0000000
--- a/configs/frodo.config
+++ /dev/null
@@ -1,9 +0,0 @@
-# Autogenerated config for host frodo, by xaiki's hack.pl
-MODULAR=0
-EMAIL="nathans@larry"
-TEST_DEV=/dev/hda6
-TEST_DIR=/mnt/test
-SCRATCH_DEV=/dev/hda7
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_LOGDEV=/dev/hda9
-
diff --git a/configs/galah.config b/configs/galah.config
deleted file mode 100644
index dc4c835..0000000
--- a/configs/galah.config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated config for host galah, by xaiki's hack.pl
-MODULAR=1
-EMAIL="ddiss@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
-[ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
-[ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
-
diff --git a/configs/gaspode.config b/configs/gaspode.config
deleted file mode 100644
index 8d7f939..0000000
--- a/configs/gaspode.config
+++ /dev/null
@@ -1,13 +0,0 @@
-# Autogenerated config for host gaspode, by xaiki's hack.pl
-#dedicated qa machine (has some values already set)
-[ -z "$MODULAR" ] && MODULAR=1
-EMAIL="ddiss@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
-[ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
-[ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
-[ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb5
-[ -z "$TAPE_DEV" ] && TAPE_DEV=/dev/st0
-
diff --git a/configs/giro.config b/configs/giro.config
deleted file mode 100644
index cab8b56..0000000
--- a/configs/giro.config
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autogenerated config for host giro, by xaiki's hack.pl
-MODULAR=0
-EMAIL="ddiss@sgi.com"
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/dsk/dks0d2s0
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/dsk/dks0d2s6
-#TAPE_DEV=/dev/tape
-#RMT_TAPE_DEV=icy:/dev/st0
-#RMT_TAPE_USER=guest
-
diff --git a/configs/goldfish.config b/configs/goldfish.config
deleted file mode 100644
index 94f5fc8..0000000
--- a/configs/goldfish.config
+++ /dev/null
@@ -1,8 +0,0 @@
-# Autogenerated config for host goldfish, by xaiki's hack.pl
-MODULAR=0
-TEST_DEV=/dev/hdc1
-TEST_DIR=/mnt/xfs0
-SCRATCH_DEV=/dev/hdc2
-SCRATCH_MNT=/mnt/xfs1
-SCRATCH_LOGDEV=/dev/hdc3
-
diff --git a/configs/gonzo1.config b/configs/gonzo1.config
deleted file mode 100644
index e6d807b..0000000
--- a/configs/gonzo1.config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated config for host gonzo1, by xaiki's hack.pl
-EMAIL="leenap@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/xfs_test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/lxvm/xfs_test
-[ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb1
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/xfs_scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/lxvm/xfs_scratch
-[ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb2
-[ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb3
-
diff --git a/configs/growler.config b/configs/growler.config
deleted file mode 100644
index bf99b05..0000000
--- a/configs/growler.config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated config for host growler, by xaiki's hack.pl
-[ -z "$MODULAR" ] && MODULAR=1
-EMAIL="ddiss@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
-[ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
-[ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
-
diff --git a/configs/hammer.config b/configs/hammer.config
deleted file mode 100644
index a070f93..0000000
--- a/configs/hammer.config
+++ /dev/null
@@ -1,7 +0,0 @@
-# Autogenerated config for host hammer, by xaiki's hack.pl
-EMAIL="bnaujok@sgi.com"
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/sda5
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/sda6
-
diff --git a/configs/hellfire.config b/configs/hellfire.config
deleted file mode 100644
index 7664829..0000000
--- a/configs/hellfire.config
+++ /dev/null
@@ -1,15 +0,0 @@
-# Autogenerated config for host hellfire, by xaiki's hack.pl
-MODULAR=1
-EMAIL="ajones@sgi.com"
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/sda3
-TEST_LOGDEV=/dev/sda5
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/sda4
-SCRATCH_LOGDEV=/dev/sda6
-#SCRATCH_RTDEV=/dev/sda7
-TAPE_DEV=/dev/st0
-#RMT_IRIXTAPE_DEV=snort:/dev/tape
-#RMT_TAPE_DEV=icy:/dev/st0
-#RMT_TAPE_USER=guest
-
diff --git a/configs/howler.config b/configs/howler.config
deleted file mode 100644
index 47d98c1..0000000
--- a/configs/howler.config
+++ /dev/null
@@ -1,8 +0,0 @@
-# Autogenerated config for host howler, by xaiki's hack.pl
-[ -z "$MODULAR" ] && MODULAR=1
-EMAIL="allanr@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
-
diff --git a/configs/indra.config b/configs/indra.config
deleted file mode 100644
index dce005e..0000000
--- a/configs/indra.config
+++ /dev/null
@@ -1,6 +0,0 @@
-# Autogenerated config for host indra, by xaiki's hack.pl
-TEST_DEV=/dev/sdb1
-TEST_DIR=/mnt/xfs0
-SCRATCH_DEV=/dev/sdb2
-SCRATCH_MNT=/mnt/xfs1
-
diff --git a/configs/kermit1.config b/configs/kermit1.config
deleted file mode 100644
index 7d09819..0000000
--- a/configs/kermit1.config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated config for host kermit1, by xaiki's hack.pl
-EMAIL="mohamedb@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/xfs_test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/lxvm/xfs_test
-[ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb1
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/xfs_scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/lxvm/xfs_scratch
-[ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb2
-[ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb3
-
diff --git a/configs/lab343.config b/configs/lab343.config
deleted file mode 100644
index 4b38d3d..0000000
--- a/configs/lab343.config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated config for host lab343, by xaiki's hack.pl
-MODULAR=0
-EMAIL="hch@sgi.com"
-TEST_DEV=/dev/sdb1
-SCRATCH_DEV=/dev/sdb2
-SCRATCH_LOGDEV=/dev/sdb5
-SCRATCH_RTDEV=/dev/sdb6
-TEST_DIR=/qa/test
-SCRATCH_MNT=/qa/scratch
-
diff --git a/configs/linux-chatz.config b/configs/linux-chatz.config
deleted file mode 100644
index ba762c9..0000000
--- a/configs/linux-chatz.config
+++ /dev/null
@@ -1,12 +0,0 @@
-# Autogenerated config for host linux-chatz, by xaiki's hack.pl
-#vmware on pc-chatz
-MODULAR=1
-EMAIL="chatz@sgi.com"
-USE_EXTERNAL=yes
-TEST_DIR="/mnt/data"
-TEST_DEV=/dev/sdd
-TEST_LOGDEV=/dev/sdb
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/sdg
-SCRATCH_LOGDEV=/mnt/sde
-
diff --git a/configs/lite.config b/configs/lite.config
deleted file mode 100644
index 783cd3c..0000000
--- a/configs/lite.config
+++ /dev/null
@@ -1,8 +0,0 @@
-# Autogenerated config for host lite, by xaiki's hack.pl
-TEST_DEV=/dev/sda1
-TEST_DIR=/mnt/sda1
-SCRATCH_DEV=/dev/sda2
-SCRATCH_MNT=/mnt/sda2
-SCRATCH_LOGDEV=/dev/sda3
-SCRATCH_RTDEV=/dev/sda4
-
diff --git a/configs/localhost.config b/configs/localhost.config
new file mode 100644
index 0000000..f47e694
--- /dev/null
+++ b/configs/localhost.config
@@ -0,0 +1,15 @@
+# default localhost file, set up for virtual machines using KVM and
+# virtio for it's block devices
+#
+MODULAR=0
+TEST_DIR=/mnt/test
+SCRATCH_MNT=/mnt/scratch
+
+TEST_DEV=/dev/vda
+SCRATCH_DEV=/dev/vdb
+
+TEST_LOGDEV=/dev/vdc
+SCRATCH_LOGDEV=/dev/vdd
+
+TEST_RTDEV=/dev/vde
+SCRATCH_RTDEV=/dev/vdf
diff --git a/configs/lumpy.config b/configs/lumpy.config
deleted file mode 100644
index 321d852..0000000
--- a/configs/lumpy.config
+++ /dev/null
@@ -1,6 +0,0 @@
-# Autogenerated config for host lumpy, by xaiki's hack.pl
-TEST_DEV=/dev/sdc5
-TEST_DIR=/mnt/scratch_0
-SCRATCH_DEV=/dev/sdc7
-SCRATCH_MNT=/mnt/scratch_2
-
diff --git a/configs/mallet.config b/configs/mallet.config
deleted file mode 100644
index 197fef5..0000000
--- a/configs/mallet.config
+++ /dev/null
@@ -1,7 +0,0 @@
-# Autogenerated config for host mallet, by xaiki's hack.pl
-MODULAR=1
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/sda3
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/sda4
-
diff --git a/configs/melt.config b/configs/melt.config
deleted file mode 100644
index 59bf9fc..0000000
--- a/configs/melt.config
+++ /dev/null
@@ -1,7 +0,0 @@
-# Autogenerated config for host melt, by xaiki's hack.pl
-MODULAR=1
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/sdb1
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/sdb2
-
diff --git a/configs/molten.config b/configs/molten.config
deleted file mode 100644
index dc8bfea..0000000
--- a/configs/molten.config
+++ /dev/null
@@ -1,8 +0,0 @@
-# Autogenerated config for host molten, by xaiki's hack.pl
-[ -z "$MODULAR" ] && MODULAR=1
-EMAIL="ddiss@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb5
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb6
-
diff --git a/configs/nobbs.config b/configs/nobbs.config
deleted file mode 100644
index 7a3cf2d..0000000
--- a/configs/nobbs.config
+++ /dev/null
@@ -1,13 +0,0 @@
-# Autogenerated config for host nobbs, by xaiki's hack.pl
-#dedicated qa machine, used to be porky
-[ -z "$MODULAR" ] && MODULAR=1
-EMAIL="ddiss@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
-[ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
-[ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
-#[ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb7
-#[ -z "$TAPE_DEV" ] && TAPE_DEV=/dev/st0
-
diff --git a/configs/permit.config b/configs/permit.config
deleted file mode 100644
index 93b5326..0000000
--- a/configs/permit.config
+++ /dev/null
@@ -1,6 +0,0 @@
-# Autogenerated config for host permit, by xaiki's hack.pl
-TEST_DEV=/dev/sdc1
-TEST_DIR=/mnt/xfs0
-SCRATCH_DEV=/dev/sdd1
-SCRATCH_MNT=/mnt/xfs1
-
diff --git a/configs/puffy.config b/configs/puffy.config
deleted file mode 100644
index e1f77ae..0000000
--- a/configs/puffy.config
+++ /dev/null
@@ -1,9 +0,0 @@
-# Autogenerated config for host puffy, by xaiki's hack.pl
-MODULAR=1
-EMAIL="tes@sgi.com"
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/sda7
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/sda8
-TAPE_DEV=/dev/st0
-
diff --git a/configs/rizzo1.config b/configs/rizzo1.config
deleted file mode 100644
index d1a55b1..0000000
--- a/configs/rizzo1.config
+++ /dev/null
@@ -1,7 +0,0 @@
-# Autogenerated config for host rizzo1, by xaiki's hack.pl
-EMAIL="mohamedb@sgi.com"
-TEST_DIR=/mnt/xfs_test
-TEST_DEV=/dev/lxvm/xfs_test
-SCRATCH_MNT=/mnt/xfs_scratch
-SCRATCH_DEV=/dev/lxvm/xfs_scratch
-
diff --git a/configs/rooster.config b/configs/rooster.config
deleted file mode 100644
index e5a3163..0000000
--- a/configs/rooster.config
+++ /dev/null
@@ -1,12 +0,0 @@
-# Autogenerated config for host rooster, by xaiki's hack.pl
-MODULAR=1
-EMAIL="ajones@sgi.com"
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/sdb1
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/sdb2
-TAPE_DEV=/dev/st0
-#RMT_IRIXTAPE_DEV=snort:/dev/tape
-#RMT_TAPE_DEV=icy:/dev/st0
-#RMT_TAPE_USER=guest
-
diff --git a/configs/rosella.config b/configs/rosella.config
deleted file mode 100644
index 3b441bf..0000000
--- a/configs/rosella.config
+++ /dev/null
@@ -1,12 +0,0 @@
-# Autogenerated config for host rosella, by xaiki's hack.pl
-MODULAR=1
-EMAIL="ajones@sgi.com"
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/sdb1
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/sdb3
-TAPE_DEV=/dev/st0
-#RMT_IRIXTAPE_DEV=snort:/dev/tape
-#RMT_TAPE_DEV=icy:/dev/st0
-#RMT_TAPE_USER=guest
-
diff --git a/configs/scaly.config b/configs/scaly.config
deleted file mode 100644
index a6d5510..0000000
--- a/configs/scaly.config
+++ /dev/null
@@ -1,9 +0,0 @@
-# Autogenerated config for host scaly, by xaiki's hack.pl
-EMAIL="bnaujok@sgi.com"
-TEST_DIR=/mnt/test
-TEST_DEV=/dev/sdd3
-#TEST_LOGDEV=/dev/sdd1
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_DEV=/dev/sdd4
-#SCRATCH_LOGDEV=/dev/sdd2
-
diff --git a/configs/screamer.config b/configs/screamer.config
deleted file mode 100644
index 047d64b..0000000
--- a/configs/screamer.config
+++ /dev/null
@@ -1,12 +0,0 @@
-# Autogenerated config for host screamer, by xaiki's hack.pl
-#dedicated qa machine (has some values already set)
-[ -z "$MODULAR" ] && MODULAR=1
-EMAIL="ddiss@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/sdb1
-#[ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/sdb3
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/sdb2
-#[ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/sdb4
-#[ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb5
-
diff --git a/configs/surly.config b/configs/surly.config
deleted file mode 100644
index 67c69a3..0000000
--- a/configs/surly.config
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autogenerated config for host surly, by xaiki's hack.pl
-TEST_DEV=/dev/hda9
-TEST_DIR=/mnt/xfs1
-SCRATCH_DEV=/dev/hda8
-SCRATCH_MNT=/mnt/xfs0
-SCRATCH_LOGDEV=/dev/hda10
-TAPE_DEV=/dev/st0
-RMT_TAPE_DEV=fuzzy:/dev/st0
-RMT_IRIXTAPE_DEV=blub:/dev/tape
-RMT_TAPE_USER=guest
-
diff --git a/configs/tinkle.config b/configs/tinkle.config
deleted file mode 100644
index 5b534e8..0000000
--- a/configs/tinkle.config
+++ /dev/null
@@ -1,7 +0,0 @@
-# Autogenerated config for host tinkle, by xaiki's hack.pl
-#irix-patchbox-tinkle
-TEST_DEV=/dev/dsk/dks0d2s0
-TEST_DIR=/mnt/xfs_test
-SCRATCH_DEV=/dev/dsk/dks0d2s1
-SCRATCH_MNT=/mnt/xfs_scratch
-
diff --git a/configs/usermode.config b/configs/usermode.config
deleted file mode 100644
index 12734a3..0000000
--- a/configs/usermode.config
+++ /dev/null
@@ -1,8 +0,0 @@
-# Autogenerated config for host usermode, by xaiki's hack.pl
-TEST_DEV=/dev/ubd/1
-TEST_DIR=/mnt/test
-SCRATCH_DEV=/dev/ubd/2
-SCRATCH_MNT=/mnt/scratch
-SCRATCH_RTDEV=/dev/ubd/3
-SCRATCH_LOGDEV=/dev/ubd/4
-
diff --git a/configs/vimes.config b/configs/vimes.config
deleted file mode 100644
index afc129b..0000000
--- a/configs/vimes.config
+++ /dev/null
@@ -1,12 +0,0 @@
-# Autogenerated config for host vimes, by xaiki's hack.pl
-# dedicated qa machine, used to be sheila
-[ -z "$MODULAR" ] && MODULAR=1
-EMAIL="ddiss@sgi.com"
-[ -z "$TEST_DIR" ] && TEST_DIR=/mnt/test
-[ -z "$TEST_DEV" ] && TEST_DEV=/dev/hdb1
-[ -z "$TEST_LOGDEV" ] && TEST_LOGDEV=/dev/hdb3
-[ -z "$SCRATCH_MNT" ] && SCRATCH_MNT=/mnt/scratch
-[ -z "$SCRATCH_DEV" ] && SCRATCH_DEV=/dev/hdb2
-[ -z "$SCRATCH_LOGDEV" ] && SCRATCH_LOGDEV=/dev/hdb4
-[ -z "$SCRATCH_RTDEV" ] && SCRATCH_RTDEV=/dev/sdb5
-
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 05/18] xfstests: fold common into check
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (3 preceding siblings ...)
2012-07-26 9:27 ` [PATCH 04/18] xfstests: remove stale machine configs Dave Chinner
@ 2012-07-26 9:27 ` Dave Chinner
2012-08-28 19:52 ` Christoph Hellwig
2012-07-26 9:28 ` [PATCH 06/18] xfstests: clean up and simply check CLI option parsing Dave Chinner
` (14 subsequent siblings)
19 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:27 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
There is only one user of the common file now - check. Fold the two
into one file as the split of functionality is not necessary
anymore.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
check | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
common | 334 ----------------------------------------------------------------
2 files changed, 311 insertions(+), 336 deletions(-)
delete mode 100644 common
diff --git a/check b/check
index a4af0f6..bccdc08 100755
--- a/check
+++ b/check
@@ -44,9 +44,318 @@ then
exit 1
fi
-# we need common
-. ./common
+# argument parsing first - currently very messy, needs cleanup.
+_setenvironment()
+{
+ MSGVERB="text:action"
+ export MSGVERB
+}
+
+usage()
+{
+ echo "Usage: $0 [options] [testlist]"'
+
+common options
+ -v verbose
+
+check options
+ -xfs test XFS (default)
+ -udf test UDF
+ -nfs test NFS
+ -l line mode diff
+ -xdiff graphical mode diff
+ -udiff show unified diff (default)
+ -n show me, do not run tests
+ -q quick [deprecated]
+ -T output timestamps
+ -r randomize test order
+ --large-fs optimise scratch device for large filesystems
+
+testlist options
+ -g group[,group...] include tests from these groups
+ -x group[,group...] exclude tests from these groups
+ NNN include test NNN
+ NNN-NNN include test range (eg. 012-021)
+'
+ exit 0
+}
+
+here=`pwd`
+rm -f $here/$iam.out
+_setenvironment
+
+check=${check-true}
+
+diff="diff -u"
+verbose=false
+group=false
+xgroup=false
+showme=false
+sortme=false
+expunge=true
+have_test_arg=false
+randomize=false
+rm -f $tmp.list $tmp.tmp $tmp.sed
+
+# Autodetect fs type based on what's on $TEST_DEV
+if [ "$HOSTOS" == "Linux" ]
+then
+ export FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
+else
+ export FSTYP=xfs
+fi
+
+for r
+do
+
+ if $group
+ then
+ # arg after -g
+ group_list=$(sed -n < group \
+ -e 's/#.*//' \
+ -e 's/$/ /' \
+ -e "/^[0-9][0-9][0-9].* $r /"'{ s/ .*//p }')
+ if [ -z "$group_list" ]
+ then
+ echo "Group \"$r\" is empty or not defined?"
+ exit 1
+ fi
+ [ ! -s $tmp.list ] && touch $tmp.list
+ for t in $group_list
+ do
+ if grep -s "^$t\$" $tmp.list >/dev/null
+ then
+ :
+ else
+ echo "$t" >>$tmp.list
+ fi
+ done
+ group=false
+ continue
+
+ elif $xgroup
+ then
+ # arg after -x
+ [ ! -s $tmp.list ] && ls [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] >$tmp.list 2>/dev/null
+ group_list=`sed -n <group -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{
+s/ .*//p
+}'`
+ if [ -z "$group_list" ]
+ then
+ echo "Group \"$r\" is empty or not defined?"
+ exit 1
+ fi
+ numsed=0
+ rm -f $tmp.sed
+ for t in $group_list
+ do
+ if [ $numsed -gt 100 ]
+ then
+ sed -f $tmp.sed <$tmp.list >$tmp.tmp
+ mv $tmp.tmp $tmp.list
+ numsed=0
+ rm -f $tmp.sed
+ fi
+ echo "/^$t\$/d" >>$tmp.sed
+ numsed=`expr $numsed + 1`
+ done
+ sed -f $tmp.sed <$tmp.list >$tmp.tmp
+ mv $tmp.tmp $tmp.list
+ xgroup=false
+ continue
+ fi
+
+ xpand=true
+ case "$r"
+ in
+
+ -\? | -h | --help) # usage
+ usage
+ ;;
+
+ -udf) # -udf ... set FSTYP to udf
+ FSTYP=udf
+ xpand=false
+ ;;
+
+ -xfs) # -xfs ... set FSTYP to xfs
+ FSTYP=xfs
+ xpand=false
+ ;;
+
+ -nfs) # -nfs ... set FSTYP to nfs
+ FSTYP=nfs
+ xpand=false
+ ;;
+
+ -g) # -g group ... pick from group file
+ group=true
+ xpand=false
+ ;;
+
+ -l) # line mode for diff, was default before
+ diff="diff"
+ xpand=false
+ ;;
+
+ -xdiff) # graphical diff mode
+ xpand=false
+
+ if [ ! -z "$DISPLAY" ]
+ then
+ which xdiff >/dev/null 2>&1 && diff=xdiff
+ which gdiff >/dev/null 2>&1 && diff=gdiff
+ which tkdiff >/dev/null 2>&1 && diff=tkdiff
+ which xxdiff >/dev/null 2>&1 && diff=xxdiff
+ fi
+ ;;
+
+ -udiff) # show a unified diff, default now, keep for backward compat
+ xpand=false
+ diff="$diff -u"
+ ;;
+
+ -q) # "quick", no longer used - always quick :-)
+ xpand=false
+ ;;
+
+ -n) # show me, don't do it
+ showme=true
+ xpand=false
+ ;;
+ -r) # randomize test order
+ randomize=true
+ xpand=false
+ ;;
+
+ -T) # turn on timestamp output
+ timestamp=true
+ xpand=false
+ ;;
+
+ -v)
+ verbose=true
+ xpand=false
+ ;;
+ -x) # -x group ... exclude from group file
+ xgroup=true
+ xpand=false
+ ;;
+ '[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]')
+ echo "No tests?"
+ status=1
+ exit $status
+ ;;
+
+ [0-9]*-[0-9]*)
+ eval `echo $r | sed -e 's/^/start=/' -e 's/-/ end=/'`
+ ;;
+
+ [0-9]*-)
+ eval `echo $r | sed -e 's/^/start=/' -e 's/-//'`
+ end=`echo [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] | sed -e 's/\[0-9]//g' -e 's/ *$//' -e 's/.* //'`
+ if [ -z "$end" ]
+ then
+ echo "No tests in range \"$r\"?"
+ status=1
+ exit $status
+ fi
+ ;;
+
+ --large-fs)
+ export LARGE_SCRATCH_DEV=yes
+ xpand=false
+ ;;
+
+ -*)
+ usage
+ ;;
+
+ --extra-space=*)
+ export SCRATCH_DEV_EMPTY_SPACE=${r#*=}
+ xpand=false
+ ;;
+
+ *)
+ start=$r
+ end=$r
+ ;;
+
+ esac
+
+ # get rid of leading 0s as can be interpreted as octal
+ start=`echo $start | sed 's/^0*//'`
+ end=`echo $end | sed 's/^0*//'`
+
+ if $xpand
+ then
+ have_test_arg=true
+ $AWK_PROG </dev/null '
+BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
+ | while read id
+ do
+ if grep -s "^$id " group >/dev/null
+ then
+ # in group file ... OK
+ echo $id >>$tmp.list
+ else
+ if [ -f expunged ] && $expunge && egrep "^$id([ ]|\$)" expunged >/dev/null
+ then
+ # expunged ... will be reported, but not run, later
+ echo $id >>$tmp.list
+ else
+ # oops
+ echo "$id - unknown test, ignored"
+ fi
+ fi
+ done
+ fi
+
+done
+
+if [ -s $tmp.list ]
+then
+ # found some valid test numbers ... this is good
+ :
+else
+ if $have_test_arg
+ then
+ # had test numbers, but none in group file ... do nothing
+ touch $tmp.list
+ else
+ # no test numbers, do everything from group file
+ sed -n -e '/^[0-9][0-9][0-9]*/s/[ ].*//p' <group >$tmp.list
+ fi
+fi
+
+# should be sort -n, but this did not work for Linux when this
+# was ported from IRIX
+#
+list=`sort $tmp.list`
+rm -f $tmp.list $tmp.tmp $tmp.sed
+
+if $randomize
+then
+ list=`echo $list | awk -f randomize.awk`
+fi
+case "$FSTYP" in
+ xfs)
+ [ "$XFS_LOGPRINT_PROG" = "" ] && _fatal "xfs_logprint not found"
+ [ "$XFS_REPAIR_PROG" = "" ] && _fatal "xfs_repair not found"
+ [ "$XFS_CHECK_PROG" = "" ] && _fatal "xfs_check not found"
+ [ "$XFS_DB_PROG" = "" ] && _fatal "xfs_db not found"
+ [ "$MKFS_XFS_PROG" = "" ] && _fatal "mkfs_xfs not found"
+ ;;
+ udf)
+ [ "$MKFS_UDF_PROG" = "" ] && _fatal "mkfs_udf/mkudffs not found"
+ ;;
+ btrfs)
+ [ "$MKFS_BTRFS_PROG" = "" ] && _fatal "mkfs.btrfs not found"
+ ;;
+ nfs)
+ ;;
+esac
# we need common.rc
if ! . ./common.rc
diff --git a/common b/common
deleted file mode 100644
index 78ac654..0000000
--- a/common
+++ /dev/null
@@ -1,334 +0,0 @@
-##/bin/bash
-#
-# Copyright (c) 2000-2005 Silicon Graphics, 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
-#
-#
-# common procedures for QA scripts
-#
-# $Header: /disk7/depot/linux/pcp/dev/qa/RCS/common,v 2.52 2000/04/05 18:24:51 kenmcd Exp $
-#
-
-_setenvironment()
-{
- MSGVERB="text:action"
- export MSGVERB
-}
-
-usage()
-{
- echo "Usage: $0 [options] [testlist]"'
-
-common options
- -v verbose
-
-check options
- -xfs test XFS (default)
- -udf test UDF
- -nfs test NFS
- -l line mode diff
- -xdiff graphical mode diff
- -udiff show unified diff (default)
- -n show me, do not run tests
- -q quick [deprecated]
- -T output timestamps
- -r randomize test order
- --large-fs optimise scratch device for large filesystems
-
-testlist options
- -g group[,group...] include tests from these groups
- -x group[,group...] exclude tests from these groups
- NNN include test NNN
- NNN-NNN include test range (eg. 012-021)
-'
- exit 0
-}
-
-here=`pwd`
-rm -f $here/$iam.out
-_setenvironment
-
-check=${check-true}
-
-diff="diff -u"
-verbose=false
-group=false
-xgroup=false
-showme=false
-sortme=false
-expunge=true
-have_test_arg=false
-randomize=false
-rm -f $tmp.list $tmp.tmp $tmp.sed
-
-# Autodetect fs type based on what's on $TEST_DEV
-if [ "$HOSTOS" == "Linux" ]
-then
- export FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
-else
- export FSTYP=xfs
-fi
-
-for r
-do
-
- if $group
- then
- # arg after -g
- group_list=$(sed -n < group \
- -e 's/#.*//' \
- -e 's/$/ /' \
- -e "/^[0-9][0-9][0-9].* $r /"'{ s/ .*//p }')
- if [ -z "$group_list" ]
- then
- echo "Group \"$r\" is empty or not defined?"
- exit 1
- fi
- [ ! -s $tmp.list ] && touch $tmp.list
- for t in $group_list
- do
- if grep -s "^$t\$" $tmp.list >/dev/null
- then
- :
- else
- echo "$t" >>$tmp.list
- fi
- done
- group=false
- continue
-
- elif $xgroup
- then
- # arg after -x
- [ ! -s $tmp.list ] && ls [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] >$tmp.list 2>/dev/null
- group_list=`sed -n <group -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{
-s/ .*//p
-}'`
- if [ -z "$group_list" ]
- then
- echo "Group \"$r\" is empty or not defined?"
- exit 1
- fi
- numsed=0
- rm -f $tmp.sed
- for t in $group_list
- do
- if [ $numsed -gt 100 ]
- then
- sed -f $tmp.sed <$tmp.list >$tmp.tmp
- mv $tmp.tmp $tmp.list
- numsed=0
- rm -f $tmp.sed
- fi
- echo "/^$t\$/d" >>$tmp.sed
- numsed=`expr $numsed + 1`
- done
- sed -f $tmp.sed <$tmp.list >$tmp.tmp
- mv $tmp.tmp $tmp.list
- xgroup=false
- continue
- fi
-
- xpand=true
- case "$r"
- in
-
- -\? | -h | --help) # usage
- usage
- ;;
-
- -udf) # -udf ... set FSTYP to udf
- FSTYP=udf
- xpand=false
- ;;
-
- -xfs) # -xfs ... set FSTYP to xfs
- FSTYP=xfs
- xpand=false
- ;;
-
- -nfs) # -nfs ... set FSTYP to nfs
- FSTYP=nfs
- xpand=false
- ;;
-
- -g) # -g group ... pick from group file
- group=true
- xpand=false
- ;;
-
- -l) # line mode for diff, was default before
- diff="diff"
- xpand=false
- ;;
-
- -xdiff) # graphical diff mode
- xpand=false
-
- if [ ! -z "$DISPLAY" ]
- then
- which xdiff >/dev/null 2>&1 && diff=xdiff
- which gdiff >/dev/null 2>&1 && diff=gdiff
- which tkdiff >/dev/null 2>&1 && diff=tkdiff
- which xxdiff >/dev/null 2>&1 && diff=xxdiff
- fi
- ;;
-
- -udiff) # show a unified diff, default now, keep for backward compat
- xpand=false
- diff="$diff -u"
- ;;
-
- -q) # "quick", no longer used - always quick :-)
- xpand=false
- ;;
-
- -n) # show me, don't do it
- showme=true
- xpand=false
- ;;
- -r) # randomize test order
- randomize=true
- xpand=false
- ;;
-
- -T) # turn on timestamp output
- timestamp=true
- xpand=false
- ;;
-
- -v)
- verbose=true
- xpand=false
- ;;
- -x) # -x group ... exclude from group file
- xgroup=true
- xpand=false
- ;;
- '[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]')
- echo "No tests?"
- status=1
- exit $status
- ;;
-
- [0-9]*-[0-9]*)
- eval `echo $r | sed -e 's/^/start=/' -e 's/-/ end=/'`
- ;;
-
- [0-9]*-)
- eval `echo $r | sed -e 's/^/start=/' -e 's/-//'`
- end=`echo [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] | sed -e 's/\[0-9]//g' -e 's/ *$//' -e 's/.* //'`
- if [ -z "$end" ]
- then
- echo "No tests in range \"$r\"?"
- status=1
- exit $status
- fi
- ;;
-
- --large-fs)
- export LARGE_SCRATCH_DEV=yes
- xpand=false
- ;;
-
- -*)
- usage
- ;;
-
- --extra-space=*)
- export SCRATCH_DEV_EMPTY_SPACE=${r#*=}
- xpand=false
- ;;
-
- *)
- start=$r
- end=$r
- ;;
-
- esac
-
- # get rid of leading 0s as can be interpreted as octal
- start=`echo $start | sed 's/^0*//'`
- end=`echo $end | sed 's/^0*//'`
-
- if $xpand
- then
- have_test_arg=true
- $AWK_PROG </dev/null '
-BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
- | while read id
- do
- if grep -s "^$id " group >/dev/null
- then
- # in group file ... OK
- echo $id >>$tmp.list
- else
- if [ -f expunged ] && $expunge && egrep "^$id([ ]|\$)" expunged >/dev/null
- then
- # expunged ... will be reported, but not run, later
- echo $id >>$tmp.list
- else
- # oops
- echo "$id - unknown test, ignored"
- fi
- fi
- done
- fi
-
-done
-
-if [ -s $tmp.list ]
-then
- # found some valid test numbers ... this is good
- :
-else
- if $have_test_arg
- then
- # had test numbers, but none in group file ... do nothing
- touch $tmp.list
- else
- # no test numbers, do everything from group file
- sed -n -e '/^[0-9][0-9][0-9]*/s/[ ].*//p' <group >$tmp.list
- fi
-fi
-
-# should be sort -n, but this did not work for Linux when this
-# was ported from IRIX
-#
-list=`sort $tmp.list`
-rm -f $tmp.list $tmp.tmp $tmp.sed
-
-if $randomize
-then
- list=`echo $list | awk -f randomize.awk`
-fi
-
-case "$FSTYP" in
- xfs)
- [ "$XFS_LOGPRINT_PROG" = "" ] && _fatal "xfs_logprint not found"
- [ "$XFS_REPAIR_PROG" = "" ] && _fatal "xfs_repair not found"
- [ "$XFS_CHECK_PROG" = "" ] && _fatal "xfs_check not found"
- [ "$XFS_DB_PROG" = "" ] && _fatal "xfs_db not found"
- [ "$MKFS_XFS_PROG" = "" ] && _fatal "mkfs_xfs not found"
- ;;
- udf)
- [ "$MKFS_UDF_PROG" = "" ] && _fatal "mkfs_udf/mkudffs not found"
- ;;
- btrfs)
- [ "$MKFS_BTRFS_PROG" = "" ] && _fatal "mkfs.btrfs not found"
- ;;
- nfs)
- ;;
-esac
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 06/18] xfstests: clean up and simply check CLI option parsing
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (4 preceding siblings ...)
2012-07-26 9:27 ` [PATCH 05/18] xfstests: fold common into check Dave Chinner
@ 2012-07-26 9:28 ` Dave Chinner
2012-08-28 19:52 ` Christoph Hellwig
2012-07-26 9:28 ` [PATCH 07/18] xfstests: kill hangcheck stuff from check Dave Chinner
` (13 subsequent siblings)
19 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:28 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
The option parise in a messy loop of option parsing and actions on
secondary arguments. Turn it into something much neater and esay to
understand rather than a mess of temporary variables and tortured
logic...
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
check | 414 ++++++++++++++++++++++---------------------------------------
common.rc | 19 +++
2 files changed, 169 insertions(+), 264 deletions(-)
diff --git a/check b/check
index bccdc08..df962ae 100755
--- a/check
+++ b/check
@@ -28,45 +28,35 @@ n_bad=0
bad=""
notrun=""
interrupt=true
+diff="diff -u"
+showme=false
+expunge=true
+have_test_arg=false
+randomize=false
+here=`pwd`
+FSTYP=xfs
-export QA_CHECK_FS=${QA_CHECK_FS:=true}
-
-# by default don't output timestamps
-timestamp=${TIMESTAMP:=false}
+SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
# generic initialization
iam=check
-# we need common.config
-if ! . ./common.config
-then
- echo "$iam: failed to source common.config"
- exit 1
-fi
+export QA_CHECK_FS=${QA_CHECK_FS:=true}
-# argument parsing first - currently very messy, needs cleanup.
-_setenvironment()
-{
- MSGVERB="text:action"
- export MSGVERB
-}
+# by default don't output timestamps
+timestamp=${TIMESTAMP:=false}
usage()
{
echo "Usage: $0 [options] [testlist]"'
-common options
- -v verbose
-
check options
-xfs test XFS (default)
-udf test UDF
-nfs test NFS
-l line mode diff
- -xdiff graphical mode diff
-udiff show unified diff (default)
-n show me, do not run tests
- -q quick [deprecated]
-T output timestamps
-r randomize test order
--large-fs optimise scratch device for large filesystems
@@ -80,258 +70,181 @@ testlist options
exit 0
}
-here=`pwd`
-rm -f $here/$iam.out
-_setenvironment
-
-check=${check-true}
+_setenvironment()
+{
+ MSGVERB="text:action"
+ export MSGVERB
+}
-diff="diff -u"
-verbose=false
-group=false
-xgroup=false
-showme=false
-sortme=false
-expunge=true
-have_test_arg=false
-randomize=false
-rm -f $tmp.list $tmp.tmp $tmp.sed
+get_group_list()
+{
+ grp=$1
-# Autodetect fs type based on what's on $TEST_DEV
-if [ "$HOSTOS" == "Linux" ]
-then
- export FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
-else
- export FSTYP=xfs
-fi
+ grpl=$(sed -n < group \
+ -e 's/#.*//' \
+ -e 's/$/ /' \
+ -e "/^[0-9][0-9][0-9].* $grp /"'{ s/ .*//p }')
+ echo $grpl
+}
-for r
-do
+expand_test_numbers()
+{
+ # strip leading zeros, could be considered octal.
+ start=`echo $1 | sed 's/^0*//'`
+ end=`echo $2 | sed 's/^0*//'`
- if $group
- then
- # arg after -g
- group_list=$(sed -n < group \
- -e 's/#.*//' \
- -e 's/$/ /' \
- -e "/^[0-9][0-9][0-9].* $r /"'{ s/ .*//p }')
- if [ -z "$group_list" ]
- then
- echo "Group \"$r\" is empty or not defined?"
- exit 1
- fi
- [ ! -s $tmp.list ] && touch $tmp.list
- for t in $group_list
+ $AWK_PROG </dev/null '
+BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
+ | while read id
do
- if grep -s "^$t\$" $tmp.list >/dev/null
- then
- :
- else
- echo "$t" >>$tmp.list
- fi
+ if grep -s "^$id " group >/dev/null ; then
+ # in group file ... OK
+ echo $id >>$tmp.list
+ elif [ -f expunged ] && $expunge && \
+ egrep "^$id([ ]|\$)" expunged >/dev/null ; then
+ # expunged ... will be reported, but not run, later
+ echo $id >>$tmp.list
+ else
+ # oops
+ echo "$id - unknown test, ignored"
+ fi
done
- group=false
- continue
+}
- elif $xgroup
- then
- # arg after -x
- [ ! -s $tmp.list ] && ls [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] >$tmp.list 2>/dev/null
- group_list=`sed -n <group -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{
-s/ .*//p
-}'`
- if [ -z "$group_list" ]
- then
- echo "Group \"$r\" is empty or not defined?"
- exit 1
- fi
- numsed=0
- rm -f $tmp.sed
- for t in $group_list
- do
- if [ $numsed -gt 100 ]
- then
- sed -f $tmp.sed <$tmp.list >$tmp.tmp
- mv $tmp.tmp $tmp.list
- numsed=0
- rm -f $tmp.sed
- fi
- echo "/^$t\$/d" >>$tmp.sed
- numsed=`expr $numsed + 1`
- done
- sed -f $tmp.sed <$tmp.list >$tmp.tmp
- mv $tmp.tmp $tmp.list
- xgroup=false
- continue
- fi
+_wallclock()
+{
+ date "+%H %M %S" | $AWK_PROG '{ print $1*3600 + $2*60 + $3 }'
+}
- xpand=true
- case "$r"
- in
+_timestamp()
+{
+ now=`date "+%T"`
+ echo -n " [$now]"
+}
- -\? | -h | --help) # usage
- usage
- ;;
+# start the initialisation work now
+_setenvironment
- -udf) # -udf ... set FSTYP to udf
- FSTYP=udf
- xpand=false
- ;;
+rm -f $tmp.list $tmp.tmp $tmp.sed $here/$iam.out
- -xfs) # -xfs ... set FSTYP to xfs
- FSTYP=xfs
- xpand=false
- ;;
+# Autodetect fs type based on what's on $TEST_DEV
+if [ "$HOSTOS" == "Linux" ]; then
+ FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
+fi
+export FSTYP
- -nfs) # -nfs ... set FSTYP to nfs
- FSTYP=nfs
- xpand=false
- ;;
+# we need common.config
+if ! . ./common.config
+then
+ echo "$iam: failed to source common.config"
+ exit 1
+fi
- -g) # -g group ... pick from group file
- group=true
- xpand=false
- ;;
+while [ $# -gt 0 ]; do
+ case "$1" in
+ -\? | -h | --help) usage ;;
- -l) # line mode for diff, was default before
- diff="diff"
- xpand=false
- ;;
+ -udf) FSTYP=udf ;;
+ -xfs) FSTYP=xfs ;;
+ -nfs) FSTYP=nfs ;;
- -xdiff) # graphical diff mode
- xpand=false
+ -g) group=$2 ; shift ;
+ group_list=$(get_group_list $group)
+ if [ -z "$group_list" ]; then
+ echo "Group \"$group\" is empty or not defined?"
+ exit 1
+ fi
- if [ ! -z "$DISPLAY" ]
- then
- which xdiff >/dev/null 2>&1 && diff=xdiff
- which gdiff >/dev/null 2>&1 && diff=gdiff
- which tkdiff >/dev/null 2>&1 && diff=tkdiff
- which xxdiff >/dev/null 2>&1 && diff=xxdiff
- fi
- ;;
-
- -udiff) # show a unified diff, default now, keep for backward compat
- xpand=false
- diff="$diff -u"
- ;;
-
- -q) # "quick", no longer used - always quick :-)
- xpand=false
- ;;
-
- -n) # show me, don't do it
- showme=true
- xpand=false
- ;;
- -r) # randomize test order
- randomize=true
- xpand=false
- ;;
-
- -T) # turn on timestamp output
- timestamp=true
- xpand=false
- ;;
-
- -v)
- verbose=true
- xpand=false
- ;;
- -x) # -x group ... exclude from group file
- xgroup=true
- xpand=false
- ;;
- '[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]')
- echo "No tests?"
- status=1
- exit $status
- ;;
+ [ ! -s $tmp.list ] && touch $tmp.list
+ for t in $group_list; do
+ grep -s "^$t\$" $tmp.list >/dev/null || \
+ echo "$t" >>$tmp.list
+ done
- [0-9]*-[0-9]*)
- eval `echo $r | sed -e 's/^/start=/' -e 's/-/ end=/'`
- ;;
+ ;;
- [0-9]*-)
- eval `echo $r | sed -e 's/^/start=/' -e 's/-//'`
- end=`echo [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] | sed -e 's/\[0-9]//g' -e 's/ *$//' -e 's/.* //'`
- if [ -z "$end" ]
- then
- echo "No tests in range \"$r\"?"
- status=1
- exit $status
- fi
- ;;
+ -x) xgroup=$2 ; shift ;
+ [ ! -s $tmp.list ] && ls $SUPPORTED_TESTS >$tmp.list 2>/dev/null
+ group_list=$(get_group_list $xgroup)
+ if [ -z "$group_list" ]; then
+ echo "Group \"$xgroup\" is empty or not defined?"
+ exit 1
+ fi
- --large-fs)
- export LARGE_SCRATCH_DEV=yes
- xpand=false
- ;;
+ rm -f $tmp.sed
+ numsed=0
+ for t in $group_list
+ do
+ if [ $numsed -gt 100 ]; then
+ sed -f $tmp.sed <$tmp.list >$tmp.tmp
+ mv $tmp.tmp $tmp.list
+ numsed=0
+ rm -f $tmp.sed
+ fi
+ echo "/^$t\$/d" >>$tmp.sed
+ numsed=`expr $numsed + 1`
+ done
+ sed -f $tmp.sed <$tmp.list >$tmp.tmp
+ mv $tmp.tmp $tmp.list
+ ;;
- -*)
- usage
- ;;
+ -l) diff="diff" ;;
+ -udiff) diff="$diff -u" ;;
- --extra-space=*)
- export SCRATCH_DEV_EMPTY_SPACE=${r#*=}
- xpand=false
- ;;
+ -n) showme=true ;;
+ -r) randomize=true ;;
- *)
- start=$r
- end=$r
- ;;
+ -T) timestamp=true ;;
- esac
+ "$SUPPORTED_TESTS")
+ echo "No tests?"
+ status=1
+ exit $status
+ ;;
- # get rid of leading 0s as can be interpreted as octal
- start=`echo $start | sed 's/^0*//'`
- end=`echo $end | sed 's/^0*//'`
+ [0-9]*-[0-9]*)
+ eval `echo $1 | sed -e 's/^/start=/' -e 's/-/ end=/'`
+ expand_test_numbers $start $end
+ have_test_arg=true
+ ;;
- if $xpand
- then
- have_test_arg=true
- $AWK_PROG </dev/null '
-BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
- | while read id
- do
- if grep -s "^$id " group >/dev/null
- then
- # in group file ... OK
- echo $id >>$tmp.list
- else
- if [ -f expunged ] && $expunge && egrep "^$id([ ]|\$)" expunged >/dev/null
- then
- # expunged ... will be reported, but not run, later
- echo $id >>$tmp.list
- else
- # oops
- echo "$id - unknown test, ignored"
+ [0-9]*-)
+ eval `echo $1 | sed -e 's/^/start=/' -e 's/-//'`
+ end=`echo $SUPPORTED_TESTS | sed -e 's/\[0-9]//g' -e 's/ *$//' -e 's/.* //'`
+ if [ -z "$end" ]; then
+ echo "No tests in range \"$1\"?"
+ status=1
+ exit $status
fi
- fi
- done
- fi
+ expand_test_numbers $start $end
+ have_test_arg=true
+ ;;
+
+ --large-fs) export LARGE_SCRATCH_DEV=yes ;;
+ --extra-space=*) export SCRATCH_DEV_EMPTY_SPACE=${r#*=} ;;
+ -*) usage ;;
+ *) expand_test_numbers $1 $1 ;
+ have_test_arg=true
+ ;;
+ esac
+
+ shift
done
-if [ -s $tmp.list ]
-then
+if [ -s $tmp.list ]; then
# found some valid test numbers ... this is good
:
-else
- if $have_test_arg
- then
+elif $have_test_arg; then
# had test numbers, but none in group file ... do nothing
touch $tmp.list
- else
+else
# no test numbers, do everything from group file
sed -n -e '/^[0-9][0-9][0-9]*/s/[ ].*//p' <group >$tmp.list
- fi
fi
-# should be sort -n, but this did not work for Linux when this
-# was ported from IRIX
-#
-list=`sort $tmp.list`
+# sort the list of tests into numeric order
+list=`sort -n $tmp.list`
rm -f $tmp.list $tmp.tmp $tmp.sed
if $randomize
@@ -339,24 +252,6 @@ then
list=`echo $list | awk -f randomize.awk`
fi
-case "$FSTYP" in
- xfs)
- [ "$XFS_LOGPRINT_PROG" = "" ] && _fatal "xfs_logprint not found"
- [ "$XFS_REPAIR_PROG" = "" ] && _fatal "xfs_repair not found"
- [ "$XFS_CHECK_PROG" = "" ] && _fatal "xfs_check not found"
- [ "$XFS_DB_PROG" = "" ] && _fatal "xfs_db not found"
- [ "$MKFS_XFS_PROG" = "" ] && _fatal "mkfs_xfs not found"
- ;;
- udf)
- [ "$MKFS_UDF_PROG" = "" ] && _fatal "mkfs_udf/mkudffs not found"
- ;;
- btrfs)
- [ "$MKFS_BTRFS_PROG" = "" ] && _fatal "mkfs.btrfs not found"
- ;;
- nfs)
- ;;
-esac
-
# we need common.rc
if ! . ./common.rc
then
@@ -370,16 +265,7 @@ then
exit 1
fi
-_wallclock()
-{
- date "+%H %M %S" | $AWK_PROG '{ print $1*3600 + $2*60 + $3 }'
-}
-
-_timestamp()
-{
- now=`date "+%T"`
- echo -n " [$now]"
-}
+# Ok, time to start running...
_wrapup()
{
diff --git a/common.rc b/common.rc
index 2ffff41..7d5a66d 100644
--- a/common.rc
+++ b/common.rc
@@ -161,6 +161,25 @@ then
fi
fi
+# check for correct setup
+case "$FSTYP" in
+ xfs)
+ [ "$XFS_LOGPRINT_PROG" = "" ] && _fatal "xfs_logprint not found"
+ [ "$XFS_REPAIR_PROG" = "" ] && _fatal "xfs_repair not found"
+ [ "$XFS_CHECK_PROG" = "" ] && _fatal "xfs_check not found"
+ [ "$XFS_DB_PROG" = "" ] && _fatal "xfs_db not found"
+ [ "$MKFS_XFS_PROG" = "" ] && _fatal "mkfs_xfs not found"
+ ;;
+ udf)
+ [ "$MKFS_UDF_PROG" = "" ] && _fatal "mkfs_udf/mkudffs not found"
+ ;;
+ btrfs)
+ [ "$MKFS_BTRFS_PROG" = "" ] && _fatal "mkfs.btrfs not found"
+ ;;
+ nfs)
+ ;;
+esac
+
# make sure we have a standard umask
umask 022
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 07/18] xfstests: kill hangcheck stuff from check
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (5 preceding siblings ...)
2012-07-26 9:28 ` [PATCH 06/18] xfstests: clean up and simply check CLI option parsing Dave Chinner
@ 2012-07-26 9:28 ` Dave Chinner
2012-08-28 19:53 ` Christoph Hellwig
2012-07-26 9:28 ` [PATCH 08/18] xfstests: remove test expunge file support Dave Chinner
` (12 subsequent siblings)
19 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:28 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
This is an old script from the auto-qa days back at SGI. It no
longer is in use or, AFAIK, ever been used for xfstests. If anyone
needs it, they can pull it back out of git, so lets remove it to
simplify check.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
check | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/check b/check
index df962ae..2012f17 100755
--- a/check
+++ b/check
@@ -269,12 +269,6 @@ fi
_wrapup()
{
- # for hangcheck ...
- # remove files that were used by hangcheck
- #
- [ -f /tmp/check.pid ] && rm -rf /tmp/check.pid
- [ -f /tmp/check.sts ] && rm -rf /tmp/check.sts
-
if $showme
then
:
@@ -330,27 +324,11 @@ END { if (NR > 0) {
fi
rm -f /tmp/*.rawout /tmp/*.out /tmp/*.err /tmp/*.time
- rm -f /tmp/check.pid /tmp/check.sts
rm -f $tmp.*
}
trap "_wrapup; exit \$status" 0 1 2 3 15
-# for hangcheck ...
-# Save pid of check in a well known place, so that hangcheck can be sure it
-# has the right pid (getting the pid from ps output is not reliable enough).
-#
-rm -rf /tmp/check.pid
-echo $$ >/tmp/check.pid
-
-# for hangcheck ...
-# Save the status of check in a well known place, so that hangcheck can be
-# sure to know where check is up to (getting test number from ps output is
-# not reliable enough since the trace stuff has been introduced).
-#
-rm -rf /tmp/check.sts
-echo "preamble" >/tmp/check.sts
-
# don't leave old full output behind on a clean run
rm -f check.full
@@ -430,9 +408,6 @@ do
fi
rm -f core $seq.notrun
- # for hangcheck ...
- echo "$seq" >/tmp/check.sts
-
start=`_wallclock`
$timestamp && echo -n " ["`date "+%T"`"]"
[ ! -x $seq ] && chmod u+x $seq # ensure we can run it
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 08/18] xfstests: remove test expunge file support
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (6 preceding siblings ...)
2012-07-26 9:28 ` [PATCH 07/18] xfstests: kill hangcheck stuff from check Dave Chinner
@ 2012-07-26 9:28 ` Dave Chinner
2012-08-28 19:54 ` Christoph Hellwig
2012-07-26 9:28 ` [PATCH 09/18] xfstests: remove undocumented TESTS_REMAINING_LOG Dave Chinner
` (11 subsequent siblings)
19 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:28 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
Check supports an expunge file for tests - a way of marking tests
not to run even if you specify it to run. Use is like this:
$ echo 002 > expunged
test-2:~/src/xfstests-dev$ sudo ./check 001-003
FSTYP -- xfs (debug)
PLATFORM -- Linux/x86_64 test-2 3.5.0-rc1-dgc+
MKFS_OPTIONS -- -f -bsize=4096 /dev/vdb
MOUNT_OPTIONS -- /dev/vdb /mnt/scratch
001 4s ... 4s
002 - expunged
003 0s ... 0s
Ran: 001 002 003
Not run:1
Passed all 2 tests
This is arguably useful(*), but gets in the way of splitting up the
tests into multiple directories. Remove it for now, but such
functionality should be considered for re-implementation at a later
date.
(*) e.g. having a different "expunged" file for each distro release
you have to test to avoid the tests known to fail due to fixes or
features that will never be back ported to older releases....
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
check | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/check b/check
index 2012f17..a56f6ed 100755
--- a/check
+++ b/check
@@ -30,7 +30,6 @@ notrun=""
interrupt=true
diff="diff -u"
showme=false
-expunge=true
have_test_arg=false
randomize=false
here=`pwd`
@@ -100,10 +99,6 @@ BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
if grep -s "^$id " group >/dev/null ; then
# in group file ... OK
echo $id >>$tmp.list
- elif [ -f expunged ] && $expunge && \
- egrep "^$id([ ]|\$)" expunged >/dev/null ; then
- # expunged ... will be reported, but not run, later
- echo $id >>$tmp.list
else
# oops
echo "$id - unknown test, ignored"
@@ -287,13 +282,6 @@ END { if (NR > 0) {
mv $tmp.out check.time
fi
- if [ -f $tmp.expunged ]
- then
- notrun=`wc -l <$tmp.expunged | sed -e 's/ *//g'`
- n_try=`expr $n_try - $notrun`
- list=`echo "$list" | sed -f $tmp.expunged`
- fi
-
echo "" >>check.log
date >>check.log
echo $list | fmt | sed -e 's/^/ /' >>check.log
@@ -387,15 +375,9 @@ do
then
echo
continue
- elif [ -f expunged ] && $expunge && egrep "^$seq([ ]|\$)" expunged >/dev/null
- then
- echo " - expunged"
- rm -f $seq.out.bad
- echo "/^$seq\$/d" >>$tmp.expunged
elif [ ! -f $seq ]
then
echo " - no such test?"
- echo "/^$seq\$/d" >>$tmp.expunged
else
# really going to try and run this one
#
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 09/18] xfstests: remove undocumented TESTS_REMAINING_LOG
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (7 preceding siblings ...)
2012-07-26 9:28 ` [PATCH 08/18] xfstests: remove test expunge file support Dave Chinner
@ 2012-07-26 9:28 ` Dave Chinner
2012-08-28 19:54 ` Christoph Hellwig
2012-07-26 9:28 ` [PATCH 10/18] xfstests: include test subdirectory support Dave Chinner
` (10 subsequent siblings)
19 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:28 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
Undocumented and unused, AFAICT. Kill it.
Reviewed-by: Dave Chinner <dchinner@redhat.com>
---
check | 7 -------
1 file changed, 7 deletions(-)
diff --git a/check b/check
index a56f6ed..d6dccb5 100755
--- a/check
+++ b/check
@@ -359,17 +359,10 @@ fi
seq="check"
_check_test_fs
-[ -n "$TESTS_REMAINING_LOG" ] && echo $list > $TESTS_REMAINING_LOG
-
for seq in $list
do
err=false
echo -n "$seq"
- if [ -n "$TESTS_REMAINING_LOG" ] ; then
- sed -e "s/$seq//" -e 's/ / /' -e 's/^ *//' $TESTS_REMAINING_LOG > $TESTS_REMAINING_LOG.tmp
- mv $TESTS_REMAINING_LOG.tmp $TESTS_REMAINING_LOG
- sync
- fi
if $showme
then
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 10/18] xfstests: include test subdirectory support
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (8 preceding siblings ...)
2012-07-26 9:28 ` [PATCH 09/18] xfstests: remove undocumented TESTS_REMAINING_LOG Dave Chinner
@ 2012-07-26 9:28 ` Dave Chinner
2012-07-26 9:28 ` [PATCH 11/18] xfstests: move generic tests out of top level dir Dave Chinner
` (9 subsequent siblings)
19 siblings, 0 replies; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:28 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
Create a specific tests/ subdirectory to hold all the tests so they
are no longer need to be in the top level directory. This patch does
not move any tests there, however, and that will be done in
subsequent commits.
The tests/ subdir will have it's own subdirectories for different
classes of tests. Initially, there will be a per-FSTYP subdirectory
for filesytsem specific tests, and a generic directory for tests
that span multiple filesystems.
Each class will have it's own group file to indicate what groups the
tests belong to, and these will be parsed appropriately by the high
level check script to build the test list.
The change in parsing results in the test output also emitting the
path to the test as well as the name of the test, instead of just a
raw number. This allows duplicate test names in the sudirecotries to
be unambiguous when the summary is written out.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
check | 43 ++++++++++++++++++++++++++++---------------
tests/generic/group | 5 +++++
2 files changed, 33 insertions(+), 15 deletions(-)
create mode 100644 tests/generic/group
diff --git a/check b/check
index d6dccb5..bdf764a 100755
--- a/check
+++ b/check
@@ -36,6 +36,8 @@ here=`pwd`
FSTYP=xfs
SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
+TEST_GROUP_DIR="tests"
+GENERIC_GROUP_DIR="$TEST_GROUP_DIR/generic"
# generic initialization
iam=check
@@ -78,11 +80,15 @@ _setenvironment()
get_group_list()
{
grp=$1
-
- grpl=$(sed -n < group \
- -e 's/#.*//' \
- -e 's/$/ /' \
- -e "/^[0-9][0-9][0-9].* $grp /"'{ s/ .*//p }')
+ dirs=". $GENERIC_GROUP_DIR"
+
+ for d in $dirs; do
+ l=$(sed -n < $d/group \
+ -e 's/#.*//' \
+ -e 's/$/ /' \
+ -e "s;\(^[0-9][0-9][0-9]\).* $grp .*;$d/\1;p")
+ grpl="$grpl $l"
+ done
echo $grpl
}
@@ -284,7 +290,7 @@ END { if (NR > 0) {
echo "" >>check.log
date >>check.log
- echo $list | fmt | sed -e 's/^/ /' >>check.log
+ echo $list | fmt | sed -e 's/^/ /' -e 's;tests/;;g' >>check.log
$interrupt && echo "Interrupted!" >>check.log
if [ ! -z "$n_try" -a $n_try != 0 ]
@@ -362,7 +368,12 @@ _check_test_fs
for seq in $list
do
err=false
- echo -n "$seq"
+
+ # the filename for the test and the name output are different.
+ # we don't include the tests/ directory in the name output.
+ seqnum=`echo $seq | sed -e 's;tests/;;'`
+
+ echo -n "$seqnum"
if $showme
then
@@ -375,7 +386,9 @@ do
# really going to try and run this one
#
rm -f $seq.out.bad
- lasttime=`sed -n -e "/^$seq /s/.* //p" <check.time`
+
+ # slashes now in names, sed barfs on them so use grep
+ lasttime=`grep -w ^$seq check.time | awk '// {print $2}'`
if [ "X$lasttime" != X ]; then
echo -n " ${lasttime}s ..."
else
@@ -386,7 +399,7 @@ do
start=`_wallclock`
$timestamp && echo -n " ["`date "+%T"`"]"
[ ! -x $seq ] && chmod u+x $seq # ensure we can run it
- [ -x /usr/bin/logger ] && /usr/bin/logger "run xfstest $seq"
+ [ -x /usr/bin/logger ] && /usr/bin/logger "run xfstest $seqnum"
./$seq >$tmp.rawout 2>&1
sts=$?
$timestamp && _timestamp
@@ -405,9 +418,9 @@ do
if [ -f $seq.notrun ]
then
$timestamp || echo -n " [not run] "
- $timestamp && echo " [not run]" && echo -n " $seq -- "
+ $timestamp && echo " [not run]" && echo -n " $seqnum -- "
cat $seq.notrun
- notrun="$notrun $seq"
+ notrun="$notrun $seqnum"
else
if [ $sts -ne 0 ]
then
@@ -425,7 +438,7 @@ do
then
:
else
- echo "$seq `expr $stop - $start`" >>$tmp.time
+ echo "$seqnum `expr $stop - $start`" >>$tmp.time
echo -n " `expr $stop - $start`s"
fi
echo ""
@@ -444,18 +457,18 @@ do
#
if $err
then
- bad="$bad $seq"
+ bad="$bad $seqnum"
n_bad=`expr $n_bad + 1`
quick=false
fi
if [ ! -f $seq.notrun ]
then
- try="$try $seq"
+ try="$try $seqnum"
n_try=`expr $n_try + 1`
_check_test_fs
fi
- seq="after_$seq"
+ seq="after_$seqnum"
done
interrupt=false
diff --git a/tests/generic/group b/tests/generic/group
new file mode 100644
index 0000000..4e01f0c
--- /dev/null
+++ b/tests/generic/group
@@ -0,0 +1,5 @@
+# QA groups control file
+# Defines test groups and nominal group owners
+# - do not start group names with a digit
+# - comment line before each group is "new" description
+#
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 11/18] xfstests: move generic tests out of top level dir
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (9 preceding siblings ...)
2012-07-26 9:28 ` [PATCH 10/18] xfstests: include test subdirectory support Dave Chinner
@ 2012-07-26 9:28 ` Dave Chinner
2012-07-26 9:28 ` [PATCH 12/18] xfstests: move xfs specific tests out of top directory Dave Chinner
` (8 subsequent siblings)
19 siblings, 0 replies; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:28 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
And into tests/generic. Tests were found simply by grepping for the
__supported_fs field in the tests.
Output starts to look like:
$ sudo ./check -g quick -r
FSTYP -- xfs (debug)
PLATFORM -- Linux/x86_64 test-1 3.5.0-rc5-dgc+
MKFS_OPTIONS -- -f -bsize=4096 /dev/vdb
MOUNT_OPTIONS -- /dev/vdb /mnt/scratch
./242 1s
./183 2s
generic/236 1s
generic/014 1s
generic/258 0s
./096 1s
generic/245 0s
^C
Ran: ./242 ./183 generic/236 generic/014 generic/258 ./096 generic/245
Passed all 7 tests
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
group | 98 --------------------------
001 => tests/generic/001 | 0
001.out => tests/generic/001.out | 0
002 => tests/generic/002 | 0
002.out => tests/generic/002.out | 0
005 => tests/generic/005 | 0
005.out => tests/generic/005.out | 0
006 => tests/generic/006 | 0
006.out => tests/generic/006.out | 0
007 => tests/generic/007 | 0
007.out => tests/generic/007.out | 0
010 => tests/generic/010 | 0
010.out => tests/generic/010.out | 0
011 => tests/generic/011 | 0
011.out => tests/generic/011.out | 0
013 => tests/generic/013 | 0
013.out => tests/generic/013.out | 0
014 => tests/generic/014 | 0
014.out => tests/generic/014.out | 0
015 => tests/generic/015 | 0
015.out => tests/generic/015.out | 0
020 => tests/generic/020 | 0
020.out => tests/generic/020.out | 0
053 => tests/generic/053 | 0
053.out => tests/generic/053.out | 0
062 => tests/generic/062 | 0
062.out => tests/generic/062.out | 0
069 => tests/generic/069 | 0
069.out => tests/generic/069.out | 0
070 => tests/generic/070 | 0
070.out => tests/generic/070.out | 0
074 => tests/generic/074 | 0
074.out => tests/generic/074.out | 0
075 => tests/generic/075 | 0
075.out => tests/generic/075.out | 0
076 => tests/generic/076 | 0
076.out => tests/generic/076.out | 0
077 => tests/generic/077 | 0
077.out => tests/generic/077.out | 0
079 => tests/generic/079 | 0
079.out => tests/generic/079.out | 0
083 => tests/generic/083 | 0
083.out => tests/generic/083.out | 0
088 => tests/generic/088 | 0
088.out.irix => tests/generic/088.out.irix | 0
088.out.linux => tests/generic/088.out.linux | 0
089 => tests/generic/089 | 0
089.out => tests/generic/089.out | 0
091 => tests/generic/091 | 0
091.out => tests/generic/091.out | 0
093 => tests/generic/093 | 0
093.out => tests/generic/093.out | Bin 917 -> 917 bytes
097 => tests/generic/097 | 0
097.out.udf => tests/generic/097.out.udf | 0
097.out.xfs => tests/generic/097.out.xfs | 0
099 => tests/generic/099 | 0
099.out => tests/generic/099.out | 0
100 => tests/generic/100 | 0
100.out => tests/generic/100.out | 0
105 => tests/generic/105 | 0
105.out => tests/generic/105.out | 0
112 => tests/generic/112 | 0
112.out => tests/generic/112.out | 0
113 => tests/generic/113 | 0
113.out => tests/generic/113.out | 0
117 => tests/generic/117 | 0
117.out => tests/generic/117.out | 0
120 => tests/generic/120 | 0
120.out => tests/generic/120.out | 0
123 => tests/generic/123 | 0
123.out => tests/generic/123.out | 0
124 => tests/generic/124 | 0
124.out => tests/generic/124.out | 0
125 => tests/generic/125 | 0
125.out => tests/generic/125.out | 0
126 => tests/generic/126 | 0
126.out => tests/generic/126.out | 0
127 => tests/generic/127 | 0
127.out => tests/generic/127.out | 0
128 => tests/generic/128 | 0
128.out => tests/generic/128.out | 0
129 => tests/generic/129 | 0
129.out => tests/generic/129.out | 0
130 => tests/generic/130 | 0
130.out => tests/generic/130.out | 0
131 => tests/generic/131 | 0
131.out => tests/generic/131.out | 0
132 => tests/generic/132 | 0
132.out => tests/generic/132.out | 0
133 => tests/generic/133 | 0
133.out => tests/generic/133.out | 0
135 => tests/generic/135 | 0
135.out => tests/generic/135.out | 0
141 => tests/generic/141 | 0
141.out => tests/generic/141.out | 0
169 => tests/generic/169 | 0
169.out => tests/generic/169.out | 0
184 => tests/generic/184 | 0
184.out => tests/generic/184.out | 0
192 => tests/generic/192 | 0
192.out => tests/generic/192.out | 0
193 => tests/generic/193 | 0
193.out => tests/generic/193.out | 0
198 => tests/generic/198 | 0
198.out => tests/generic/198.out | 0
204 => tests/generic/204 | 0
204.out => tests/generic/204.out | 0
207 => tests/generic/207 | 0
207.out => tests/generic/207.out | 0
208 => tests/generic/208 | 0
208.out => tests/generic/208.out | 0
209 => tests/generic/209 | 0
209.out => tests/generic/209.out | 0
210 => tests/generic/210 | 0
210.out => tests/generic/210.out | 0
211 => tests/generic/211 | 0
211.out => tests/generic/211.out | 0
212 => tests/generic/212 | 0
212.out => tests/generic/212.out | 0
213 => tests/generic/213 | 0
213.out => tests/generic/213.out | 0
214 => tests/generic/214 | 0
214.out => tests/generic/214.out | 0
215 => tests/generic/215 | 0
215.out => tests/generic/215.out | 0
219 => tests/generic/219 | 0
219.out => tests/generic/219.out | 0
221 => tests/generic/221 | 0
221.out => tests/generic/221.out | 0
223 => tests/generic/223 | 0
223.out => tests/generic/223.out | 0
224 => tests/generic/224 | 0
224.out => tests/generic/224.out | 0
225 => tests/generic/225 | 0
225.out => tests/generic/225.out | 0
226 => tests/generic/226 | 0
226.out => tests/generic/226.out | 0
228 => tests/generic/228 | 0
228.out => tests/generic/228.out | 0
230 => tests/generic/230 | 0
230.out => tests/generic/230.out | 0
231 => tests/generic/231 | 0
231.out => tests/generic/231.out | 0
232 => tests/generic/232 | 0
232.out => tests/generic/232.out | 0
233 => tests/generic/233 | 0
233.out => tests/generic/233.out | 0
234 => tests/generic/234 | 0
234.out => tests/generic/234.out | 0
235 => tests/generic/235 | 0
235.out => tests/generic/235.out | 0
236 => tests/generic/236 | 0
236.out => tests/generic/236.out | 0
237 => tests/generic/237 | 0
237.out => tests/generic/237.out | 0
239 => tests/generic/239 | 0
239.out => tests/generic/239.out | 0
240 => tests/generic/240 | 0
240.out => tests/generic/240.out | 0
241 => tests/generic/241 | 0
241.out => tests/generic/241.out | 0
245 => tests/generic/245 | 0
245.out => tests/generic/245.out | 0
246 => tests/generic/246 | 0
246.out => tests/generic/246.out | 0
247 => tests/generic/247 | 0
247.out => tests/generic/247.out | 0
248 => tests/generic/248 | 0
248.out => tests/generic/248.out | 0
249 => tests/generic/249 | 0
249.out => tests/generic/249.out | 0
251 => tests/generic/251 | 0
251.out => tests/generic/251.out | 0
255 => tests/generic/255 | 0
255.out => tests/generic/255.out | 0
256 => tests/generic/256 | 0
256.out => tests/generic/256.out | 0
257 => tests/generic/257 | 0
257.out => tests/generic/257.out | 0
258 => tests/generic/258 | 0
258.out => tests/generic/258.out | 0
260 => tests/generic/260 | 0
260.out => tests/generic/260.out | 0
263 => tests/generic/263 | 0
263.out => tests/generic/263.out | 0
269 => tests/generic/269 | 0
269.out => tests/generic/269.out | 0
270 => tests/generic/270 | 0
270.out => tests/generic/270.out | 0
273 => tests/generic/273 | 0
273.out => tests/generic/273.out | 0
274 => tests/generic/274 | 0
274.out => tests/generic/274.out | 0
275 => tests/generic/275 | 0
275.out => tests/generic/275.out | 0
277 => tests/generic/277 | 0
277.out => tests/generic/277.out | 0
280 => tests/generic/280 | 0
280.out => tests/generic/280.out | 0
tests/generic/group | 98 ++++++++++++++++++++++++++
200 files changed, 98 insertions(+), 98 deletions(-)
rename 001 => tests/generic/001 (100%)
rename 001.out => tests/generic/001.out (100%)
rename 002 => tests/generic/002 (100%)
rename 002.out => tests/generic/002.out (100%)
rename 005 => tests/generic/005 (100%)
rename 005.out => tests/generic/005.out (100%)
rename 006 => tests/generic/006 (100%)
rename 006.out => tests/generic/006.out (100%)
rename 007 => tests/generic/007 (100%)
rename 007.out => tests/generic/007.out (100%)
rename 010 => tests/generic/010 (100%)
rename 010.out => tests/generic/010.out (100%)
rename 011 => tests/generic/011 (100%)
rename 011.out => tests/generic/011.out (100%)
rename 013 => tests/generic/013 (100%)
rename 013.out => tests/generic/013.out (100%)
rename 014 => tests/generic/014 (100%)
rename 014.out => tests/generic/014.out (100%)
rename 015 => tests/generic/015 (100%)
rename 015.out => tests/generic/015.out (100%)
rename 020 => tests/generic/020 (100%)
rename 020.out => tests/generic/020.out (100%)
rename 053 => tests/generic/053 (100%)
rename 053.out => tests/generic/053.out (100%)
rename 062 => tests/generic/062 (100%)
rename 062.out => tests/generic/062.out (100%)
rename 069 => tests/generic/069 (100%)
rename 069.out => tests/generic/069.out (100%)
rename 070 => tests/generic/070 (100%)
rename 070.out => tests/generic/070.out (100%)
rename 074 => tests/generic/074 (100%)
rename 074.out => tests/generic/074.out (100%)
rename 075 => tests/generic/075 (100%)
rename 075.out => tests/generic/075.out (100%)
rename 076 => tests/generic/076 (100%)
rename 076.out => tests/generic/076.out (100%)
rename 077 => tests/generic/077 (100%)
rename 077.out => tests/generic/077.out (100%)
rename 079 => tests/generic/079 (100%)
rename 079.out => tests/generic/079.out (100%)
rename 083 => tests/generic/083 (100%)
rename 083.out => tests/generic/083.out (100%)
rename 088 => tests/generic/088 (100%)
rename 088.out.irix => tests/generic/088.out.irix (100%)
rename 088.out.linux => tests/generic/088.out.linux (100%)
rename 089 => tests/generic/089 (100%)
rename 089.out => tests/generic/089.out (100%)
rename 091 => tests/generic/091 (100%)
rename 091.out => tests/generic/091.out (100%)
rename 093 => tests/generic/093 (100%)
rename 093.out => tests/generic/093.out (100%)
rename 097 => tests/generic/097 (100%)
rename 097.out.udf => tests/generic/097.out.udf (100%)
rename 097.out.xfs => tests/generic/097.out.xfs (100%)
rename 099 => tests/generic/099 (100%)
rename 099.out => tests/generic/099.out (100%)
rename 100 => tests/generic/100 (100%)
rename 100.out => tests/generic/100.out (100%)
rename 105 => tests/generic/105 (100%)
rename 105.out => tests/generic/105.out (100%)
rename 112 => tests/generic/112 (100%)
rename 112.out => tests/generic/112.out (100%)
rename 113 => tests/generic/113 (100%)
rename 113.out => tests/generic/113.out (100%)
rename 117 => tests/generic/117 (100%)
rename 117.out => tests/generic/117.out (100%)
rename 120 => tests/generic/120 (100%)
rename 120.out => tests/generic/120.out (100%)
rename 123 => tests/generic/123 (100%)
rename 123.out => tests/generic/123.out (100%)
rename 124 => tests/generic/124 (100%)
rename 124.out => tests/generic/124.out (100%)
rename 125 => tests/generic/125 (100%)
rename 125.out => tests/generic/125.out (100%)
rename 126 => tests/generic/126 (100%)
rename 126.out => tests/generic/126.out (100%)
rename 127 => tests/generic/127 (100%)
rename 127.out => tests/generic/127.out (100%)
rename 128 => tests/generic/128 (100%)
rename 128.out => tests/generic/128.out (100%)
rename 129 => tests/generic/129 (100%)
rename 129.out => tests/generic/129.out (100%)
rename 130 => tests/generic/130 (100%)
rename 130.out => tests/generic/130.out (100%)
rename 131 => tests/generic/131 (100%)
rename 131.out => tests/generic/131.out (100%)
rename 132 => tests/generic/132 (100%)
rename 132.out => tests/generic/132.out (100%)
rename 133 => tests/generic/133 (100%)
rename 133.out => tests/generic/133.out (100%)
rename 135 => tests/generic/135 (100%)
rename 135.out => tests/generic/135.out (100%)
rename 141 => tests/generic/141 (100%)
rename 141.out => tests/generic/141.out (100%)
rename 169 => tests/generic/169 (100%)
rename 169.out => tests/generic/169.out (100%)
rename 184 => tests/generic/184 (100%)
rename 184.out => tests/generic/184.out (100%)
rename 192 => tests/generic/192 (100%)
rename 192.out => tests/generic/192.out (100%)
rename 193 => tests/generic/193 (100%)
rename 193.out => tests/generic/193.out (100%)
rename 198 => tests/generic/198 (100%)
rename 198.out => tests/generic/198.out (100%)
rename 204 => tests/generic/204 (100%)
rename 204.out => tests/generic/204.out (100%)
rename 207 => tests/generic/207 (100%)
rename 207.out => tests/generic/207.out (100%)
rename 208 => tests/generic/208 (100%)
rename 208.out => tests/generic/208.out (100%)
rename 209 => tests/generic/209 (100%)
rename 209.out => tests/generic/209.out (100%)
rename 210 => tests/generic/210 (100%)
rename 210.out => tests/generic/210.out (100%)
rename 211 => tests/generic/211 (100%)
rename 211.out => tests/generic/211.out (100%)
rename 212 => tests/generic/212 (100%)
rename 212.out => tests/generic/212.out (100%)
rename 213 => tests/generic/213 (100%)
rename 213.out => tests/generic/213.out (100%)
rename 214 => tests/generic/214 (100%)
rename 214.out => tests/generic/214.out (100%)
rename 215 => tests/generic/215 (100%)
rename 215.out => tests/generic/215.out (100%)
rename 219 => tests/generic/219 (100%)
rename 219.out => tests/generic/219.out (100%)
rename 221 => tests/generic/221 (100%)
rename 221.out => tests/generic/221.out (100%)
rename 223 => tests/generic/223 (100%)
rename 223.out => tests/generic/223.out (100%)
rename 224 => tests/generic/224 (100%)
rename 224.out => tests/generic/224.out (100%)
rename 225 => tests/generic/225 (100%)
rename 225.out => tests/generic/225.out (100%)
rename 226 => tests/generic/226 (100%)
rename 226.out => tests/generic/226.out (100%)
rename 228 => tests/generic/228 (100%)
rename 228.out => tests/generic/228.out (100%)
rename 230 => tests/generic/230 (100%)
rename 230.out => tests/generic/230.out (100%)
rename 231 => tests/generic/231 (100%)
rename 231.out => tests/generic/231.out (100%)
rename 232 => tests/generic/232 (100%)
rename 232.out => tests/generic/232.out (100%)
rename 233 => tests/generic/233 (100%)
rename 233.out => tests/generic/233.out (100%)
rename 234 => tests/generic/234 (100%)
rename 234.out => tests/generic/234.out (100%)
rename 235 => tests/generic/235 (100%)
rename 235.out => tests/generic/235.out (100%)
rename 236 => tests/generic/236 (100%)
rename 236.out => tests/generic/236.out (100%)
rename 237 => tests/generic/237 (100%)
rename 237.out => tests/generic/237.out (100%)
rename 239 => tests/generic/239 (100%)
rename 239.out => tests/generic/239.out (100%)
rename 240 => tests/generic/240 (100%)
rename 240.out => tests/generic/240.out (100%)
rename 241 => tests/generic/241 (100%)
rename 241.out => tests/generic/241.out (100%)
rename 245 => tests/generic/245 (100%)
rename 245.out => tests/generic/245.out (100%)
rename 246 => tests/generic/246 (100%)
rename 246.out => tests/generic/246.out (100%)
rename 247 => tests/generic/247 (100%)
rename 247.out => tests/generic/247.out (100%)
rename 248 => tests/generic/248 (100%)
rename 248.out => tests/generic/248.out (100%)
rename 249 => tests/generic/249 (100%)
rename 249.out => tests/generic/249.out (100%)
rename 251 => tests/generic/251 (100%)
rename 251.out => tests/generic/251.out (100%)
rename 255 => tests/generic/255 (100%)
rename 255.out => tests/generic/255.out (100%)
rename 256 => tests/generic/256 (100%)
rename 256.out => tests/generic/256.out (100%)
rename 257 => tests/generic/257 (100%)
rename 257.out => tests/generic/257.out (100%)
rename 258 => tests/generic/258 (100%)
rename 258.out => tests/generic/258.out (100%)
rename 260 => tests/generic/260 (100%)
rename 260.out => tests/generic/260.out (100%)
rename 263 => tests/generic/263 (100%)
rename 263.out => tests/generic/263.out (100%)
rename 269 => tests/generic/269 (100%)
rename 269.out => tests/generic/269.out (100%)
rename 270 => tests/generic/270 (100%)
rename 270.out => tests/generic/270.out (100%)
rename 273 => tests/generic/273 (100%)
rename 273.out => tests/generic/273.out (100%)
rename 274 => tests/generic/274 (100%)
rename 274.out => tests/generic/274.out (100%)
rename 275 => tests/generic/275 (100%)
rename 275.out => tests/generic/275.out (100%)
rename 277 => tests/generic/277 (100%)
rename 277.out => tests/generic/277.out (100%)
rename 280 => tests/generic/280 (100%)
rename 280.out => tests/generic/280.out (100%)
diff --git a/group b/group
index 538e10d..acde48e 100644
--- a/group
+++ b/group
@@ -116,26 +116,15 @@ deprecated
#
# test-group association ... one line per test
#
-001 rw dir udf auto quick
-002 metadata udf auto quick
003 db auto quick
004 db auto quick
-005 dir udf auto quick
-006 dir udf auto quick
-007 dir udf auto quick
008 rw ioctl auto quick
009 rw ioctl auto prealloc quick
-010 other udf auto
-011 dir udf auto quick
012 rw auto quick
-013 other ioctl udf auto quick
-014 rw udf auto quick
-015 other auto quick
016 rw auto quick
017 mount auto quick
018 deprecated # log logprint v2log
019 mkfs auto quick
-020 metadata attr udf auto quick
021 db attr auto quick
022 dump ioctl tape
023 dump ioctl tape
@@ -168,7 +157,6 @@ deprecated
050 quota auto quick
051 acl udf auto quick
052 quota db auto quick
-053 acl repair auto quick
054 quota auto quick
055 dump ioctl remote tape
056 dump ioctl auto quick
@@ -177,86 +165,52 @@ deprecated
059 dump ioctl auto quick
060 dump ioctl auto quick
061 dump ioctl auto quick
-062 attr udf auto quick
063 dump attr auto quick
064 dump auto
065 dump auto
066 dump ioctl auto quick
067 acl attr auto quick
068 other auto freeze dangerous
-069 rw udf auto quick
-070 attr udf auto quick
071 rw auto
072 rw auto prealloc quick
073 copy auto
-074 rw udf auto
-075 rw udf auto quick
-076 metadata rw udf auto quick
-077 acl attr auto enospc
078 growfs auto quick
-079 acl attr ioctl metadata auto quick
080 rw ioctl
081 deprecated # log logprint quota
082 deprecated # log logprint v2log
-083 rw auto
084 ioctl rw auto
085 log auto quick
086 log v2log auto
087 log v2log auto quota
-088 perms auto quick
-089 metadata auto
090 rw auto
-091 rw auto quick
092 other auto quick
-093 attr cap udf auto
094 metadata dir ioctl auto
095 log v2log auto
096 mkfs v2log auto quick
-097 udf auto
098 udf auto
-099 udf auto
-100 udf auto
101 udf
102 udf
103 metadata dir ioctl auto quick
104 growfs ioctl prealloc auto
-105 acl auto quick
106 quota
107 quota
108 quota auto quick
109 metadata auto
110 repair auto
111 ioctl
-112 rw aio auto quick
-113 rw aio auto quick
114 parent attr
115 parent attr
116 quota auto quick
-117 attr auto quick
118 quota auto quick
119 log v2log auto freeze dangerous
-120 other auto quick
121 log auto quick
122 other auto quick
-123 perms auto quick
-124 pattern auto quick
-125 other auto
-126 perms auto quick
-127 rw auto
-128 perms auto quick
-129 rw auto quick
-130 pattern auto quick
-131 perms auto quick
-132 pattern auto
-133 rw auto
134 quota auto quick
-135 metadata auto quick
136 attr2
137 metadata log auto
138 metadata log auto
139 metadata log auto
140 metadata log auto
-141 rw auto quick
142 dmapi auto
143 dmapi auto
144 dmapi auto
@@ -284,7 +238,6 @@ deprecated
166 rw metadata auto quick
167 rw metadata auto
168 dmapi auto
-169 rw metadata auto quick
170 rw filestreams auto quick
# the next three tests are not deterministic enough to get the
# "right" result on all platforms/configuration, so don't run
@@ -302,7 +255,6 @@ deprecated
181 log auto quick
182 metadata rw auto
183 rw other auto quick
-184 metadata auto quick
185 dmapi auto
186 attr auto quick
187 attr auto quick
@@ -310,95 +262,45 @@ deprecated
189 mount auto quick
190 rw auto quick
191 nfs4acl auto
-192 atime auto
-193 metadata auto quick
194 rw auto
195 ioctl dump auto quick
196 quota auto quick
197 dir auto quick
-198 auto aio quick
199 mount auto quick
200 mount auto quick
201 metadata auto quick
202 repair auto quick
203 ioctl auto
-204 metadata rw auto
205 metadata rw auto
206 growfs auto quick
-207 auto aio quick
-208 auto aio
-209 auto aio
-210 auto aio quick
-211 auto aio quick
-212 auto aio quick
-213 rw auto prealloc quick enospc
-214 rw auto prealloc quick
-215 auto metadata quick
216 log metadata auto quick
217 log metadata auto
218 auto fsr quick
-219 auto quota quick
220 auto quota quick
-221 auto metadata quick
222 auto fsr ioctl quick
-223 auto quick
-224 auto
-225 auto quick
-226 auto enospc
227 auto fsr
-228 rw auto prealloc quick
229 auto rw
-230 auto quota quick
-231 auto quota
-232 auto quota
-233 auto quota
-234 auto quota
-235 auto quota quick
-236 auto quick metadata
-237 auto quick acl
238 auto quick metadata ioctl
-239 auto aio rw
-240 auto aio quick rw
-241 auto
242 auto quick prealloc
243 auto quick prealloc
244 auto quota quick
-245 auto quick dir
-246 auto quick rw
-247 auto quick rw
-248 auto quick rw
-249 auto quick rw
250 auto quick rw prealloc metadata
-251 ioctl trim
252 auto quick prealloc
253 auto quick
254 auto quick
-255 auto quick prealloc
-256 auto quick
-257 dir auto quick
-258 auto quick
259 auto quick
-260 auto quick trim
261 auto quick quota
262 auto quick quota
-263 rw auto quick
264 auto
265 auto
266 dump ioctl auto quick
267 dump ioctl tape
268 dump ioctl tape
-269 auto rw prealloc ioctl enospc
-270 auto quota rw prealloc ioctl enospc
271 auto rw quick
272 auto enospc rw
-273 auto rw
-274 auto rw
-275 auto rw
276 auto rw metadata
-277 auto ioctl quick metadata
278 repair auto
279 auto mkfs
-280 auto quota freeze dangerous
281 dump ioctl auto quick
282 dump ioctl auto quick
283 dump ioctl auto quick
diff --git a/001 b/tests/generic/001
similarity index 100%
rename from 001
rename to tests/generic/001
diff --git a/001.out b/tests/generic/001.out
similarity index 100%
rename from 001.out
rename to tests/generic/001.out
diff --git a/002 b/tests/generic/002
similarity index 100%
rename from 002
rename to tests/generic/002
diff --git a/002.out b/tests/generic/002.out
similarity index 100%
rename from 002.out
rename to tests/generic/002.out
diff --git a/005 b/tests/generic/005
similarity index 100%
rename from 005
rename to tests/generic/005
diff --git a/005.out b/tests/generic/005.out
similarity index 100%
rename from 005.out
rename to tests/generic/005.out
diff --git a/006 b/tests/generic/006
similarity index 100%
rename from 006
rename to tests/generic/006
diff --git a/006.out b/tests/generic/006.out
similarity index 100%
rename from 006.out
rename to tests/generic/006.out
diff --git a/007 b/tests/generic/007
similarity index 100%
rename from 007
rename to tests/generic/007
diff --git a/007.out b/tests/generic/007.out
similarity index 100%
rename from 007.out
rename to tests/generic/007.out
diff --git a/010 b/tests/generic/010
similarity index 100%
rename from 010
rename to tests/generic/010
diff --git a/010.out b/tests/generic/010.out
similarity index 100%
rename from 010.out
rename to tests/generic/010.out
diff --git a/011 b/tests/generic/011
similarity index 100%
rename from 011
rename to tests/generic/011
diff --git a/011.out b/tests/generic/011.out
similarity index 100%
rename from 011.out
rename to tests/generic/011.out
diff --git a/013 b/tests/generic/013
similarity index 100%
rename from 013
rename to tests/generic/013
diff --git a/013.out b/tests/generic/013.out
similarity index 100%
rename from 013.out
rename to tests/generic/013.out
diff --git a/014 b/tests/generic/014
similarity index 100%
rename from 014
rename to tests/generic/014
diff --git a/014.out b/tests/generic/014.out
similarity index 100%
rename from 014.out
rename to tests/generic/014.out
diff --git a/015 b/tests/generic/015
similarity index 100%
rename from 015
rename to tests/generic/015
diff --git a/015.out b/tests/generic/015.out
similarity index 100%
rename from 015.out
rename to tests/generic/015.out
diff --git a/020 b/tests/generic/020
similarity index 100%
rename from 020
rename to tests/generic/020
diff --git a/020.out b/tests/generic/020.out
similarity index 100%
rename from 020.out
rename to tests/generic/020.out
diff --git a/053 b/tests/generic/053
similarity index 100%
rename from 053
rename to tests/generic/053
diff --git a/053.out b/tests/generic/053.out
similarity index 100%
rename from 053.out
rename to tests/generic/053.out
diff --git a/062 b/tests/generic/062
similarity index 100%
rename from 062
rename to tests/generic/062
diff --git a/062.out b/tests/generic/062.out
similarity index 100%
rename from 062.out
rename to tests/generic/062.out
diff --git a/069 b/tests/generic/069
similarity index 100%
rename from 069
rename to tests/generic/069
diff --git a/069.out b/tests/generic/069.out
similarity index 100%
rename from 069.out
rename to tests/generic/069.out
diff --git a/070 b/tests/generic/070
similarity index 100%
rename from 070
rename to tests/generic/070
diff --git a/070.out b/tests/generic/070.out
similarity index 100%
rename from 070.out
rename to tests/generic/070.out
diff --git a/074 b/tests/generic/074
similarity index 100%
rename from 074
rename to tests/generic/074
diff --git a/074.out b/tests/generic/074.out
similarity index 100%
rename from 074.out
rename to tests/generic/074.out
diff --git a/075 b/tests/generic/075
similarity index 100%
rename from 075
rename to tests/generic/075
diff --git a/075.out b/tests/generic/075.out
similarity index 100%
rename from 075.out
rename to tests/generic/075.out
diff --git a/076 b/tests/generic/076
similarity index 100%
rename from 076
rename to tests/generic/076
diff --git a/076.out b/tests/generic/076.out
similarity index 100%
rename from 076.out
rename to tests/generic/076.out
diff --git a/077 b/tests/generic/077
similarity index 100%
rename from 077
rename to tests/generic/077
diff --git a/077.out b/tests/generic/077.out
similarity index 100%
rename from 077.out
rename to tests/generic/077.out
diff --git a/079 b/tests/generic/079
similarity index 100%
rename from 079
rename to tests/generic/079
diff --git a/079.out b/tests/generic/079.out
similarity index 100%
rename from 079.out
rename to tests/generic/079.out
diff --git a/083 b/tests/generic/083
similarity index 100%
rename from 083
rename to tests/generic/083
diff --git a/083.out b/tests/generic/083.out
similarity index 100%
rename from 083.out
rename to tests/generic/083.out
diff --git a/088 b/tests/generic/088
similarity index 100%
rename from 088
rename to tests/generic/088
diff --git a/088.out.irix b/tests/generic/088.out.irix
similarity index 100%
rename from 088.out.irix
rename to tests/generic/088.out.irix
diff --git a/088.out.linux b/tests/generic/088.out.linux
similarity index 100%
rename from 088.out.linux
rename to tests/generic/088.out.linux
diff --git a/089 b/tests/generic/089
similarity index 100%
rename from 089
rename to tests/generic/089
diff --git a/089.out b/tests/generic/089.out
similarity index 100%
rename from 089.out
rename to tests/generic/089.out
diff --git a/091 b/tests/generic/091
similarity index 100%
rename from 091
rename to tests/generic/091
diff --git a/091.out b/tests/generic/091.out
similarity index 100%
rename from 091.out
rename to tests/generic/091.out
diff --git a/093 b/tests/generic/093
similarity index 100%
rename from 093
rename to tests/generic/093
diff --git a/093.out b/tests/generic/093.out
similarity index 100%
rename from 093.out
rename to tests/generic/093.out
diff --git a/097 b/tests/generic/097
similarity index 100%
rename from 097
rename to tests/generic/097
diff --git a/097.out.udf b/tests/generic/097.out.udf
similarity index 100%
rename from 097.out.udf
rename to tests/generic/097.out.udf
diff --git a/097.out.xfs b/tests/generic/097.out.xfs
similarity index 100%
rename from 097.out.xfs
rename to tests/generic/097.out.xfs
diff --git a/099 b/tests/generic/099
similarity index 100%
rename from 099
rename to tests/generic/099
diff --git a/099.out b/tests/generic/099.out
similarity index 100%
rename from 099.out
rename to tests/generic/099.out
diff --git a/100 b/tests/generic/100
similarity index 100%
rename from 100
rename to tests/generic/100
diff --git a/100.out b/tests/generic/100.out
similarity index 100%
rename from 100.out
rename to tests/generic/100.out
diff --git a/105 b/tests/generic/105
similarity index 100%
rename from 105
rename to tests/generic/105
diff --git a/105.out b/tests/generic/105.out
similarity index 100%
rename from 105.out
rename to tests/generic/105.out
diff --git a/112 b/tests/generic/112
similarity index 100%
rename from 112
rename to tests/generic/112
diff --git a/112.out b/tests/generic/112.out
similarity index 100%
rename from 112.out
rename to tests/generic/112.out
diff --git a/113 b/tests/generic/113
similarity index 100%
rename from 113
rename to tests/generic/113
diff --git a/113.out b/tests/generic/113.out
similarity index 100%
rename from 113.out
rename to tests/generic/113.out
diff --git a/117 b/tests/generic/117
similarity index 100%
rename from 117
rename to tests/generic/117
diff --git a/117.out b/tests/generic/117.out
similarity index 100%
rename from 117.out
rename to tests/generic/117.out
diff --git a/120 b/tests/generic/120
similarity index 100%
rename from 120
rename to tests/generic/120
diff --git a/120.out b/tests/generic/120.out
similarity index 100%
rename from 120.out
rename to tests/generic/120.out
diff --git a/123 b/tests/generic/123
similarity index 100%
rename from 123
rename to tests/generic/123
diff --git a/123.out b/tests/generic/123.out
similarity index 100%
rename from 123.out
rename to tests/generic/123.out
diff --git a/124 b/tests/generic/124
similarity index 100%
rename from 124
rename to tests/generic/124
diff --git a/124.out b/tests/generic/124.out
similarity index 100%
rename from 124.out
rename to tests/generic/124.out
diff --git a/125 b/tests/generic/125
similarity index 100%
rename from 125
rename to tests/generic/125
diff --git a/125.out b/tests/generic/125.out
similarity index 100%
rename from 125.out
rename to tests/generic/125.out
diff --git a/126 b/tests/generic/126
similarity index 100%
rename from 126
rename to tests/generic/126
diff --git a/126.out b/tests/generic/126.out
similarity index 100%
rename from 126.out
rename to tests/generic/126.out
diff --git a/127 b/tests/generic/127
similarity index 100%
rename from 127
rename to tests/generic/127
diff --git a/127.out b/tests/generic/127.out
similarity index 100%
rename from 127.out
rename to tests/generic/127.out
diff --git a/128 b/tests/generic/128
similarity index 100%
rename from 128
rename to tests/generic/128
diff --git a/128.out b/tests/generic/128.out
similarity index 100%
rename from 128.out
rename to tests/generic/128.out
diff --git a/129 b/tests/generic/129
similarity index 100%
rename from 129
rename to tests/generic/129
diff --git a/129.out b/tests/generic/129.out
similarity index 100%
rename from 129.out
rename to tests/generic/129.out
diff --git a/130 b/tests/generic/130
similarity index 100%
rename from 130
rename to tests/generic/130
diff --git a/130.out b/tests/generic/130.out
similarity index 100%
rename from 130.out
rename to tests/generic/130.out
diff --git a/131 b/tests/generic/131
similarity index 100%
rename from 131
rename to tests/generic/131
diff --git a/131.out b/tests/generic/131.out
similarity index 100%
rename from 131.out
rename to tests/generic/131.out
diff --git a/132 b/tests/generic/132
similarity index 100%
rename from 132
rename to tests/generic/132
diff --git a/132.out b/tests/generic/132.out
similarity index 100%
rename from 132.out
rename to tests/generic/132.out
diff --git a/133 b/tests/generic/133
similarity index 100%
rename from 133
rename to tests/generic/133
diff --git a/133.out b/tests/generic/133.out
similarity index 100%
rename from 133.out
rename to tests/generic/133.out
diff --git a/135 b/tests/generic/135
similarity index 100%
rename from 135
rename to tests/generic/135
diff --git a/135.out b/tests/generic/135.out
similarity index 100%
rename from 135.out
rename to tests/generic/135.out
diff --git a/141 b/tests/generic/141
similarity index 100%
rename from 141
rename to tests/generic/141
diff --git a/141.out b/tests/generic/141.out
similarity index 100%
rename from 141.out
rename to tests/generic/141.out
diff --git a/169 b/tests/generic/169
similarity index 100%
rename from 169
rename to tests/generic/169
diff --git a/169.out b/tests/generic/169.out
similarity index 100%
rename from 169.out
rename to tests/generic/169.out
diff --git a/184 b/tests/generic/184
similarity index 100%
rename from 184
rename to tests/generic/184
diff --git a/184.out b/tests/generic/184.out
similarity index 100%
rename from 184.out
rename to tests/generic/184.out
diff --git a/192 b/tests/generic/192
similarity index 100%
rename from 192
rename to tests/generic/192
diff --git a/192.out b/tests/generic/192.out
similarity index 100%
rename from 192.out
rename to tests/generic/192.out
diff --git a/193 b/tests/generic/193
similarity index 100%
rename from 193
rename to tests/generic/193
diff --git a/193.out b/tests/generic/193.out
similarity index 100%
rename from 193.out
rename to tests/generic/193.out
diff --git a/198 b/tests/generic/198
similarity index 100%
rename from 198
rename to tests/generic/198
diff --git a/198.out b/tests/generic/198.out
similarity index 100%
rename from 198.out
rename to tests/generic/198.out
diff --git a/204 b/tests/generic/204
similarity index 100%
rename from 204
rename to tests/generic/204
diff --git a/204.out b/tests/generic/204.out
similarity index 100%
rename from 204.out
rename to tests/generic/204.out
diff --git a/207 b/tests/generic/207
similarity index 100%
rename from 207
rename to tests/generic/207
diff --git a/207.out b/tests/generic/207.out
similarity index 100%
rename from 207.out
rename to tests/generic/207.out
diff --git a/208 b/tests/generic/208
similarity index 100%
rename from 208
rename to tests/generic/208
diff --git a/208.out b/tests/generic/208.out
similarity index 100%
rename from 208.out
rename to tests/generic/208.out
diff --git a/209 b/tests/generic/209
similarity index 100%
rename from 209
rename to tests/generic/209
diff --git a/209.out b/tests/generic/209.out
similarity index 100%
rename from 209.out
rename to tests/generic/209.out
diff --git a/210 b/tests/generic/210
similarity index 100%
rename from 210
rename to tests/generic/210
diff --git a/210.out b/tests/generic/210.out
similarity index 100%
rename from 210.out
rename to tests/generic/210.out
diff --git a/211 b/tests/generic/211
similarity index 100%
rename from 211
rename to tests/generic/211
diff --git a/211.out b/tests/generic/211.out
similarity index 100%
rename from 211.out
rename to tests/generic/211.out
diff --git a/212 b/tests/generic/212
similarity index 100%
rename from 212
rename to tests/generic/212
diff --git a/212.out b/tests/generic/212.out
similarity index 100%
rename from 212.out
rename to tests/generic/212.out
diff --git a/213 b/tests/generic/213
similarity index 100%
rename from 213
rename to tests/generic/213
diff --git a/213.out b/tests/generic/213.out
similarity index 100%
rename from 213.out
rename to tests/generic/213.out
diff --git a/214 b/tests/generic/214
similarity index 100%
rename from 214
rename to tests/generic/214
diff --git a/214.out b/tests/generic/214.out
similarity index 100%
rename from 214.out
rename to tests/generic/214.out
diff --git a/215 b/tests/generic/215
similarity index 100%
rename from 215
rename to tests/generic/215
diff --git a/215.out b/tests/generic/215.out
similarity index 100%
rename from 215.out
rename to tests/generic/215.out
diff --git a/219 b/tests/generic/219
similarity index 100%
rename from 219
rename to tests/generic/219
diff --git a/219.out b/tests/generic/219.out
similarity index 100%
rename from 219.out
rename to tests/generic/219.out
diff --git a/221 b/tests/generic/221
similarity index 100%
rename from 221
rename to tests/generic/221
diff --git a/221.out b/tests/generic/221.out
similarity index 100%
rename from 221.out
rename to tests/generic/221.out
diff --git a/223 b/tests/generic/223
similarity index 100%
rename from 223
rename to tests/generic/223
diff --git a/223.out b/tests/generic/223.out
similarity index 100%
rename from 223.out
rename to tests/generic/223.out
diff --git a/224 b/tests/generic/224
similarity index 100%
rename from 224
rename to tests/generic/224
diff --git a/224.out b/tests/generic/224.out
similarity index 100%
rename from 224.out
rename to tests/generic/224.out
diff --git a/225 b/tests/generic/225
similarity index 100%
rename from 225
rename to tests/generic/225
diff --git a/225.out b/tests/generic/225.out
similarity index 100%
rename from 225.out
rename to tests/generic/225.out
diff --git a/226 b/tests/generic/226
similarity index 100%
rename from 226
rename to tests/generic/226
diff --git a/226.out b/tests/generic/226.out
similarity index 100%
rename from 226.out
rename to tests/generic/226.out
diff --git a/228 b/tests/generic/228
similarity index 100%
rename from 228
rename to tests/generic/228
diff --git a/228.out b/tests/generic/228.out
similarity index 100%
rename from 228.out
rename to tests/generic/228.out
diff --git a/230 b/tests/generic/230
similarity index 100%
rename from 230
rename to tests/generic/230
diff --git a/230.out b/tests/generic/230.out
similarity index 100%
rename from 230.out
rename to tests/generic/230.out
diff --git a/231 b/tests/generic/231
similarity index 100%
rename from 231
rename to tests/generic/231
diff --git a/231.out b/tests/generic/231.out
similarity index 100%
rename from 231.out
rename to tests/generic/231.out
diff --git a/232 b/tests/generic/232
similarity index 100%
rename from 232
rename to tests/generic/232
diff --git a/232.out b/tests/generic/232.out
similarity index 100%
rename from 232.out
rename to tests/generic/232.out
diff --git a/233 b/tests/generic/233
similarity index 100%
rename from 233
rename to tests/generic/233
diff --git a/233.out b/tests/generic/233.out
similarity index 100%
rename from 233.out
rename to tests/generic/233.out
diff --git a/234 b/tests/generic/234
similarity index 100%
rename from 234
rename to tests/generic/234
diff --git a/234.out b/tests/generic/234.out
similarity index 100%
rename from 234.out
rename to tests/generic/234.out
diff --git a/235 b/tests/generic/235
similarity index 100%
rename from 235
rename to tests/generic/235
diff --git a/235.out b/tests/generic/235.out
similarity index 100%
rename from 235.out
rename to tests/generic/235.out
diff --git a/236 b/tests/generic/236
similarity index 100%
rename from 236
rename to tests/generic/236
diff --git a/236.out b/tests/generic/236.out
similarity index 100%
rename from 236.out
rename to tests/generic/236.out
diff --git a/237 b/tests/generic/237
similarity index 100%
rename from 237
rename to tests/generic/237
diff --git a/237.out b/tests/generic/237.out
similarity index 100%
rename from 237.out
rename to tests/generic/237.out
diff --git a/239 b/tests/generic/239
similarity index 100%
rename from 239
rename to tests/generic/239
diff --git a/239.out b/tests/generic/239.out
similarity index 100%
rename from 239.out
rename to tests/generic/239.out
diff --git a/240 b/tests/generic/240
similarity index 100%
rename from 240
rename to tests/generic/240
diff --git a/240.out b/tests/generic/240.out
similarity index 100%
rename from 240.out
rename to tests/generic/240.out
diff --git a/241 b/tests/generic/241
similarity index 100%
rename from 241
rename to tests/generic/241
diff --git a/241.out b/tests/generic/241.out
similarity index 100%
rename from 241.out
rename to tests/generic/241.out
diff --git a/245 b/tests/generic/245
similarity index 100%
rename from 245
rename to tests/generic/245
diff --git a/245.out b/tests/generic/245.out
similarity index 100%
rename from 245.out
rename to tests/generic/245.out
diff --git a/246 b/tests/generic/246
similarity index 100%
rename from 246
rename to tests/generic/246
diff --git a/246.out b/tests/generic/246.out
similarity index 100%
rename from 246.out
rename to tests/generic/246.out
diff --git a/247 b/tests/generic/247
similarity index 100%
rename from 247
rename to tests/generic/247
diff --git a/247.out b/tests/generic/247.out
similarity index 100%
rename from 247.out
rename to tests/generic/247.out
diff --git a/248 b/tests/generic/248
similarity index 100%
rename from 248
rename to tests/generic/248
diff --git a/248.out b/tests/generic/248.out
similarity index 100%
rename from 248.out
rename to tests/generic/248.out
diff --git a/249 b/tests/generic/249
similarity index 100%
rename from 249
rename to tests/generic/249
diff --git a/249.out b/tests/generic/249.out
similarity index 100%
rename from 249.out
rename to tests/generic/249.out
diff --git a/251 b/tests/generic/251
similarity index 100%
rename from 251
rename to tests/generic/251
diff --git a/251.out b/tests/generic/251.out
similarity index 100%
rename from 251.out
rename to tests/generic/251.out
diff --git a/255 b/tests/generic/255
similarity index 100%
rename from 255
rename to tests/generic/255
diff --git a/255.out b/tests/generic/255.out
similarity index 100%
rename from 255.out
rename to tests/generic/255.out
diff --git a/256 b/tests/generic/256
similarity index 100%
rename from 256
rename to tests/generic/256
diff --git a/256.out b/tests/generic/256.out
similarity index 100%
rename from 256.out
rename to tests/generic/256.out
diff --git a/257 b/tests/generic/257
similarity index 100%
rename from 257
rename to tests/generic/257
diff --git a/257.out b/tests/generic/257.out
similarity index 100%
rename from 257.out
rename to tests/generic/257.out
diff --git a/258 b/tests/generic/258
similarity index 100%
rename from 258
rename to tests/generic/258
diff --git a/258.out b/tests/generic/258.out
similarity index 100%
rename from 258.out
rename to tests/generic/258.out
diff --git a/260 b/tests/generic/260
similarity index 100%
rename from 260
rename to tests/generic/260
diff --git a/260.out b/tests/generic/260.out
similarity index 100%
rename from 260.out
rename to tests/generic/260.out
diff --git a/263 b/tests/generic/263
similarity index 100%
rename from 263
rename to tests/generic/263
diff --git a/263.out b/tests/generic/263.out
similarity index 100%
rename from 263.out
rename to tests/generic/263.out
diff --git a/269 b/tests/generic/269
similarity index 100%
rename from 269
rename to tests/generic/269
diff --git a/269.out b/tests/generic/269.out
similarity index 100%
rename from 269.out
rename to tests/generic/269.out
diff --git a/270 b/tests/generic/270
similarity index 100%
rename from 270
rename to tests/generic/270
diff --git a/270.out b/tests/generic/270.out
similarity index 100%
rename from 270.out
rename to tests/generic/270.out
diff --git a/273 b/tests/generic/273
similarity index 100%
rename from 273
rename to tests/generic/273
diff --git a/273.out b/tests/generic/273.out
similarity index 100%
rename from 273.out
rename to tests/generic/273.out
diff --git a/274 b/tests/generic/274
similarity index 100%
rename from 274
rename to tests/generic/274
diff --git a/274.out b/tests/generic/274.out
similarity index 100%
rename from 274.out
rename to tests/generic/274.out
diff --git a/275 b/tests/generic/275
similarity index 100%
rename from 275
rename to tests/generic/275
diff --git a/275.out b/tests/generic/275.out
similarity index 100%
rename from 275.out
rename to tests/generic/275.out
diff --git a/277 b/tests/generic/277
similarity index 100%
rename from 277
rename to tests/generic/277
diff --git a/277.out b/tests/generic/277.out
similarity index 100%
rename from 277.out
rename to tests/generic/277.out
diff --git a/280 b/tests/generic/280
similarity index 100%
rename from 280
rename to tests/generic/280
diff --git a/280.out b/tests/generic/280.out
similarity index 100%
rename from 280.out
rename to tests/generic/280.out
diff --git a/tests/generic/group b/tests/generic/group
index 4e01f0c..828f135 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -3,3 +3,101 @@
# - do not start group names with a digit
# - comment line before each group is "new" description
#
+001 rw dir udf auto quick
+002 metadata udf auto quick
+005 dir udf auto quick
+006 dir udf auto quick
+007 dir udf auto quick
+010 other udf auto
+011 dir udf auto quick
+013 other ioctl udf auto quick
+014 rw udf auto quick
+015 other auto quick
+020 metadata attr udf auto quick
+053 acl repair auto quick
+062 attr udf auto quick
+069 rw udf auto quick
+070 attr udf auto quick
+074 rw udf auto
+075 rw udf auto quick
+076 metadata rw udf auto quick
+077 acl attr auto enospc
+079 acl attr ioctl metadata auto quick
+083 rw auto
+088 perms auto quick
+089 metadata auto
+091 rw auto quick
+093 attr cap udf auto
+097 udf auto
+099 udf auto
+100 udf auto
+105 acl auto quick
+112 rw aio auto quick
+113 rw aio auto quick
+117 attr auto quick
+120 other auto quick
+123 perms auto quick
+124 pattern auto quick
+125 other auto
+126 perms auto quick
+127 rw auto
+128 perms auto quick
+129 rw auto quick
+130 pattern auto quick
+131 perms auto quick
+132 pattern auto
+133 rw auto
+135 metadata auto quick
+141 rw auto quick
+169 rw metadata auto quick
+184 metadata auto quick
+192 atime auto
+193 metadata auto quick
+198 auto aio quick
+204 metadata rw auto
+207 auto aio quick
+208 auto aio
+209 auto aio
+210 auto aio quick
+211 auto aio quick
+212 auto aio quick
+213 rw auto prealloc quick enospc
+214 rw auto prealloc quick
+215 auto metadata quick
+219 auto quota quick
+221 auto metadata quick
+223 auto quick
+224 auto
+225 auto quick
+226 auto enospc
+228 rw auto prealloc quick
+230 auto quota quick
+231 auto quota
+232 auto quota
+233 auto quota
+234 auto quota
+235 auto quota quick
+236 auto quick metadata
+237 auto quick acl
+239 auto aio rw
+240 auto aio quick rw
+241 auto
+245 auto quick dir
+246 auto quick rw
+247 auto quick rw
+248 auto quick rw
+249 auto quick rw
+251 ioctl trim
+255 auto quick prealloc
+256 auto quick
+257 dir auto quick
+258 auto quick
+260 auto quick trim
+263 rw auto quick
+269 auto rw prealloc ioctl enospc
+270 auto quota rw prealloc ioctl enospc
+273 auto rw
+274 auto rw
+275 auto rw
+277 auto ioctl quick metadata
+280 auto quota freeze dangerous
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 12/18] xfstests: move xfs specific tests out of top directory
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (10 preceding siblings ...)
2012-07-26 9:28 ` [PATCH 11/18] xfstests: move generic tests out of top level dir Dave Chinner
@ 2012-07-26 9:28 ` Dave Chinner
2012-07-26 9:28 ` [PATCH 13/18] xfstests: move remaining tests out of top level directory Dave Chinner
` (7 subsequent siblings)
19 siblings, 0 replies; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:28 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
And into tests/xfs. Tests found and moved via:
$ grep "supported_fs xfs$" [0-2]* | cut -d : -f 1 > xfs.tests
$ for i in `cat xfs.tests`; do
> git mv $i* tests/xfs/
> grep ^$i group >> tests/xfs/group
> sed -i -e "/^$i/d" group
> done
Output now looks like:
sudo ./check -g quick -r
FSTYP -- xfs (debug)
PLATFORM -- Linux/x86_64 test-1 3.5.0-rc5-dgc+
MKFS_OPTIONS -- -f -bsize=4096 /dev/vdb
MOUNT_OPTIONS -- /dev/vdb /mnt/scratch
xfs/170 4s
generic/120 16s
generic/248 0s
generic/213 0s
generic/256 39s
xfs/121 6s
xfs/026 11s
generic/131 1s
xfs/187 1s
generic/135 0s
....
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
check | 3 +-
group | 169 --------------------
003 => tests/xfs/003 | 0
003.out => tests/xfs/003.out | 0
004 => tests/xfs/004 | 0
004.out => tests/xfs/004.out | 0
008 => tests/xfs/008 | 0
008.out => tests/xfs/008.out | 0
009 => tests/xfs/009 | 0
009.out => tests/xfs/009.out | 0
012 => tests/xfs/012 | 0
012.out => tests/xfs/012.out | 0
016 => tests/xfs/016 | 0
016.out => tests/xfs/016.out | 0
017 => tests/xfs/017 | 0
017.out => tests/xfs/017.out | 0
018 => tests/xfs/018 | 0
018.op.irix => tests/xfs/018.op.irix | 0
018.op.linux => tests/xfs/018.op.linux | 0
018.out => tests/xfs/018.out | 0
018.trans_buf => tests/xfs/018.trans_buf | 0
018.trans_inode => tests/xfs/018.trans_inode | 0
019 => tests/xfs/019 | 0
019.out => tests/xfs/019.out | 0
021 => tests/xfs/021 | 0
021.out => tests/xfs/021.out | 0
022 => tests/xfs/022 | 0
022.out.irix => tests/xfs/022.out.irix | 0
022.out.linux => tests/xfs/022.out.linux | 0
023 => tests/xfs/023 | 0
023.out.irix => tests/xfs/023.out.irix | 0
023.out.linux => tests/xfs/023.out.linux | 0
024 => tests/xfs/024 | 0
024.out => tests/xfs/024.out | 0
025 => tests/xfs/025 | 0
025.out => tests/xfs/025.out | 0
026 => tests/xfs/026 | 0
026.out => tests/xfs/026.out | 0
027 => tests/xfs/027 | 0
027.out => tests/xfs/027.out | 0
028 => tests/xfs/028 | 0
028.out => tests/xfs/028.out | 0
029 => tests/xfs/029 | 0
029.out => tests/xfs/029.out | 0
030 => tests/xfs/030 | 0
030.out.irix => tests/xfs/030.out.irix | 0
030.out.linux => tests/xfs/030.out.linux | 0
031 => tests/xfs/031 | 0
031.out.irix => tests/xfs/031.out.irix | 0
031.out.linux => tests/xfs/031.out.linux | 0
032 => tests/xfs/032 | 0
032.out => tests/xfs/032.out | 0
033 => tests/xfs/033 | 0
033.out.irix => tests/xfs/033.out.irix | 0
033.out.linux => tests/xfs/033.out.linux | 0
034 => tests/xfs/034 | 0
034.out => tests/xfs/034.out | 0
035 => tests/xfs/035 | 0
035.out.irix => tests/xfs/035.out.irix | 0
035.out.linux => tests/xfs/035.out.linux | 0
036 => tests/xfs/036 | 0
036.out.irix => tests/xfs/036.out.irix | 0
036.out.linux => tests/xfs/036.out.linux | 0
037 => tests/xfs/037 | 0
037.out => tests/xfs/037.out | 0
038 => tests/xfs/038 | 0
038.out => tests/xfs/038.out | 0
039 => tests/xfs/039 | 0
039.out.irix => tests/xfs/039.out.irix | 0
039.out.linux => tests/xfs/039.out.linux | 0
041 => tests/xfs/041 | 0
041.out => tests/xfs/041.out | 0
042 => tests/xfs/042 | 0
042.out => tests/xfs/042.out | 0
043 => tests/xfs/043 | 0
043.out.irix => tests/xfs/043.out.irix | 0
043.out.linux => tests/xfs/043.out.linux | 0
044 => tests/xfs/044 | 0
044.out => tests/xfs/044.out | 0
045 => tests/xfs/045 | 0
045.out => tests/xfs/045.out | 0
046 => tests/xfs/046 | 0
046.out => tests/xfs/046.out | 0
047 => tests/xfs/047 | 0
047.out => tests/xfs/047.out | 0
048 => tests/xfs/048 | 0
048.out => tests/xfs/048.out | 0
049 => tests/xfs/049 | 0
049.out => tests/xfs/049.out | 0
050 => tests/xfs/050 | 0
050.out => tests/xfs/050.out | 0
052 => tests/xfs/052 | 0
052.out => tests/xfs/052.out | 0
054 => tests/xfs/054 | 0
054.out => tests/xfs/054.out | 0
055 => tests/xfs/055 | 0
055.out.irix => tests/xfs/055.out.irix | 0
055.out.linux => tests/xfs/055.out.linux | 0
056 => tests/xfs/056 | 0
056.out => tests/xfs/056.out | 0
057 => tests/xfs/057 | 0
057.out => tests/xfs/057.out | 0
058 => tests/xfs/058 | 0
058.out => tests/xfs/058.out | 0
059 => tests/xfs/059 | 0
059.out => tests/xfs/059.out | 0
060 => tests/xfs/060 | 0
060.out => tests/xfs/060.out | 0
061 => tests/xfs/061 | 0
061.out => tests/xfs/061.out | 0
063 => tests/xfs/063 | 0
063.out => tests/xfs/063.out | 0
064 => tests/xfs/064 | 0
064.out => tests/xfs/064.out | 0
065 => tests/xfs/065 | 0
065.out => tests/xfs/065.out | 0
066 => tests/xfs/066 | 0
066.out => tests/xfs/066.out | 0
067 => tests/xfs/067 | 0
067.out => tests/xfs/067.out | 0
071 => tests/xfs/071 | 0
071.out => tests/xfs/071.out | 0
071.out.32 => tests/xfs/071.out.32 | 0
071.out.64 => tests/xfs/071.out.64 | 0
072 => tests/xfs/072 | 0
072.out => tests/xfs/072.out | 0
073 => tests/xfs/073 | 0
073.out => tests/xfs/073.out | 0
078 => tests/xfs/078 | 0
078.out => tests/xfs/078.out | 0
080 => tests/xfs/080 | 0
080.out => tests/xfs/080.out | 0
081 => tests/xfs/081 | 0
081.out => tests/xfs/081.out | 0
.../xfs/081.ugquota.trans_inode | 0
082 => tests/xfs/082 | 0
082.op.irix => tests/xfs/082.op.irix | 0
082.op.linux => tests/xfs/082.op.linux | 0
082.out => tests/xfs/082.out | 0
082.trans_buf => tests/xfs/082.trans_buf | 0
082.trans_inode => tests/xfs/082.trans_inode | 0
084 => tests/xfs/084 | 0
084.out => tests/xfs/084.out | 0
085 => tests/xfs/085 | 0
085.out => tests/xfs/085.out | 0
086 => tests/xfs/086 | 0
086.out => tests/xfs/086.out | 0
087 => tests/xfs/087 | 0
087.out => tests/xfs/087.out | 0
090 => tests/xfs/090 | 0
090.out => tests/xfs/090.out | 0
092 => tests/xfs/092 | 0
092.out => tests/xfs/092.out | 0
094 => tests/xfs/094 | 0
094.out => tests/xfs/094.out | 0
095 => tests/xfs/095 | 0
095.out => tests/xfs/095.out | 0
096 => tests/xfs/096 | 0
096.external => tests/xfs/096.external | 0
096.internal => tests/xfs/096.internal | 0
103 => tests/xfs/103 | 0
103.out => tests/xfs/103.out | 0
104 => tests/xfs/104 | 0
104.out => tests/xfs/104.out | 0
106 => tests/xfs/106 | 0
106.out => tests/xfs/106.out | 0
107 => tests/xfs/107 | 0
107.out => tests/xfs/107.out | 0
108 => tests/xfs/108 | 0
108.out => tests/xfs/108.out | 0
109 => tests/xfs/109 | 0
109.out => tests/xfs/109.out | 0
110 => tests/xfs/110 | 0
110.out => tests/xfs/110.out | 0
111 => tests/xfs/111 | 0
111.out => tests/xfs/111.out | 0
114 => tests/xfs/114 | 0
114.out => tests/xfs/114.out | 0
115 => tests/xfs/115 | 0
115.out => tests/xfs/115.out | 0
116 => tests/xfs/116 | 0
116.out => tests/xfs/116.out | 0
118 => tests/xfs/118 | 0
118.out => tests/xfs/118.out | 0
119 => tests/xfs/119 | 0
119.out => tests/xfs/119.out | 0
121 => tests/xfs/121 | 0
121.out => tests/xfs/121.out | 0
122 => tests/xfs/122 | 0
122.out => tests/xfs/122.out | 0
134 => tests/xfs/134 | 0
134.out => tests/xfs/134.out | 0
136 => tests/xfs/136 | 0
136.out => tests/xfs/136.out | 0
137 => tests/xfs/137 | 0
137.out => tests/xfs/137.out | 0
138 => tests/xfs/138 | 0
138.out => tests/xfs/138.out | 0
139 => tests/xfs/139 | 0
139.out => tests/xfs/139.out | 0
140 => tests/xfs/140 | 0
140.out => tests/xfs/140.out | 0
142 => tests/xfs/142 | 0
142.out => tests/xfs/142.out | 0
143 => tests/xfs/143 | 0
143.out => tests/xfs/143.out | 0
144 => tests/xfs/144 | 0
144.out => tests/xfs/144.out | 0
145 => tests/xfs/145 | 0
145.out => tests/xfs/145.out | 0
146 => tests/xfs/146 | 0
146.out.irix => tests/xfs/146.out.irix | 0
146.out.linux => tests/xfs/146.out.linux | 0
147 => tests/xfs/147 | 0
147.out => tests/xfs/147.out | 0
148 => tests/xfs/148 | 0
148.out => tests/xfs/148.out | 0
149 => tests/xfs/149 | 0
149.out => tests/xfs/149.out | 0
150 => tests/xfs/150 | 0
150.out => tests/xfs/150.out | 0
151 => tests/xfs/151 | 0
151.out => tests/xfs/151.out | 0
152 => tests/xfs/152 | 0
152.out => tests/xfs/152.out | 0
153 => tests/xfs/153 | 0
153.out => tests/xfs/153.out | 0
154 => tests/xfs/154 | 0
154.out => tests/xfs/154.out | 0
155 => tests/xfs/155 | 0
155.out => tests/xfs/155.out | 0
156 => tests/xfs/156 | 0
156.out => tests/xfs/156.out | 0
157 => tests/xfs/157 | 0
157.out => tests/xfs/157.out | 0
158 => tests/xfs/158 | 0
158.out => tests/xfs/158.out | 0
159 => tests/xfs/159 | 0
159.out => tests/xfs/159.out | 0
160 => tests/xfs/160 | 0
160.out => tests/xfs/160.out | 0
161 => tests/xfs/161 | 0
161.out => tests/xfs/161.out | 0
162 => tests/xfs/162 | 0
162.out => tests/xfs/162.out | 0
163 => tests/xfs/163 | 0
163.out => tests/xfs/163.out | 0
164 => tests/xfs/164 | 0
164.out => tests/xfs/164.out | 0
165 => tests/xfs/165 | 0
165.out => tests/xfs/165.out | 0
166 => tests/xfs/166 | 0
166.out => tests/xfs/166.out | 0
167 => tests/xfs/167 | 0
167.out => tests/xfs/167.out | 0
168 => tests/xfs/168 | 0
168.out => tests/xfs/168.out | 0
170 => tests/xfs/170 | 0
170.out => tests/xfs/170.out | 0
171 => tests/xfs/171 | 0
171.out => tests/xfs/171.out | 0
172 => tests/xfs/172 | 0
172.out => tests/xfs/172.out | 0
173 => tests/xfs/173 | 0
173.out => tests/xfs/173.out | 0
174 => tests/xfs/174 | 0
174.out => tests/xfs/174.out | 0
175 => tests/xfs/175 | 0
175.out => tests/xfs/175.out | 0
176 => tests/xfs/176 | 0
176.out => tests/xfs/176.out | 0
178 => tests/xfs/178 | 0
178.out => tests/xfs/178.out | 0
179 => tests/xfs/179 | 0
179.out => tests/xfs/179.out | 0
180 => tests/xfs/180 | 0
180.out => tests/xfs/180.out | 0
181 => tests/xfs/181 | 0
181.out => tests/xfs/181.out | 0
182 => tests/xfs/182 | 0
182.out => tests/xfs/182.out | 0
183 => tests/xfs/183 | 0
183.out => tests/xfs/183.out | 0
185 => tests/xfs/185 | 0
185.out => tests/xfs/185.out | 0
186 => tests/xfs/186 | 0
186.out => tests/xfs/186.out | 0
187 => tests/xfs/187 | 0
187.out => tests/xfs/187.out | 0
188 => tests/xfs/188 | 0
188.out => tests/xfs/188.out | 0
189 => tests/xfs/189 | 0
189.out => tests/xfs/189.out | 0
190 => tests/xfs/190 | 0
190.out => tests/xfs/190.out | 0
191 => tests/xfs/191 | 0
191.out => tests/xfs/191.out | 0
194 => tests/xfs/194 | 0
194.out => tests/xfs/194.out | 0
195 => tests/xfs/195 | 0
195.out => tests/xfs/195.out | 0
196 => tests/xfs/196 | 0
196.out => tests/xfs/196.out | 0
197 => tests/xfs/197 | 0
197.out => tests/xfs/197.out | 0
199 => tests/xfs/199 | 0
199.out => tests/xfs/199.out | 0
200 => tests/xfs/200 | 0
200.out => tests/xfs/200.out | 0
201 => tests/xfs/201 | 0
201.out => tests/xfs/201.out | 0
202 => tests/xfs/202 | 0
202.out => tests/xfs/202.out | 0
203 => tests/xfs/203 | 0
203.out => tests/xfs/203.out | 0
205 => tests/xfs/205 | 0
205.out => tests/xfs/205.out | 0
206 => tests/xfs/206 | 0
206.out => tests/xfs/206.out | 0
216 => tests/xfs/216 | 0
216.out => tests/xfs/216.out | 0
217 => tests/xfs/217 | 0
217.out => tests/xfs/217.out | 0
220 => tests/xfs/220 | 0
220.out => tests/xfs/220.out | 0
222 => tests/xfs/222 | 0
222.out => tests/xfs/222.out | 0
227 => tests/xfs/227 | 0
227.out => tests/xfs/227.out | 0
229 => tests/xfs/229 | 0
229.out => tests/xfs/229.out | 0
238 => tests/xfs/238 | 0
238.out => tests/xfs/238.out | 0
242 => tests/xfs/242 | 0
242.out => tests/xfs/242.out | 0
244 => tests/xfs/244 | 0
244.out => tests/xfs/244.out | 0
250 => tests/xfs/250 | 0
250.out => tests/xfs/250.out | 0
253 => tests/xfs/253 | 0
253.out => tests/xfs/253.out | 0
259 => tests/xfs/259 | 0
259.out => tests/xfs/259.out | 0
261 => tests/xfs/261 | 0
261.out => tests/xfs/261.out | 0
262 => tests/xfs/262 | 0
262.out => tests/xfs/262.out | 0
266 => tests/xfs/266 | 0
266.out => tests/xfs/266.out | 0
267 => tests/xfs/267 | 0
267.out => tests/xfs/267.out | 0
268 => tests/xfs/268 | 0
268.out => tests/xfs/268.out | 0
278 => tests/xfs/278 | 0
278.out => tests/xfs/278.out | 0
279 => tests/xfs/279 | 0
279.out => tests/xfs/279.out | 0
281 => tests/xfs/281 | 0
281.out => tests/xfs/281.out | 0
282 => tests/xfs/282 | 0
282.out => tests/xfs/282.out | 0
283 => tests/xfs/283 | 0
283.out => tests/xfs/283.out | 0
group => tests/xfs/group | 130 ---------------
364 files changed, 2 insertions(+), 300 deletions(-)
rename 003 => tests/xfs/003 (100%)
rename 003.out => tests/xfs/003.out (100%)
rename 004 => tests/xfs/004 (100%)
rename 004.out => tests/xfs/004.out (100%)
rename 008 => tests/xfs/008 (100%)
rename 008.out => tests/xfs/008.out (100%)
rename 009 => tests/xfs/009 (100%)
rename 009.out => tests/xfs/009.out (100%)
rename 012 => tests/xfs/012 (100%)
rename 012.out => tests/xfs/012.out (100%)
rename 016 => tests/xfs/016 (100%)
rename 016.out => tests/xfs/016.out (100%)
rename 017 => tests/xfs/017 (100%)
rename 017.out => tests/xfs/017.out (100%)
rename 018 => tests/xfs/018 (100%)
rename 018.op.irix => tests/xfs/018.op.irix (100%)
rename 018.op.linux => tests/xfs/018.op.linux (100%)
rename 018.out => tests/xfs/018.out (100%)
rename 018.trans_buf => tests/xfs/018.trans_buf (100%)
rename 018.trans_inode => tests/xfs/018.trans_inode (100%)
rename 019 => tests/xfs/019 (100%)
rename 019.out => tests/xfs/019.out (100%)
rename 021 => tests/xfs/021 (100%)
rename 021.out => tests/xfs/021.out (100%)
rename 022 => tests/xfs/022 (100%)
rename 022.out.irix => tests/xfs/022.out.irix (100%)
rename 022.out.linux => tests/xfs/022.out.linux (100%)
rename 023 => tests/xfs/023 (100%)
rename 023.out.irix => tests/xfs/023.out.irix (100%)
rename 023.out.linux => tests/xfs/023.out.linux (100%)
rename 024 => tests/xfs/024 (100%)
rename 024.out => tests/xfs/024.out (100%)
rename 025 => tests/xfs/025 (100%)
rename 025.out => tests/xfs/025.out (100%)
rename 026 => tests/xfs/026 (100%)
rename 026.out => tests/xfs/026.out (100%)
rename 027 => tests/xfs/027 (100%)
rename 027.out => tests/xfs/027.out (100%)
rename 028 => tests/xfs/028 (100%)
rename 028.out => tests/xfs/028.out (100%)
rename 029 => tests/xfs/029 (100%)
rename 029.out => tests/xfs/029.out (100%)
rename 030 => tests/xfs/030 (100%)
rename 030.out.irix => tests/xfs/030.out.irix (100%)
rename 030.out.linux => tests/xfs/030.out.linux (100%)
rename 031 => tests/xfs/031 (100%)
rename 031.out.irix => tests/xfs/031.out.irix (100%)
rename 031.out.linux => tests/xfs/031.out.linux (100%)
rename 032 => tests/xfs/032 (100%)
rename 032.out => tests/xfs/032.out (100%)
rename 033 => tests/xfs/033 (100%)
rename 033.out.irix => tests/xfs/033.out.irix (100%)
rename 033.out.linux => tests/xfs/033.out.linux (100%)
rename 034 => tests/xfs/034 (100%)
rename 034.out => tests/xfs/034.out (100%)
rename 035 => tests/xfs/035 (100%)
rename 035.out.irix => tests/xfs/035.out.irix (100%)
rename 035.out.linux => tests/xfs/035.out.linux (100%)
rename 036 => tests/xfs/036 (100%)
rename 036.out.irix => tests/xfs/036.out.irix (100%)
rename 036.out.linux => tests/xfs/036.out.linux (100%)
rename 037 => tests/xfs/037 (100%)
rename 037.out => tests/xfs/037.out (100%)
rename 038 => tests/xfs/038 (100%)
rename 038.out => tests/xfs/038.out (100%)
rename 039 => tests/xfs/039 (100%)
rename 039.out.irix => tests/xfs/039.out.irix (100%)
rename 039.out.linux => tests/xfs/039.out.linux (100%)
rename 041 => tests/xfs/041 (100%)
rename 041.out => tests/xfs/041.out (100%)
rename 042 => tests/xfs/042 (100%)
rename 042.out => tests/xfs/042.out (100%)
rename 043 => tests/xfs/043 (100%)
rename 043.out.irix => tests/xfs/043.out.irix (100%)
rename 043.out.linux => tests/xfs/043.out.linux (100%)
rename 044 => tests/xfs/044 (100%)
rename 044.out => tests/xfs/044.out (100%)
rename 045 => tests/xfs/045 (100%)
rename 045.out => tests/xfs/045.out (100%)
rename 046 => tests/xfs/046 (100%)
rename 046.out => tests/xfs/046.out (100%)
rename 047 => tests/xfs/047 (100%)
rename 047.out => tests/xfs/047.out (100%)
rename 048 => tests/xfs/048 (100%)
rename 048.out => tests/xfs/048.out (100%)
rename 049 => tests/xfs/049 (100%)
rename 049.out => tests/xfs/049.out (100%)
rename 050 => tests/xfs/050 (100%)
rename 050.out => tests/xfs/050.out (100%)
rename 052 => tests/xfs/052 (100%)
rename 052.out => tests/xfs/052.out (100%)
rename 054 => tests/xfs/054 (100%)
rename 054.out => tests/xfs/054.out (100%)
rename 055 => tests/xfs/055 (100%)
rename 055.out.irix => tests/xfs/055.out.irix (100%)
rename 055.out.linux => tests/xfs/055.out.linux (100%)
rename 056 => tests/xfs/056 (100%)
rename 056.out => tests/xfs/056.out (100%)
rename 057 => tests/xfs/057 (100%)
rename 057.out => tests/xfs/057.out (100%)
rename 058 => tests/xfs/058 (100%)
rename 058.out => tests/xfs/058.out (100%)
rename 059 => tests/xfs/059 (100%)
rename 059.out => tests/xfs/059.out (100%)
rename 060 => tests/xfs/060 (100%)
rename 060.out => tests/xfs/060.out (100%)
rename 061 => tests/xfs/061 (100%)
rename 061.out => tests/xfs/061.out (100%)
rename 063 => tests/xfs/063 (100%)
rename 063.out => tests/xfs/063.out (100%)
rename 064 => tests/xfs/064 (100%)
rename 064.out => tests/xfs/064.out (100%)
rename 065 => tests/xfs/065 (100%)
rename 065.out => tests/xfs/065.out (100%)
rename 066 => tests/xfs/066 (100%)
rename 066.out => tests/xfs/066.out (100%)
rename 067 => tests/xfs/067 (100%)
rename 067.out => tests/xfs/067.out (100%)
rename 071 => tests/xfs/071 (100%)
rename 071.out => tests/xfs/071.out (100%)
rename 071.out.32 => tests/xfs/071.out.32 (100%)
rename 071.out.64 => tests/xfs/071.out.64 (100%)
rename 072 => tests/xfs/072 (100%)
rename 072.out => tests/xfs/072.out (100%)
rename 073 => tests/xfs/073 (100%)
rename 073.out => tests/xfs/073.out (100%)
rename 078 => tests/xfs/078 (100%)
rename 078.out => tests/xfs/078.out (100%)
rename 080 => tests/xfs/080 (100%)
rename 080.out => tests/xfs/080.out (100%)
rename 081 => tests/xfs/081 (100%)
rename 081.out => tests/xfs/081.out (100%)
rename 081.ugquota.trans_inode => tests/xfs/081.ugquota.trans_inode (100%)
rename 082 => tests/xfs/082 (100%)
rename 082.op.irix => tests/xfs/082.op.irix (100%)
rename 082.op.linux => tests/xfs/082.op.linux (100%)
rename 082.out => tests/xfs/082.out (100%)
rename 082.trans_buf => tests/xfs/082.trans_buf (100%)
rename 082.trans_inode => tests/xfs/082.trans_inode (100%)
rename 084 => tests/xfs/084 (100%)
rename 084.out => tests/xfs/084.out (100%)
rename 085 => tests/xfs/085 (100%)
rename 085.out => tests/xfs/085.out (100%)
rename 086 => tests/xfs/086 (100%)
rename 086.out => tests/xfs/086.out (100%)
rename 087 => tests/xfs/087 (100%)
rename 087.out => tests/xfs/087.out (100%)
rename 090 => tests/xfs/090 (100%)
rename 090.out => tests/xfs/090.out (100%)
rename 092 => tests/xfs/092 (100%)
rename 092.out => tests/xfs/092.out (100%)
rename 094 => tests/xfs/094 (100%)
rename 094.out => tests/xfs/094.out (100%)
rename 095 => tests/xfs/095 (100%)
rename 095.out => tests/xfs/095.out (100%)
rename 096 => tests/xfs/096 (100%)
rename 096.external => tests/xfs/096.external (100%)
rename 096.internal => tests/xfs/096.internal (100%)
rename 103 => tests/xfs/103 (100%)
rename 103.out => tests/xfs/103.out (100%)
rename 104 => tests/xfs/104 (100%)
rename 104.out => tests/xfs/104.out (100%)
rename 106 => tests/xfs/106 (100%)
rename 106.out => tests/xfs/106.out (100%)
rename 107 => tests/xfs/107 (100%)
rename 107.out => tests/xfs/107.out (100%)
rename 108 => tests/xfs/108 (100%)
rename 108.out => tests/xfs/108.out (100%)
rename 109 => tests/xfs/109 (100%)
rename 109.out => tests/xfs/109.out (100%)
rename 110 => tests/xfs/110 (100%)
rename 110.out => tests/xfs/110.out (100%)
rename 111 => tests/xfs/111 (100%)
rename 111.out => tests/xfs/111.out (100%)
rename 114 => tests/xfs/114 (100%)
rename 114.out => tests/xfs/114.out (100%)
rename 115 => tests/xfs/115 (100%)
rename 115.out => tests/xfs/115.out (100%)
rename 116 => tests/xfs/116 (100%)
rename 116.out => tests/xfs/116.out (100%)
rename 118 => tests/xfs/118 (100%)
rename 118.out => tests/xfs/118.out (100%)
rename 119 => tests/xfs/119 (100%)
rename 119.out => tests/xfs/119.out (100%)
rename 121 => tests/xfs/121 (100%)
rename 121.out => tests/xfs/121.out (100%)
rename 122 => tests/xfs/122 (100%)
rename 122.out => tests/xfs/122.out (100%)
rename 134 => tests/xfs/134 (100%)
rename 134.out => tests/xfs/134.out (100%)
rename 136 => tests/xfs/136 (100%)
rename 136.out => tests/xfs/136.out (100%)
rename 137 => tests/xfs/137 (100%)
rename 137.out => tests/xfs/137.out (100%)
rename 138 => tests/xfs/138 (100%)
rename 138.out => tests/xfs/138.out (100%)
rename 139 => tests/xfs/139 (100%)
rename 139.out => tests/xfs/139.out (100%)
rename 140 => tests/xfs/140 (100%)
rename 140.out => tests/xfs/140.out (100%)
rename 142 => tests/xfs/142 (100%)
rename 142.out => tests/xfs/142.out (100%)
rename 143 => tests/xfs/143 (100%)
rename 143.out => tests/xfs/143.out (100%)
rename 144 => tests/xfs/144 (100%)
rename 144.out => tests/xfs/144.out (100%)
rename 145 => tests/xfs/145 (100%)
rename 145.out => tests/xfs/145.out (100%)
rename 146 => tests/xfs/146 (100%)
rename 146.out.irix => tests/xfs/146.out.irix (100%)
rename 146.out.linux => tests/xfs/146.out.linux (100%)
rename 147 => tests/xfs/147 (100%)
rename 147.out => tests/xfs/147.out (100%)
rename 148 => tests/xfs/148 (100%)
rename 148.out => tests/xfs/148.out (100%)
rename 149 => tests/xfs/149 (100%)
rename 149.out => tests/xfs/149.out (100%)
rename 150 => tests/xfs/150 (100%)
rename 150.out => tests/xfs/150.out (100%)
rename 151 => tests/xfs/151 (100%)
rename 151.out => tests/xfs/151.out (100%)
rename 152 => tests/xfs/152 (100%)
rename 152.out => tests/xfs/152.out (100%)
rename 153 => tests/xfs/153 (100%)
rename 153.out => tests/xfs/153.out (100%)
rename 154 => tests/xfs/154 (100%)
rename 154.out => tests/xfs/154.out (100%)
rename 155 => tests/xfs/155 (100%)
rename 155.out => tests/xfs/155.out (100%)
rename 156 => tests/xfs/156 (100%)
rename 156.out => tests/xfs/156.out (100%)
rename 157 => tests/xfs/157 (100%)
rename 157.out => tests/xfs/157.out (100%)
rename 158 => tests/xfs/158 (100%)
rename 158.out => tests/xfs/158.out (100%)
rename 159 => tests/xfs/159 (100%)
rename 159.out => tests/xfs/159.out (100%)
rename 160 => tests/xfs/160 (100%)
rename 160.out => tests/xfs/160.out (100%)
rename 161 => tests/xfs/161 (100%)
rename 161.out => tests/xfs/161.out (100%)
rename 162 => tests/xfs/162 (100%)
rename 162.out => tests/xfs/162.out (100%)
rename 163 => tests/xfs/163 (100%)
rename 163.out => tests/xfs/163.out (100%)
rename 164 => tests/xfs/164 (100%)
rename 164.out => tests/xfs/164.out (100%)
rename 165 => tests/xfs/165 (100%)
rename 165.out => tests/xfs/165.out (100%)
rename 166 => tests/xfs/166 (100%)
rename 166.out => tests/xfs/166.out (100%)
rename 167 => tests/xfs/167 (100%)
rename 167.out => tests/xfs/167.out (100%)
rename 168 => tests/xfs/168 (100%)
rename 168.out => tests/xfs/168.out (100%)
rename 170 => tests/xfs/170 (100%)
rename 170.out => tests/xfs/170.out (100%)
rename 171 => tests/xfs/171 (100%)
rename 171.out => tests/xfs/171.out (100%)
rename 172 => tests/xfs/172 (100%)
rename 172.out => tests/xfs/172.out (100%)
rename 173 => tests/xfs/173 (100%)
rename 173.out => tests/xfs/173.out (100%)
rename 174 => tests/xfs/174 (100%)
rename 174.out => tests/xfs/174.out (100%)
rename 175 => tests/xfs/175 (100%)
rename 175.out => tests/xfs/175.out (100%)
rename 176 => tests/xfs/176 (100%)
rename 176.out => tests/xfs/176.out (100%)
rename 178 => tests/xfs/178 (100%)
rename 178.out => tests/xfs/178.out (100%)
rename 179 => tests/xfs/179 (100%)
rename 179.out => tests/xfs/179.out (100%)
rename 180 => tests/xfs/180 (100%)
rename 180.out => tests/xfs/180.out (100%)
rename 181 => tests/xfs/181 (100%)
rename 181.out => tests/xfs/181.out (100%)
rename 182 => tests/xfs/182 (100%)
rename 182.out => tests/xfs/182.out (100%)
rename 183 => tests/xfs/183 (100%)
rename 183.out => tests/xfs/183.out (100%)
rename 185 => tests/xfs/185 (100%)
rename 185.out => tests/xfs/185.out (100%)
rename 186 => tests/xfs/186 (100%)
rename 186.out => tests/xfs/186.out (100%)
rename 187 => tests/xfs/187 (100%)
rename 187.out => tests/xfs/187.out (100%)
rename 188 => tests/xfs/188 (100%)
rename 188.out => tests/xfs/188.out (100%)
rename 189 => tests/xfs/189 (100%)
rename 189.out => tests/xfs/189.out (100%)
rename 190 => tests/xfs/190 (100%)
rename 190.out => tests/xfs/190.out (100%)
rename 191 => tests/xfs/191 (100%)
rename 191.out => tests/xfs/191.out (100%)
rename 194 => tests/xfs/194 (100%)
rename 194.out => tests/xfs/194.out (100%)
rename 195 => tests/xfs/195 (100%)
rename 195.out => tests/xfs/195.out (100%)
rename 196 => tests/xfs/196 (100%)
rename 196.out => tests/xfs/196.out (100%)
rename 197 => tests/xfs/197 (100%)
rename 197.out => tests/xfs/197.out (100%)
rename 199 => tests/xfs/199 (100%)
rename 199.out => tests/xfs/199.out (100%)
rename 200 => tests/xfs/200 (100%)
rename 200.out => tests/xfs/200.out (100%)
rename 201 => tests/xfs/201 (100%)
rename 201.out => tests/xfs/201.out (100%)
rename 202 => tests/xfs/202 (100%)
rename 202.out => tests/xfs/202.out (100%)
rename 203 => tests/xfs/203 (100%)
rename 203.out => tests/xfs/203.out (100%)
rename 205 => tests/xfs/205 (100%)
rename 205.out => tests/xfs/205.out (100%)
rename 206 => tests/xfs/206 (100%)
rename 206.out => tests/xfs/206.out (100%)
rename 216 => tests/xfs/216 (100%)
rename 216.out => tests/xfs/216.out (100%)
rename 217 => tests/xfs/217 (100%)
rename 217.out => tests/xfs/217.out (100%)
rename 220 => tests/xfs/220 (100%)
rename 220.out => tests/xfs/220.out (100%)
rename 222 => tests/xfs/222 (100%)
rename 222.out => tests/xfs/222.out (100%)
rename 227 => tests/xfs/227 (100%)
rename 227.out => tests/xfs/227.out (100%)
rename 229 => tests/xfs/229 (100%)
rename 229.out => tests/xfs/229.out (100%)
rename 238 => tests/xfs/238 (100%)
rename 238.out => tests/xfs/238.out (100%)
rename 242 => tests/xfs/242 (100%)
rename 242.out => tests/xfs/242.out (100%)
rename 244 => tests/xfs/244 (100%)
rename 244.out => tests/xfs/244.out (100%)
rename 250 => tests/xfs/250 (100%)
rename 250.out => tests/xfs/250.out (100%)
rename 253 => tests/xfs/253 (100%)
rename 253.out => tests/xfs/253.out (100%)
rename 259 => tests/xfs/259 (100%)
rename 259.out => tests/xfs/259.out (100%)
rename 261 => tests/xfs/261 (100%)
rename 261.out => tests/xfs/261.out (100%)
rename 262 => tests/xfs/262 (100%)
rename 262.out => tests/xfs/262.out (100%)
rename 266 => tests/xfs/266 (100%)
rename 266.out => tests/xfs/266.out (100%)
rename 267 => tests/xfs/267 (100%)
rename 267.out => tests/xfs/267.out (100%)
rename 268 => tests/xfs/268 (100%)
rename 268.out => tests/xfs/268.out (100%)
rename 278 => tests/xfs/278 (100%)
rename 278.out => tests/xfs/278.out (100%)
rename 279 => tests/xfs/279 (100%)
rename 279.out => tests/xfs/279.out (100%)
rename 281 => tests/xfs/281 (100%)
rename 281.out => tests/xfs/281.out (100%)
rename 282 => tests/xfs/282 (100%)
rename 282.out => tests/xfs/282.out (100%)
rename 283 => tests/xfs/283 (100%)
rename 283.out => tests/xfs/283.out (100%)
copy group => tests/xfs/group (70%)
diff --git a/check b/check
index bdf764a..41c1654 100755
--- a/check
+++ b/check
@@ -38,6 +38,7 @@ FSTYP=xfs
SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
TEST_GROUP_DIR="tests"
GENERIC_GROUP_DIR="$TEST_GROUP_DIR/generic"
+XFS_GROUP_DIR="$TEST_GROUP_DIR/xfs"
# generic initialization
iam=check
@@ -80,7 +81,7 @@ _setenvironment()
get_group_list()
{
grp=$1
- dirs=". $GENERIC_GROUP_DIR"
+ dirs=". $GENERIC_GROUP_DIR $XFS_GROUP_DIR"
for d in $dirs; do
l=$(sed -n < $d/group \
diff --git a/group b/group
index acde48e..5c9bb7f 100644
--- a/group
+++ b/group
@@ -116,192 +116,23 @@ deprecated
#
# test-group association ... one line per test
#
-003 db auto quick
-004 db auto quick
-008 rw ioctl auto quick
-009 rw ioctl auto prealloc quick
-012 rw auto quick
-016 rw auto quick
-017 mount auto quick
-018 deprecated # log logprint v2log
-019 mkfs auto quick
-021 db attr auto quick
-022 dump ioctl tape
-023 dump ioctl tape
-024 dump ioctl tape
-025 dump ioctl tape
-026 dump ioctl auto quick
-027 dump ioctl auto quick
-028 dump ioctl auto quick
-029 mkfs logprint log auto quick
-030 repair auto quick
-031 repair mkfs auto quick
-032 mkfs auto quick
-033 repair auto quick
-034 other auto quick
-035 dump ioctl tape auto
-036 dump ioctl remote tape
-037 dump ioctl remote tape
-038 dump ioctl remote tape
-039 dump ioctl remote tape
040 other auto
-041 growfs ioctl auto
-042 fsr ioctl auto
-043 dump ioctl tape
-044 other auto
-045 other auto quick
-046 dump ioctl auto quick
-047 dump ioctl auto
-048 other auto quick
-049 rw auto quick
-050 quota auto quick
051 acl udf auto quick
-052 quota db auto quick
-054 quota auto quick
-055 dump ioctl remote tape
-056 dump ioctl auto quick
-057 acl auto
-058 acl auto
-059 dump ioctl auto quick
-060 dump ioctl auto quick
-061 dump ioctl auto quick
-063 dump attr auto quick
-064 dump auto
-065 dump auto
-066 dump ioctl auto quick
-067 acl attr auto quick
068 other auto freeze dangerous
-071 rw auto
-072 rw auto prealloc quick
-073 copy auto
-078 growfs auto quick
-080 rw ioctl
-081 deprecated # log logprint quota
-082 deprecated # log logprint v2log
-084 ioctl rw auto
-085 log auto quick
-086 log v2log auto
-087 log v2log auto quota
-090 rw auto
-092 other auto quick
-094 metadata dir ioctl auto
-095 log v2log auto
-096 mkfs v2log auto quick
098 udf auto
101 udf
102 udf
-103 metadata dir ioctl auto quick
-104 growfs ioctl prealloc auto
-106 quota
-107 quota
-108 quota auto quick
-109 metadata auto
-110 repair auto
-111 ioctl
-114 parent attr
-115 parent attr
-116 quota auto quick
-118 quota auto quick
-119 log v2log auto freeze dangerous
-121 log auto quick
-122 other auto quick
-134 quota auto quick
-136 attr2
-137 metadata log auto
-138 metadata log auto
-139 metadata log auto
-140 metadata log auto
-142 dmapi auto
-143 dmapi auto
-144 dmapi auto
-145 dmapi auto
-146 dmapi auto
-147 dmapi auto
-148 repair auto
-149 repair auto
-150 dmapi auto
-151 dmapi auto
-152 dmapi auto
-153 dmapi auto
-154 dmapi auto
-155 dmapi auto
-156 dmapi auto
-157 dmapi auto
-158 dmapi auto
-159 dmapi auto
-160 dmapi auto
-161 dmapi auto
-162 dmapi auto
-163 dmapi auto
-164 rw pattern auto prealloc quick
-165 rw pattern auto prealloc quick
-166 rw metadata auto quick
-167 rw metadata auto
-168 dmapi auto
-170 rw filestreams auto quick
# the next three tests are not deterministic enough to get the
# "right" result on all platforms/configuration, so don't run
# them by default.
-171 rw filestreams
-172 rw filestreams
-173 rw filestreams
-174 rw filestreams auto
-175 dmapi auto
-176 dmapi auto
177 rw other auto
-178 mkfs other auto
-179 metadata rw auto
-180 metadata rw auto
-181 log auto quick
-182 metadata rw auto
-183 rw other auto quick
-185 dmapi auto
-186 attr auto quick
-187 attr auto quick
-188 ci dir auto
-189 mount auto quick
-190 rw auto quick
-191 nfs4acl auto
-194 rw auto
-195 ioctl dump auto quick
-196 quota auto quick
-197 dir auto quick
-199 mount auto quick
-200 mount auto quick
-201 metadata auto quick
-202 repair auto quick
-203 ioctl auto
-205 metadata rw auto
-206 growfs auto quick
-216 log metadata auto quick
-217 log metadata auto
218 auto fsr quick
-220 auto quota quick
-222 auto fsr ioctl quick
-227 auto fsr
-229 auto rw
-238 auto quick metadata ioctl
-242 auto quick prealloc
243 auto quick prealloc
-244 auto quota quick
-250 auto quick rw prealloc metadata
252 auto quick prealloc
-253 auto quick
254 auto quick
-259 auto quick
-261 auto quick quota
-262 auto quick quota
264 auto
265 auto
-266 dump ioctl auto quick
-267 dump ioctl tape
-268 dump ioctl tape
271 auto rw quick
272 auto enospc rw
276 auto rw metadata
-278 repair auto
-279 auto mkfs
-281 dump ioctl auto quick
-282 dump ioctl auto quick
-283 dump ioctl auto quick
284 auto
diff --git a/003 b/tests/xfs/003
similarity index 100%
rename from 003
rename to tests/xfs/003
diff --git a/003.out b/tests/xfs/003.out
similarity index 100%
rename from 003.out
rename to tests/xfs/003.out
diff --git a/004 b/tests/xfs/004
similarity index 100%
rename from 004
rename to tests/xfs/004
diff --git a/004.out b/tests/xfs/004.out
similarity index 100%
rename from 004.out
rename to tests/xfs/004.out
diff --git a/008 b/tests/xfs/008
similarity index 100%
rename from 008
rename to tests/xfs/008
diff --git a/008.out b/tests/xfs/008.out
similarity index 100%
rename from 008.out
rename to tests/xfs/008.out
diff --git a/009 b/tests/xfs/009
similarity index 100%
rename from 009
rename to tests/xfs/009
diff --git a/009.out b/tests/xfs/009.out
similarity index 100%
rename from 009.out
rename to tests/xfs/009.out
diff --git a/012 b/tests/xfs/012
similarity index 100%
rename from 012
rename to tests/xfs/012
diff --git a/012.out b/tests/xfs/012.out
similarity index 100%
rename from 012.out
rename to tests/xfs/012.out
diff --git a/016 b/tests/xfs/016
similarity index 100%
rename from 016
rename to tests/xfs/016
diff --git a/016.out b/tests/xfs/016.out
similarity index 100%
rename from 016.out
rename to tests/xfs/016.out
diff --git a/017 b/tests/xfs/017
similarity index 100%
rename from 017
rename to tests/xfs/017
diff --git a/017.out b/tests/xfs/017.out
similarity index 100%
rename from 017.out
rename to tests/xfs/017.out
diff --git a/018 b/tests/xfs/018
similarity index 100%
rename from 018
rename to tests/xfs/018
diff --git a/018.op.irix b/tests/xfs/018.op.irix
similarity index 100%
rename from 018.op.irix
rename to tests/xfs/018.op.irix
diff --git a/018.op.linux b/tests/xfs/018.op.linux
similarity index 100%
rename from 018.op.linux
rename to tests/xfs/018.op.linux
diff --git a/018.out b/tests/xfs/018.out
similarity index 100%
rename from 018.out
rename to tests/xfs/018.out
diff --git a/018.trans_buf b/tests/xfs/018.trans_buf
similarity index 100%
rename from 018.trans_buf
rename to tests/xfs/018.trans_buf
diff --git a/018.trans_inode b/tests/xfs/018.trans_inode
similarity index 100%
rename from 018.trans_inode
rename to tests/xfs/018.trans_inode
diff --git a/019 b/tests/xfs/019
similarity index 100%
rename from 019
rename to tests/xfs/019
diff --git a/019.out b/tests/xfs/019.out
similarity index 100%
rename from 019.out
rename to tests/xfs/019.out
diff --git a/021 b/tests/xfs/021
similarity index 100%
rename from 021
rename to tests/xfs/021
diff --git a/021.out b/tests/xfs/021.out
similarity index 100%
rename from 021.out
rename to tests/xfs/021.out
diff --git a/022 b/tests/xfs/022
similarity index 100%
rename from 022
rename to tests/xfs/022
diff --git a/022.out.irix b/tests/xfs/022.out.irix
similarity index 100%
rename from 022.out.irix
rename to tests/xfs/022.out.irix
diff --git a/022.out.linux b/tests/xfs/022.out.linux
similarity index 100%
rename from 022.out.linux
rename to tests/xfs/022.out.linux
diff --git a/023 b/tests/xfs/023
similarity index 100%
rename from 023
rename to tests/xfs/023
diff --git a/023.out.irix b/tests/xfs/023.out.irix
similarity index 100%
rename from 023.out.irix
rename to tests/xfs/023.out.irix
diff --git a/023.out.linux b/tests/xfs/023.out.linux
similarity index 100%
rename from 023.out.linux
rename to tests/xfs/023.out.linux
diff --git a/024 b/tests/xfs/024
similarity index 100%
rename from 024
rename to tests/xfs/024
diff --git a/024.out b/tests/xfs/024.out
similarity index 100%
rename from 024.out
rename to tests/xfs/024.out
diff --git a/025 b/tests/xfs/025
similarity index 100%
rename from 025
rename to tests/xfs/025
diff --git a/025.out b/tests/xfs/025.out
similarity index 100%
rename from 025.out
rename to tests/xfs/025.out
diff --git a/026 b/tests/xfs/026
similarity index 100%
rename from 026
rename to tests/xfs/026
diff --git a/026.out b/tests/xfs/026.out
similarity index 100%
rename from 026.out
rename to tests/xfs/026.out
diff --git a/027 b/tests/xfs/027
similarity index 100%
rename from 027
rename to tests/xfs/027
diff --git a/027.out b/tests/xfs/027.out
similarity index 100%
rename from 027.out
rename to tests/xfs/027.out
diff --git a/028 b/tests/xfs/028
similarity index 100%
rename from 028
rename to tests/xfs/028
diff --git a/028.out b/tests/xfs/028.out
similarity index 100%
rename from 028.out
rename to tests/xfs/028.out
diff --git a/029 b/tests/xfs/029
similarity index 100%
rename from 029
rename to tests/xfs/029
diff --git a/029.out b/tests/xfs/029.out
similarity index 100%
rename from 029.out
rename to tests/xfs/029.out
diff --git a/030 b/tests/xfs/030
similarity index 100%
rename from 030
rename to tests/xfs/030
diff --git a/030.out.irix b/tests/xfs/030.out.irix
similarity index 100%
rename from 030.out.irix
rename to tests/xfs/030.out.irix
diff --git a/030.out.linux b/tests/xfs/030.out.linux
similarity index 100%
rename from 030.out.linux
rename to tests/xfs/030.out.linux
diff --git a/031 b/tests/xfs/031
similarity index 100%
rename from 031
rename to tests/xfs/031
diff --git a/031.out.irix b/tests/xfs/031.out.irix
similarity index 100%
rename from 031.out.irix
rename to tests/xfs/031.out.irix
diff --git a/031.out.linux b/tests/xfs/031.out.linux
similarity index 100%
rename from 031.out.linux
rename to tests/xfs/031.out.linux
diff --git a/032 b/tests/xfs/032
similarity index 100%
rename from 032
rename to tests/xfs/032
diff --git a/032.out b/tests/xfs/032.out
similarity index 100%
rename from 032.out
rename to tests/xfs/032.out
diff --git a/033 b/tests/xfs/033
similarity index 100%
rename from 033
rename to tests/xfs/033
diff --git a/033.out.irix b/tests/xfs/033.out.irix
similarity index 100%
rename from 033.out.irix
rename to tests/xfs/033.out.irix
diff --git a/033.out.linux b/tests/xfs/033.out.linux
similarity index 100%
rename from 033.out.linux
rename to tests/xfs/033.out.linux
diff --git a/034 b/tests/xfs/034
similarity index 100%
rename from 034
rename to tests/xfs/034
diff --git a/034.out b/tests/xfs/034.out
similarity index 100%
rename from 034.out
rename to tests/xfs/034.out
diff --git a/035 b/tests/xfs/035
similarity index 100%
rename from 035
rename to tests/xfs/035
diff --git a/035.out.irix b/tests/xfs/035.out.irix
similarity index 100%
rename from 035.out.irix
rename to tests/xfs/035.out.irix
diff --git a/035.out.linux b/tests/xfs/035.out.linux
similarity index 100%
rename from 035.out.linux
rename to tests/xfs/035.out.linux
diff --git a/036 b/tests/xfs/036
similarity index 100%
rename from 036
rename to tests/xfs/036
diff --git a/036.out.irix b/tests/xfs/036.out.irix
similarity index 100%
rename from 036.out.irix
rename to tests/xfs/036.out.irix
diff --git a/036.out.linux b/tests/xfs/036.out.linux
similarity index 100%
rename from 036.out.linux
rename to tests/xfs/036.out.linux
diff --git a/037 b/tests/xfs/037
similarity index 100%
rename from 037
rename to tests/xfs/037
diff --git a/037.out b/tests/xfs/037.out
similarity index 100%
rename from 037.out
rename to tests/xfs/037.out
diff --git a/038 b/tests/xfs/038
similarity index 100%
rename from 038
rename to tests/xfs/038
diff --git a/038.out b/tests/xfs/038.out
similarity index 100%
rename from 038.out
rename to tests/xfs/038.out
diff --git a/039 b/tests/xfs/039
similarity index 100%
rename from 039
rename to tests/xfs/039
diff --git a/039.out.irix b/tests/xfs/039.out.irix
similarity index 100%
rename from 039.out.irix
rename to tests/xfs/039.out.irix
diff --git a/039.out.linux b/tests/xfs/039.out.linux
similarity index 100%
rename from 039.out.linux
rename to tests/xfs/039.out.linux
diff --git a/041 b/tests/xfs/041
similarity index 100%
rename from 041
rename to tests/xfs/041
diff --git a/041.out b/tests/xfs/041.out
similarity index 100%
rename from 041.out
rename to tests/xfs/041.out
diff --git a/042 b/tests/xfs/042
similarity index 100%
rename from 042
rename to tests/xfs/042
diff --git a/042.out b/tests/xfs/042.out
similarity index 100%
rename from 042.out
rename to tests/xfs/042.out
diff --git a/043 b/tests/xfs/043
similarity index 100%
rename from 043
rename to tests/xfs/043
diff --git a/043.out.irix b/tests/xfs/043.out.irix
similarity index 100%
rename from 043.out.irix
rename to tests/xfs/043.out.irix
diff --git a/043.out.linux b/tests/xfs/043.out.linux
similarity index 100%
rename from 043.out.linux
rename to tests/xfs/043.out.linux
diff --git a/044 b/tests/xfs/044
similarity index 100%
rename from 044
rename to tests/xfs/044
diff --git a/044.out b/tests/xfs/044.out
similarity index 100%
rename from 044.out
rename to tests/xfs/044.out
diff --git a/045 b/tests/xfs/045
similarity index 100%
rename from 045
rename to tests/xfs/045
diff --git a/045.out b/tests/xfs/045.out
similarity index 100%
rename from 045.out
rename to tests/xfs/045.out
diff --git a/046 b/tests/xfs/046
similarity index 100%
rename from 046
rename to tests/xfs/046
diff --git a/046.out b/tests/xfs/046.out
similarity index 100%
rename from 046.out
rename to tests/xfs/046.out
diff --git a/047 b/tests/xfs/047
similarity index 100%
rename from 047
rename to tests/xfs/047
diff --git a/047.out b/tests/xfs/047.out
similarity index 100%
rename from 047.out
rename to tests/xfs/047.out
diff --git a/048 b/tests/xfs/048
similarity index 100%
rename from 048
rename to tests/xfs/048
diff --git a/048.out b/tests/xfs/048.out
similarity index 100%
rename from 048.out
rename to tests/xfs/048.out
diff --git a/049 b/tests/xfs/049
similarity index 100%
rename from 049
rename to tests/xfs/049
diff --git a/049.out b/tests/xfs/049.out
similarity index 100%
rename from 049.out
rename to tests/xfs/049.out
diff --git a/050 b/tests/xfs/050
similarity index 100%
rename from 050
rename to tests/xfs/050
diff --git a/050.out b/tests/xfs/050.out
similarity index 100%
rename from 050.out
rename to tests/xfs/050.out
diff --git a/052 b/tests/xfs/052
similarity index 100%
rename from 052
rename to tests/xfs/052
diff --git a/052.out b/tests/xfs/052.out
similarity index 100%
rename from 052.out
rename to tests/xfs/052.out
diff --git a/054 b/tests/xfs/054
similarity index 100%
rename from 054
rename to tests/xfs/054
diff --git a/054.out b/tests/xfs/054.out
similarity index 100%
rename from 054.out
rename to tests/xfs/054.out
diff --git a/055 b/tests/xfs/055
similarity index 100%
rename from 055
rename to tests/xfs/055
diff --git a/055.out.irix b/tests/xfs/055.out.irix
similarity index 100%
rename from 055.out.irix
rename to tests/xfs/055.out.irix
diff --git a/055.out.linux b/tests/xfs/055.out.linux
similarity index 100%
rename from 055.out.linux
rename to tests/xfs/055.out.linux
diff --git a/056 b/tests/xfs/056
similarity index 100%
rename from 056
rename to tests/xfs/056
diff --git a/056.out b/tests/xfs/056.out
similarity index 100%
rename from 056.out
rename to tests/xfs/056.out
diff --git a/057 b/tests/xfs/057
similarity index 100%
rename from 057
rename to tests/xfs/057
diff --git a/057.out b/tests/xfs/057.out
similarity index 100%
rename from 057.out
rename to tests/xfs/057.out
diff --git a/058 b/tests/xfs/058
similarity index 100%
rename from 058
rename to tests/xfs/058
diff --git a/058.out b/tests/xfs/058.out
similarity index 100%
rename from 058.out
rename to tests/xfs/058.out
diff --git a/059 b/tests/xfs/059
similarity index 100%
rename from 059
rename to tests/xfs/059
diff --git a/059.out b/tests/xfs/059.out
similarity index 100%
rename from 059.out
rename to tests/xfs/059.out
diff --git a/060 b/tests/xfs/060
similarity index 100%
rename from 060
rename to tests/xfs/060
diff --git a/060.out b/tests/xfs/060.out
similarity index 100%
rename from 060.out
rename to tests/xfs/060.out
diff --git a/061 b/tests/xfs/061
similarity index 100%
rename from 061
rename to tests/xfs/061
diff --git a/061.out b/tests/xfs/061.out
similarity index 100%
rename from 061.out
rename to tests/xfs/061.out
diff --git a/063 b/tests/xfs/063
similarity index 100%
rename from 063
rename to tests/xfs/063
diff --git a/063.out b/tests/xfs/063.out
similarity index 100%
rename from 063.out
rename to tests/xfs/063.out
diff --git a/064 b/tests/xfs/064
similarity index 100%
rename from 064
rename to tests/xfs/064
diff --git a/064.out b/tests/xfs/064.out
similarity index 100%
rename from 064.out
rename to tests/xfs/064.out
diff --git a/065 b/tests/xfs/065
similarity index 100%
rename from 065
rename to tests/xfs/065
diff --git a/065.out b/tests/xfs/065.out
similarity index 100%
rename from 065.out
rename to tests/xfs/065.out
diff --git a/066 b/tests/xfs/066
similarity index 100%
rename from 066
rename to tests/xfs/066
diff --git a/066.out b/tests/xfs/066.out
similarity index 100%
rename from 066.out
rename to tests/xfs/066.out
diff --git a/067 b/tests/xfs/067
similarity index 100%
rename from 067
rename to tests/xfs/067
diff --git a/067.out b/tests/xfs/067.out
similarity index 100%
rename from 067.out
rename to tests/xfs/067.out
diff --git a/071 b/tests/xfs/071
similarity index 100%
rename from 071
rename to tests/xfs/071
diff --git a/071.out b/tests/xfs/071.out
similarity index 100%
rename from 071.out
rename to tests/xfs/071.out
diff --git a/071.out.32 b/tests/xfs/071.out.32
similarity index 100%
rename from 071.out.32
rename to tests/xfs/071.out.32
diff --git a/071.out.64 b/tests/xfs/071.out.64
similarity index 100%
rename from 071.out.64
rename to tests/xfs/071.out.64
diff --git a/072 b/tests/xfs/072
similarity index 100%
rename from 072
rename to tests/xfs/072
diff --git a/072.out b/tests/xfs/072.out
similarity index 100%
rename from 072.out
rename to tests/xfs/072.out
diff --git a/073 b/tests/xfs/073
similarity index 100%
rename from 073
rename to tests/xfs/073
diff --git a/073.out b/tests/xfs/073.out
similarity index 100%
rename from 073.out
rename to tests/xfs/073.out
diff --git a/078 b/tests/xfs/078
similarity index 100%
rename from 078
rename to tests/xfs/078
diff --git a/078.out b/tests/xfs/078.out
similarity index 100%
rename from 078.out
rename to tests/xfs/078.out
diff --git a/080 b/tests/xfs/080
similarity index 100%
rename from 080
rename to tests/xfs/080
diff --git a/080.out b/tests/xfs/080.out
similarity index 100%
rename from 080.out
rename to tests/xfs/080.out
diff --git a/081 b/tests/xfs/081
similarity index 100%
rename from 081
rename to tests/xfs/081
diff --git a/081.out b/tests/xfs/081.out
similarity index 100%
rename from 081.out
rename to tests/xfs/081.out
diff --git a/081.ugquota.trans_inode b/tests/xfs/081.ugquota.trans_inode
similarity index 100%
rename from 081.ugquota.trans_inode
rename to tests/xfs/081.ugquota.trans_inode
diff --git a/082 b/tests/xfs/082
similarity index 100%
rename from 082
rename to tests/xfs/082
diff --git a/082.op.irix b/tests/xfs/082.op.irix
similarity index 100%
rename from 082.op.irix
rename to tests/xfs/082.op.irix
diff --git a/082.op.linux b/tests/xfs/082.op.linux
similarity index 100%
rename from 082.op.linux
rename to tests/xfs/082.op.linux
diff --git a/082.out b/tests/xfs/082.out
similarity index 100%
rename from 082.out
rename to tests/xfs/082.out
diff --git a/082.trans_buf b/tests/xfs/082.trans_buf
similarity index 100%
rename from 082.trans_buf
rename to tests/xfs/082.trans_buf
diff --git a/082.trans_inode b/tests/xfs/082.trans_inode
similarity index 100%
rename from 082.trans_inode
rename to tests/xfs/082.trans_inode
diff --git a/084 b/tests/xfs/084
similarity index 100%
rename from 084
rename to tests/xfs/084
diff --git a/084.out b/tests/xfs/084.out
similarity index 100%
rename from 084.out
rename to tests/xfs/084.out
diff --git a/085 b/tests/xfs/085
similarity index 100%
rename from 085
rename to tests/xfs/085
diff --git a/085.out b/tests/xfs/085.out
similarity index 100%
rename from 085.out
rename to tests/xfs/085.out
diff --git a/086 b/tests/xfs/086
similarity index 100%
rename from 086
rename to tests/xfs/086
diff --git a/086.out b/tests/xfs/086.out
similarity index 100%
rename from 086.out
rename to tests/xfs/086.out
diff --git a/087 b/tests/xfs/087
similarity index 100%
rename from 087
rename to tests/xfs/087
diff --git a/087.out b/tests/xfs/087.out
similarity index 100%
rename from 087.out
rename to tests/xfs/087.out
diff --git a/090 b/tests/xfs/090
similarity index 100%
rename from 090
rename to tests/xfs/090
diff --git a/090.out b/tests/xfs/090.out
similarity index 100%
rename from 090.out
rename to tests/xfs/090.out
diff --git a/092 b/tests/xfs/092
similarity index 100%
rename from 092
rename to tests/xfs/092
diff --git a/092.out b/tests/xfs/092.out
similarity index 100%
rename from 092.out
rename to tests/xfs/092.out
diff --git a/094 b/tests/xfs/094
similarity index 100%
rename from 094
rename to tests/xfs/094
diff --git a/094.out b/tests/xfs/094.out
similarity index 100%
rename from 094.out
rename to tests/xfs/094.out
diff --git a/095 b/tests/xfs/095
similarity index 100%
rename from 095
rename to tests/xfs/095
diff --git a/095.out b/tests/xfs/095.out
similarity index 100%
rename from 095.out
rename to tests/xfs/095.out
diff --git a/096 b/tests/xfs/096
similarity index 100%
rename from 096
rename to tests/xfs/096
diff --git a/096.external b/tests/xfs/096.external
similarity index 100%
rename from 096.external
rename to tests/xfs/096.external
diff --git a/096.internal b/tests/xfs/096.internal
similarity index 100%
rename from 096.internal
rename to tests/xfs/096.internal
diff --git a/103 b/tests/xfs/103
similarity index 100%
rename from 103
rename to tests/xfs/103
diff --git a/103.out b/tests/xfs/103.out
similarity index 100%
rename from 103.out
rename to tests/xfs/103.out
diff --git a/104 b/tests/xfs/104
similarity index 100%
rename from 104
rename to tests/xfs/104
diff --git a/104.out b/tests/xfs/104.out
similarity index 100%
rename from 104.out
rename to tests/xfs/104.out
diff --git a/106 b/tests/xfs/106
similarity index 100%
rename from 106
rename to tests/xfs/106
diff --git a/106.out b/tests/xfs/106.out
similarity index 100%
rename from 106.out
rename to tests/xfs/106.out
diff --git a/107 b/tests/xfs/107
similarity index 100%
rename from 107
rename to tests/xfs/107
diff --git a/107.out b/tests/xfs/107.out
similarity index 100%
rename from 107.out
rename to tests/xfs/107.out
diff --git a/108 b/tests/xfs/108
similarity index 100%
rename from 108
rename to tests/xfs/108
diff --git a/108.out b/tests/xfs/108.out
similarity index 100%
rename from 108.out
rename to tests/xfs/108.out
diff --git a/109 b/tests/xfs/109
similarity index 100%
rename from 109
rename to tests/xfs/109
diff --git a/109.out b/tests/xfs/109.out
similarity index 100%
rename from 109.out
rename to tests/xfs/109.out
diff --git a/110 b/tests/xfs/110
similarity index 100%
rename from 110
rename to tests/xfs/110
diff --git a/110.out b/tests/xfs/110.out
similarity index 100%
rename from 110.out
rename to tests/xfs/110.out
diff --git a/111 b/tests/xfs/111
similarity index 100%
rename from 111
rename to tests/xfs/111
diff --git a/111.out b/tests/xfs/111.out
similarity index 100%
rename from 111.out
rename to tests/xfs/111.out
diff --git a/114 b/tests/xfs/114
similarity index 100%
rename from 114
rename to tests/xfs/114
diff --git a/114.out b/tests/xfs/114.out
similarity index 100%
rename from 114.out
rename to tests/xfs/114.out
diff --git a/115 b/tests/xfs/115
similarity index 100%
rename from 115
rename to tests/xfs/115
diff --git a/115.out b/tests/xfs/115.out
similarity index 100%
rename from 115.out
rename to tests/xfs/115.out
diff --git a/116 b/tests/xfs/116
similarity index 100%
rename from 116
rename to tests/xfs/116
diff --git a/116.out b/tests/xfs/116.out
similarity index 100%
rename from 116.out
rename to tests/xfs/116.out
diff --git a/118 b/tests/xfs/118
similarity index 100%
rename from 118
rename to tests/xfs/118
diff --git a/118.out b/tests/xfs/118.out
similarity index 100%
rename from 118.out
rename to tests/xfs/118.out
diff --git a/119 b/tests/xfs/119
similarity index 100%
rename from 119
rename to tests/xfs/119
diff --git a/119.out b/tests/xfs/119.out
similarity index 100%
rename from 119.out
rename to tests/xfs/119.out
diff --git a/121 b/tests/xfs/121
similarity index 100%
rename from 121
rename to tests/xfs/121
diff --git a/121.out b/tests/xfs/121.out
similarity index 100%
rename from 121.out
rename to tests/xfs/121.out
diff --git a/122 b/tests/xfs/122
similarity index 100%
rename from 122
rename to tests/xfs/122
diff --git a/122.out b/tests/xfs/122.out
similarity index 100%
rename from 122.out
rename to tests/xfs/122.out
diff --git a/134 b/tests/xfs/134
similarity index 100%
rename from 134
rename to tests/xfs/134
diff --git a/134.out b/tests/xfs/134.out
similarity index 100%
rename from 134.out
rename to tests/xfs/134.out
diff --git a/136 b/tests/xfs/136
similarity index 100%
rename from 136
rename to tests/xfs/136
diff --git a/136.out b/tests/xfs/136.out
similarity index 100%
rename from 136.out
rename to tests/xfs/136.out
diff --git a/137 b/tests/xfs/137
similarity index 100%
rename from 137
rename to tests/xfs/137
diff --git a/137.out b/tests/xfs/137.out
similarity index 100%
rename from 137.out
rename to tests/xfs/137.out
diff --git a/138 b/tests/xfs/138
similarity index 100%
rename from 138
rename to tests/xfs/138
diff --git a/138.out b/tests/xfs/138.out
similarity index 100%
rename from 138.out
rename to tests/xfs/138.out
diff --git a/139 b/tests/xfs/139
similarity index 100%
rename from 139
rename to tests/xfs/139
diff --git a/139.out b/tests/xfs/139.out
similarity index 100%
rename from 139.out
rename to tests/xfs/139.out
diff --git a/140 b/tests/xfs/140
similarity index 100%
rename from 140
rename to tests/xfs/140
diff --git a/140.out b/tests/xfs/140.out
similarity index 100%
rename from 140.out
rename to tests/xfs/140.out
diff --git a/142 b/tests/xfs/142
similarity index 100%
rename from 142
rename to tests/xfs/142
diff --git a/142.out b/tests/xfs/142.out
similarity index 100%
rename from 142.out
rename to tests/xfs/142.out
diff --git a/143 b/tests/xfs/143
similarity index 100%
rename from 143
rename to tests/xfs/143
diff --git a/143.out b/tests/xfs/143.out
similarity index 100%
rename from 143.out
rename to tests/xfs/143.out
diff --git a/144 b/tests/xfs/144
similarity index 100%
rename from 144
rename to tests/xfs/144
diff --git a/144.out b/tests/xfs/144.out
similarity index 100%
rename from 144.out
rename to tests/xfs/144.out
diff --git a/145 b/tests/xfs/145
similarity index 100%
rename from 145
rename to tests/xfs/145
diff --git a/145.out b/tests/xfs/145.out
similarity index 100%
rename from 145.out
rename to tests/xfs/145.out
diff --git a/146 b/tests/xfs/146
similarity index 100%
rename from 146
rename to tests/xfs/146
diff --git a/146.out.irix b/tests/xfs/146.out.irix
similarity index 100%
rename from 146.out.irix
rename to tests/xfs/146.out.irix
diff --git a/146.out.linux b/tests/xfs/146.out.linux
similarity index 100%
rename from 146.out.linux
rename to tests/xfs/146.out.linux
diff --git a/147 b/tests/xfs/147
similarity index 100%
rename from 147
rename to tests/xfs/147
diff --git a/147.out b/tests/xfs/147.out
similarity index 100%
rename from 147.out
rename to tests/xfs/147.out
diff --git a/148 b/tests/xfs/148
similarity index 100%
rename from 148
rename to tests/xfs/148
diff --git a/148.out b/tests/xfs/148.out
similarity index 100%
rename from 148.out
rename to tests/xfs/148.out
diff --git a/149 b/tests/xfs/149
similarity index 100%
rename from 149
rename to tests/xfs/149
diff --git a/149.out b/tests/xfs/149.out
similarity index 100%
rename from 149.out
rename to tests/xfs/149.out
diff --git a/150 b/tests/xfs/150
similarity index 100%
rename from 150
rename to tests/xfs/150
diff --git a/150.out b/tests/xfs/150.out
similarity index 100%
rename from 150.out
rename to tests/xfs/150.out
diff --git a/151 b/tests/xfs/151
similarity index 100%
rename from 151
rename to tests/xfs/151
diff --git a/151.out b/tests/xfs/151.out
similarity index 100%
rename from 151.out
rename to tests/xfs/151.out
diff --git a/152 b/tests/xfs/152
similarity index 100%
rename from 152
rename to tests/xfs/152
diff --git a/152.out b/tests/xfs/152.out
similarity index 100%
rename from 152.out
rename to tests/xfs/152.out
diff --git a/153 b/tests/xfs/153
similarity index 100%
rename from 153
rename to tests/xfs/153
diff --git a/153.out b/tests/xfs/153.out
similarity index 100%
rename from 153.out
rename to tests/xfs/153.out
diff --git a/154 b/tests/xfs/154
similarity index 100%
rename from 154
rename to tests/xfs/154
diff --git a/154.out b/tests/xfs/154.out
similarity index 100%
rename from 154.out
rename to tests/xfs/154.out
diff --git a/155 b/tests/xfs/155
similarity index 100%
rename from 155
rename to tests/xfs/155
diff --git a/155.out b/tests/xfs/155.out
similarity index 100%
rename from 155.out
rename to tests/xfs/155.out
diff --git a/156 b/tests/xfs/156
similarity index 100%
rename from 156
rename to tests/xfs/156
diff --git a/156.out b/tests/xfs/156.out
similarity index 100%
rename from 156.out
rename to tests/xfs/156.out
diff --git a/157 b/tests/xfs/157
similarity index 100%
rename from 157
rename to tests/xfs/157
diff --git a/157.out b/tests/xfs/157.out
similarity index 100%
rename from 157.out
rename to tests/xfs/157.out
diff --git a/158 b/tests/xfs/158
similarity index 100%
rename from 158
rename to tests/xfs/158
diff --git a/158.out b/tests/xfs/158.out
similarity index 100%
rename from 158.out
rename to tests/xfs/158.out
diff --git a/159 b/tests/xfs/159
similarity index 100%
rename from 159
rename to tests/xfs/159
diff --git a/159.out b/tests/xfs/159.out
similarity index 100%
rename from 159.out
rename to tests/xfs/159.out
diff --git a/160 b/tests/xfs/160
similarity index 100%
rename from 160
rename to tests/xfs/160
diff --git a/160.out b/tests/xfs/160.out
similarity index 100%
rename from 160.out
rename to tests/xfs/160.out
diff --git a/161 b/tests/xfs/161
similarity index 100%
rename from 161
rename to tests/xfs/161
diff --git a/161.out b/tests/xfs/161.out
similarity index 100%
rename from 161.out
rename to tests/xfs/161.out
diff --git a/162 b/tests/xfs/162
similarity index 100%
rename from 162
rename to tests/xfs/162
diff --git a/162.out b/tests/xfs/162.out
similarity index 100%
rename from 162.out
rename to tests/xfs/162.out
diff --git a/163 b/tests/xfs/163
similarity index 100%
rename from 163
rename to tests/xfs/163
diff --git a/163.out b/tests/xfs/163.out
similarity index 100%
rename from 163.out
rename to tests/xfs/163.out
diff --git a/164 b/tests/xfs/164
similarity index 100%
rename from 164
rename to tests/xfs/164
diff --git a/164.out b/tests/xfs/164.out
similarity index 100%
rename from 164.out
rename to tests/xfs/164.out
diff --git a/165 b/tests/xfs/165
similarity index 100%
rename from 165
rename to tests/xfs/165
diff --git a/165.out b/tests/xfs/165.out
similarity index 100%
rename from 165.out
rename to tests/xfs/165.out
diff --git a/166 b/tests/xfs/166
similarity index 100%
rename from 166
rename to tests/xfs/166
diff --git a/166.out b/tests/xfs/166.out
similarity index 100%
rename from 166.out
rename to tests/xfs/166.out
diff --git a/167 b/tests/xfs/167
similarity index 100%
rename from 167
rename to tests/xfs/167
diff --git a/167.out b/tests/xfs/167.out
similarity index 100%
rename from 167.out
rename to tests/xfs/167.out
diff --git a/168 b/tests/xfs/168
similarity index 100%
rename from 168
rename to tests/xfs/168
diff --git a/168.out b/tests/xfs/168.out
similarity index 100%
rename from 168.out
rename to tests/xfs/168.out
diff --git a/170 b/tests/xfs/170
similarity index 100%
rename from 170
rename to tests/xfs/170
diff --git a/170.out b/tests/xfs/170.out
similarity index 100%
rename from 170.out
rename to tests/xfs/170.out
diff --git a/171 b/tests/xfs/171
similarity index 100%
rename from 171
rename to tests/xfs/171
diff --git a/171.out b/tests/xfs/171.out
similarity index 100%
rename from 171.out
rename to tests/xfs/171.out
diff --git a/172 b/tests/xfs/172
similarity index 100%
rename from 172
rename to tests/xfs/172
diff --git a/172.out b/tests/xfs/172.out
similarity index 100%
rename from 172.out
rename to tests/xfs/172.out
diff --git a/173 b/tests/xfs/173
similarity index 100%
rename from 173
rename to tests/xfs/173
diff --git a/173.out b/tests/xfs/173.out
similarity index 100%
rename from 173.out
rename to tests/xfs/173.out
diff --git a/174 b/tests/xfs/174
similarity index 100%
rename from 174
rename to tests/xfs/174
diff --git a/174.out b/tests/xfs/174.out
similarity index 100%
rename from 174.out
rename to tests/xfs/174.out
diff --git a/175 b/tests/xfs/175
similarity index 100%
rename from 175
rename to tests/xfs/175
diff --git a/175.out b/tests/xfs/175.out
similarity index 100%
rename from 175.out
rename to tests/xfs/175.out
diff --git a/176 b/tests/xfs/176
similarity index 100%
rename from 176
rename to tests/xfs/176
diff --git a/176.out b/tests/xfs/176.out
similarity index 100%
rename from 176.out
rename to tests/xfs/176.out
diff --git a/178 b/tests/xfs/178
similarity index 100%
rename from 178
rename to tests/xfs/178
diff --git a/178.out b/tests/xfs/178.out
similarity index 100%
rename from 178.out
rename to tests/xfs/178.out
diff --git a/179 b/tests/xfs/179
similarity index 100%
rename from 179
rename to tests/xfs/179
diff --git a/179.out b/tests/xfs/179.out
similarity index 100%
rename from 179.out
rename to tests/xfs/179.out
diff --git a/180 b/tests/xfs/180
similarity index 100%
rename from 180
rename to tests/xfs/180
diff --git a/180.out b/tests/xfs/180.out
similarity index 100%
rename from 180.out
rename to tests/xfs/180.out
diff --git a/181 b/tests/xfs/181
similarity index 100%
rename from 181
rename to tests/xfs/181
diff --git a/181.out b/tests/xfs/181.out
similarity index 100%
rename from 181.out
rename to tests/xfs/181.out
diff --git a/182 b/tests/xfs/182
similarity index 100%
rename from 182
rename to tests/xfs/182
diff --git a/182.out b/tests/xfs/182.out
similarity index 100%
rename from 182.out
rename to tests/xfs/182.out
diff --git a/183 b/tests/xfs/183
similarity index 100%
rename from 183
rename to tests/xfs/183
diff --git a/183.out b/tests/xfs/183.out
similarity index 100%
rename from 183.out
rename to tests/xfs/183.out
diff --git a/185 b/tests/xfs/185
similarity index 100%
rename from 185
rename to tests/xfs/185
diff --git a/185.out b/tests/xfs/185.out
similarity index 100%
rename from 185.out
rename to tests/xfs/185.out
diff --git a/186 b/tests/xfs/186
similarity index 100%
rename from 186
rename to tests/xfs/186
diff --git a/186.out b/tests/xfs/186.out
similarity index 100%
rename from 186.out
rename to tests/xfs/186.out
diff --git a/187 b/tests/xfs/187
similarity index 100%
rename from 187
rename to tests/xfs/187
diff --git a/187.out b/tests/xfs/187.out
similarity index 100%
rename from 187.out
rename to tests/xfs/187.out
diff --git a/188 b/tests/xfs/188
similarity index 100%
rename from 188
rename to tests/xfs/188
diff --git a/188.out b/tests/xfs/188.out
similarity index 100%
rename from 188.out
rename to tests/xfs/188.out
diff --git a/189 b/tests/xfs/189
similarity index 100%
rename from 189
rename to tests/xfs/189
diff --git a/189.out b/tests/xfs/189.out
similarity index 100%
rename from 189.out
rename to tests/xfs/189.out
diff --git a/190 b/tests/xfs/190
similarity index 100%
rename from 190
rename to tests/xfs/190
diff --git a/190.out b/tests/xfs/190.out
similarity index 100%
rename from 190.out
rename to tests/xfs/190.out
diff --git a/191 b/tests/xfs/191
similarity index 100%
rename from 191
rename to tests/xfs/191
diff --git a/191.out b/tests/xfs/191.out
similarity index 100%
rename from 191.out
rename to tests/xfs/191.out
diff --git a/194 b/tests/xfs/194
similarity index 100%
rename from 194
rename to tests/xfs/194
diff --git a/194.out b/tests/xfs/194.out
similarity index 100%
rename from 194.out
rename to tests/xfs/194.out
diff --git a/195 b/tests/xfs/195
similarity index 100%
rename from 195
rename to tests/xfs/195
diff --git a/195.out b/tests/xfs/195.out
similarity index 100%
rename from 195.out
rename to tests/xfs/195.out
diff --git a/196 b/tests/xfs/196
similarity index 100%
rename from 196
rename to tests/xfs/196
diff --git a/196.out b/tests/xfs/196.out
similarity index 100%
rename from 196.out
rename to tests/xfs/196.out
diff --git a/197 b/tests/xfs/197
similarity index 100%
rename from 197
rename to tests/xfs/197
diff --git a/197.out b/tests/xfs/197.out
similarity index 100%
rename from 197.out
rename to tests/xfs/197.out
diff --git a/199 b/tests/xfs/199
similarity index 100%
rename from 199
rename to tests/xfs/199
diff --git a/199.out b/tests/xfs/199.out
similarity index 100%
rename from 199.out
rename to tests/xfs/199.out
diff --git a/200 b/tests/xfs/200
similarity index 100%
rename from 200
rename to tests/xfs/200
diff --git a/200.out b/tests/xfs/200.out
similarity index 100%
rename from 200.out
rename to tests/xfs/200.out
diff --git a/201 b/tests/xfs/201
similarity index 100%
rename from 201
rename to tests/xfs/201
diff --git a/201.out b/tests/xfs/201.out
similarity index 100%
rename from 201.out
rename to tests/xfs/201.out
diff --git a/202 b/tests/xfs/202
similarity index 100%
rename from 202
rename to tests/xfs/202
diff --git a/202.out b/tests/xfs/202.out
similarity index 100%
rename from 202.out
rename to tests/xfs/202.out
diff --git a/203 b/tests/xfs/203
similarity index 100%
rename from 203
rename to tests/xfs/203
diff --git a/203.out b/tests/xfs/203.out
similarity index 100%
rename from 203.out
rename to tests/xfs/203.out
diff --git a/205 b/tests/xfs/205
similarity index 100%
rename from 205
rename to tests/xfs/205
diff --git a/205.out b/tests/xfs/205.out
similarity index 100%
rename from 205.out
rename to tests/xfs/205.out
diff --git a/206 b/tests/xfs/206
similarity index 100%
rename from 206
rename to tests/xfs/206
diff --git a/206.out b/tests/xfs/206.out
similarity index 100%
rename from 206.out
rename to tests/xfs/206.out
diff --git a/216 b/tests/xfs/216
similarity index 100%
rename from 216
rename to tests/xfs/216
diff --git a/216.out b/tests/xfs/216.out
similarity index 100%
rename from 216.out
rename to tests/xfs/216.out
diff --git a/217 b/tests/xfs/217
similarity index 100%
rename from 217
rename to tests/xfs/217
diff --git a/217.out b/tests/xfs/217.out
similarity index 100%
rename from 217.out
rename to tests/xfs/217.out
diff --git a/220 b/tests/xfs/220
similarity index 100%
rename from 220
rename to tests/xfs/220
diff --git a/220.out b/tests/xfs/220.out
similarity index 100%
rename from 220.out
rename to tests/xfs/220.out
diff --git a/222 b/tests/xfs/222
similarity index 100%
rename from 222
rename to tests/xfs/222
diff --git a/222.out b/tests/xfs/222.out
similarity index 100%
rename from 222.out
rename to tests/xfs/222.out
diff --git a/227 b/tests/xfs/227
similarity index 100%
rename from 227
rename to tests/xfs/227
diff --git a/227.out b/tests/xfs/227.out
similarity index 100%
rename from 227.out
rename to tests/xfs/227.out
diff --git a/229 b/tests/xfs/229
similarity index 100%
rename from 229
rename to tests/xfs/229
diff --git a/229.out b/tests/xfs/229.out
similarity index 100%
rename from 229.out
rename to tests/xfs/229.out
diff --git a/238 b/tests/xfs/238
similarity index 100%
rename from 238
rename to tests/xfs/238
diff --git a/238.out b/tests/xfs/238.out
similarity index 100%
rename from 238.out
rename to tests/xfs/238.out
diff --git a/242 b/tests/xfs/242
similarity index 100%
rename from 242
rename to tests/xfs/242
diff --git a/242.out b/tests/xfs/242.out
similarity index 100%
rename from 242.out
rename to tests/xfs/242.out
diff --git a/244 b/tests/xfs/244
similarity index 100%
rename from 244
rename to tests/xfs/244
diff --git a/244.out b/tests/xfs/244.out
similarity index 100%
rename from 244.out
rename to tests/xfs/244.out
diff --git a/250 b/tests/xfs/250
similarity index 100%
rename from 250
rename to tests/xfs/250
diff --git a/250.out b/tests/xfs/250.out
similarity index 100%
rename from 250.out
rename to tests/xfs/250.out
diff --git a/253 b/tests/xfs/253
similarity index 100%
rename from 253
rename to tests/xfs/253
diff --git a/253.out b/tests/xfs/253.out
similarity index 100%
rename from 253.out
rename to tests/xfs/253.out
diff --git a/259 b/tests/xfs/259
similarity index 100%
rename from 259
rename to tests/xfs/259
diff --git a/259.out b/tests/xfs/259.out
similarity index 100%
rename from 259.out
rename to tests/xfs/259.out
diff --git a/261 b/tests/xfs/261
similarity index 100%
rename from 261
rename to tests/xfs/261
diff --git a/261.out b/tests/xfs/261.out
similarity index 100%
rename from 261.out
rename to tests/xfs/261.out
diff --git a/262 b/tests/xfs/262
similarity index 100%
rename from 262
rename to tests/xfs/262
diff --git a/262.out b/tests/xfs/262.out
similarity index 100%
rename from 262.out
rename to tests/xfs/262.out
diff --git a/266 b/tests/xfs/266
similarity index 100%
rename from 266
rename to tests/xfs/266
diff --git a/266.out b/tests/xfs/266.out
similarity index 100%
rename from 266.out
rename to tests/xfs/266.out
diff --git a/267 b/tests/xfs/267
similarity index 100%
rename from 267
rename to tests/xfs/267
diff --git a/267.out b/tests/xfs/267.out
similarity index 100%
rename from 267.out
rename to tests/xfs/267.out
diff --git a/268 b/tests/xfs/268
similarity index 100%
rename from 268
rename to tests/xfs/268
diff --git a/268.out b/tests/xfs/268.out
similarity index 100%
rename from 268.out
rename to tests/xfs/268.out
diff --git a/278 b/tests/xfs/278
similarity index 100%
rename from 278
rename to tests/xfs/278
diff --git a/278.out b/tests/xfs/278.out
similarity index 100%
rename from 278.out
rename to tests/xfs/278.out
diff --git a/279 b/tests/xfs/279
similarity index 100%
rename from 279
rename to tests/xfs/279
diff --git a/279.out b/tests/xfs/279.out
similarity index 100%
rename from 279.out
rename to tests/xfs/279.out
diff --git a/281 b/tests/xfs/281
similarity index 100%
rename from 281
rename to tests/xfs/281
diff --git a/281.out b/tests/xfs/281.out
similarity index 100%
rename from 281.out
rename to tests/xfs/281.out
diff --git a/282 b/tests/xfs/282
similarity index 100%
rename from 282
rename to tests/xfs/282
diff --git a/282.out b/tests/xfs/282.out
similarity index 100%
rename from 282.out
rename to tests/xfs/282.out
diff --git a/283 b/tests/xfs/283
similarity index 100%
rename from 283
rename to tests/xfs/283
diff --git a/283.out b/tests/xfs/283.out
similarity index 100%
rename from 283.out
rename to tests/xfs/283.out
diff --git a/group b/tests/xfs/group
similarity index 70%
copy from group
copy to tests/xfs/group
index acde48e..6686e38 100644
--- a/group
+++ b/tests/xfs/group
@@ -3,119 +3,6 @@
# - do not start group names with a digit
# - comment line before each group is "new" description
#
-
-# catch-all
-other
-
-# read/write integrity
-rw
-
-# directory operations, e.g. create/unlink
-dir
-
-# metadata and inodes in particular
-metadata
-
-# xfs_db
-db
-
-# extended attributes
-attr
-
-# xfs_logprint
-logprint
-
-# XFS log related testing
-log
-
-# XFS log related testing
-v2log
-
-# xfsdump, xfsrestore, xfsinvutil
-dump
-
-# xfsdump, xfsrestore to tapes
-tape
-
-# xfsdump, xfsrestore to remote tapes
-remote
-
-# xfs_copy
-copy
-
-# chacl, libacl
-acl
-
-# capabilities
-cap
-
-# permissions
-perms
-
-# xfs_growfs
-growfs
-
-# fsr.xfs
-fsr
-
-# mkfs.xfs
-mkfs
-
-# xfs_repair
-repair
-
-# quota tools and XFS quota kernel code (XQM)
-quota
-
-# auto - tests to be run as part of nightly qa
-auto
-
-# ioctl - tests which use ioctl commands (directly/indirectly)
-ioctl
-
-# udf filesystem
-udf
-
-# AIO operations
-aio
-
-# Pattern writing and checking
-pattern
-
-# dmapi based tests
-dmapi
-
-# filestreams based tests
-filestreams
-
-# case-insensitive based tests
-ci
-
-# test the mount/remount path
-mount
-
-# test the NFS v4 ACL code if it exists
-nfs4acl
-
-# test access time
-atime
-
-# Test preallocation calls
-prealloc
-
-# Test filesystem freeze
-freeze
-
-# Tests which may oops or hang
-dangerous
-
-# Old tests that we won't spend any effort trying to run and make work
-# on current systems
-deprecated
-
-#
-# test-group association ... one line per test
-#
003 db auto quick
004 db auto quick
008 rw ioctl auto quick
@@ -144,7 +31,6 @@ deprecated
037 dump ioctl remote tape
038 dump ioctl remote tape
039 dump ioctl remote tape
-040 other auto
041 growfs ioctl auto
042 fsr ioctl auto
043 dump ioctl tape
@@ -155,7 +41,6 @@ deprecated
048 other auto quick
049 rw auto quick
050 quota auto quick
-051 acl udf auto quick
052 quota db auto quick
054 quota auto quick
055 dump ioctl remote tape
@@ -170,7 +55,6 @@ deprecated
065 dump auto
066 dump ioctl auto quick
067 acl attr auto quick
-068 other auto freeze dangerous
071 rw auto
072 rw auto prealloc quick
073 copy auto
@@ -187,9 +71,6 @@ deprecated
094 metadata dir ioctl auto
095 log v2log auto
096 mkfs v2log auto quick
-098 udf auto
-101 udf
-102 udf
103 metadata dir ioctl auto quick
104 growfs ioctl prealloc auto
106 quota
@@ -248,7 +129,6 @@ deprecated
174 rw filestreams auto
175 dmapi auto
176 dmapi auto
-177 rw other auto
178 mkfs other auto
179 metadata rw auto
180 metadata rw auto
@@ -275,33 +155,23 @@ deprecated
206 growfs auto quick
216 log metadata auto quick
217 log metadata auto
-218 auto fsr quick
220 auto quota quick
222 auto fsr ioctl quick
227 auto fsr
229 auto rw
238 auto quick metadata ioctl
242 auto quick prealloc
-243 auto quick prealloc
244 auto quota quick
250 auto quick rw prealloc metadata
-252 auto quick prealloc
253 auto quick
-254 auto quick
259 auto quick
261 auto quick quota
262 auto quick quota
-264 auto
-265 auto
266 dump ioctl auto quick
267 dump ioctl tape
268 dump ioctl tape
-271 auto rw quick
-272 auto enospc rw
-276 auto rw metadata
278 repair auto
279 auto mkfs
281 dump ioctl auto quick
282 dump ioctl auto quick
283 dump ioctl auto quick
-284 auto
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 13/18] xfstests: move remaining tests out of top level directory
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (11 preceding siblings ...)
2012-07-26 9:28 ` [PATCH 12/18] xfstests: move xfs specific tests out of top directory Dave Chinner
@ 2012-07-26 9:28 ` Dave Chinner
2012-07-26 9:28 ` [PATCH 14/18] xfstests: rework CLI individual test specification Dave Chinner
` (6 subsequent siblings)
19 siblings, 0 replies; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:28 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
These are tests that are shared between multiple filesystems (moved
to shared), and udf/btrfs/ext4 specific tests, moved to appropriate
directories.
I created the "shared" directory to indicate tests that are not
truly generic, but also not filesystem specific. They might rely on
a feature that is only implmented in a few filesystems and so can't
be truly generic.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
check | 16 +++++++---------
group | 23 -----------------------
254 => tests/btrfs/254 | 0
254.out => tests/btrfs/254.out | 0
264 => tests/btrfs/264 | 0
264.out => tests/btrfs/264.out | 0
265 => tests/btrfs/265 | 0
265.out => tests/btrfs/265.out | 0
276 => tests/btrfs/276 | 0
276.out => tests/btrfs/276.out | 0
284 => tests/btrfs/284 | 0
284.out => tests/btrfs/284.out | 0
tests/btrfs/group | 10 ++++++++++
271 => tests/ext4/271 | 0
271.out => tests/ext4/271.out | 0
tests/ext4/group | 6 ++++++
051 => tests/shared/051 | 0
051.out => tests/shared/051.out | 0
068 => tests/shared/068 | 0
068.out => tests/shared/068.out | 0
218 => tests/shared/218 | 0
218.out => tests/shared/218.out | 0
243 => tests/shared/243 | 0
243.out => tests/shared/243.out | 0
272 => tests/shared/272 | 0
272.out => tests/shared/272.out | 0
tests/shared/group | 10 ++++++++++
098 => tests/udf/098 | 0
098.out => tests/udf/098.out | 0
101 => tests/udf/101 | 0
101.out => tests/udf/101.out | 0
102 => tests/udf/102 | 0
102.out => tests/udf/102.out | 0
tests/udf/group | 8 ++++++++
040 => tests/xfs/040 | 0
040.good => tests/xfs/040.good | 0
040.out => tests/xfs/040.out | 0
177 => tests/xfs/177 | 0
177.out => tests/xfs/177.out | 0
252 => tests/xfs/252 | 0
252.out => tests/xfs/252.out | 0
tests/xfs/group | 3 +++
42 files changed, 44 insertions(+), 32 deletions(-)
rename 254 => tests/btrfs/254 (100%)
rename 254.out => tests/btrfs/254.out (100%)
rename 264 => tests/btrfs/264 (100%)
rename 264.out => tests/btrfs/264.out (100%)
rename 265 => tests/btrfs/265 (100%)
rename 265.out => tests/btrfs/265.out (100%)
rename 276 => tests/btrfs/276 (100%)
rename 276.out => tests/btrfs/276.out (100%)
rename 284 => tests/btrfs/284 (100%)
rename 284.out => tests/btrfs/284.out (100%)
create mode 100644 tests/btrfs/group
rename 271 => tests/ext4/271 (100%)
rename 271.out => tests/ext4/271.out (100%)
create mode 100644 tests/ext4/group
rename 051 => tests/shared/051 (100%)
rename 051.out => tests/shared/051.out (100%)
rename 068 => tests/shared/068 (100%)
rename 068.out => tests/shared/068.out (100%)
rename 218 => tests/shared/218 (100%)
rename 218.out => tests/shared/218.out (100%)
rename 243 => tests/shared/243 (100%)
rename 243.out => tests/shared/243.out (100%)
rename 272 => tests/shared/272 (100%)
rename 272.out => tests/shared/272.out (100%)
create mode 100644 tests/shared/group
rename 098 => tests/udf/098 (100%)
rename 098.out => tests/udf/098.out (100%)
rename 101 => tests/udf/101 (100%)
rename 101.out => tests/udf/101.out (100%)
rename 102 => tests/udf/102 (100%)
rename 102.out => tests/udf/102.out (100%)
create mode 100644 tests/udf/group
rename 040 => tests/xfs/040 (100%)
rename 040.good => tests/xfs/040.good (100%)
rename 040.out => tests/xfs/040.out (100%)
rename 177 => tests/xfs/177 (100%)
rename 177.out => tests/xfs/177.out (100%)
rename 252 => tests/xfs/252 (100%)
rename 252.out => tests/xfs/252.out (100%)
diff --git a/check b/check
index 41c1654..6ffede6 100755
--- a/check
+++ b/check
@@ -36,9 +36,8 @@ here=`pwd`
FSTYP=xfs
SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
-TEST_GROUP_DIR="tests"
-GENERIC_GROUP_DIR="$TEST_GROUP_DIR/generic"
-XFS_GROUP_DIR="$TEST_GROUP_DIR/xfs"
+SRC_DIR="tests"
+SRC_GROUPS="generic shared"
# generic initialization
iam=check
@@ -81,13 +80,12 @@ _setenvironment()
get_group_list()
{
grp=$1
- dirs=". $GENERIC_GROUP_DIR $XFS_GROUP_DIR"
- for d in $dirs; do
- l=$(sed -n < $d/group \
+ for d in $SRC_GROUPS $FSTYP; do
+ l=$(sed -n < $SRC_DIR/$d/group \
-e 's/#.*//' \
-e 's/$/ /' \
- -e "s;\(^[0-9][0-9][0-9]\).* $grp .*;$d/\1;p")
+ -e "s;\(^[0-9][0-9][0-9]\).* $grp .*;$SRC_DIR/$d/\1;p")
grpl="$grpl $l"
done
echo $grpl
@@ -291,7 +289,7 @@ END { if (NR > 0) {
echo "" >>check.log
date >>check.log
- echo $list | fmt | sed -e 's/^/ /' -e 's;tests/;;g' >>check.log
+ echo $list | fmt | sed -e 's/^/ /' -e "s;$SRC_DIR/;;g" >>check.log
$interrupt && echo "Interrupted!" >>check.log
if [ ! -z "$n_try" -a $n_try != 0 ]
@@ -372,7 +370,7 @@ do
# the filename for the test and the name output are different.
# we don't include the tests/ directory in the name output.
- seqnum=`echo $seq | sed -e 's;tests/;;'`
+ seqnum=`echo $seq | sed -e "s;$SRC_DIR/;;"`
echo -n "$seqnum"
diff --git a/group b/group
index 5c9bb7f..c0ea381 100644
--- a/group
+++ b/group
@@ -113,26 +113,3 @@ dangerous
# on current systems
deprecated
-#
-# test-group association ... one line per test
-#
-040 other auto
-051 acl udf auto quick
-068 other auto freeze dangerous
-098 udf auto
-101 udf
-102 udf
-# the next three tests are not deterministic enough to get the
-# "right" result on all platforms/configuration, so don't run
-# them by default.
-177 rw other auto
-218 auto fsr quick
-243 auto quick prealloc
-252 auto quick prealloc
-254 auto quick
-264 auto
-265 auto
-271 auto rw quick
-272 auto enospc rw
-276 auto rw metadata
-284 auto
diff --git a/254 b/tests/btrfs/254
similarity index 100%
rename from 254
rename to tests/btrfs/254
diff --git a/254.out b/tests/btrfs/254.out
similarity index 100%
rename from 254.out
rename to tests/btrfs/254.out
diff --git a/264 b/tests/btrfs/264
similarity index 100%
rename from 264
rename to tests/btrfs/264
diff --git a/264.out b/tests/btrfs/264.out
similarity index 100%
rename from 264.out
rename to tests/btrfs/264.out
diff --git a/265 b/tests/btrfs/265
similarity index 100%
rename from 265
rename to tests/btrfs/265
diff --git a/265.out b/tests/btrfs/265.out
similarity index 100%
rename from 265.out
rename to tests/btrfs/265.out
diff --git a/276 b/tests/btrfs/276
similarity index 100%
rename from 276
rename to tests/btrfs/276
diff --git a/276.out b/tests/btrfs/276.out
similarity index 100%
rename from 276.out
rename to tests/btrfs/276.out
diff --git a/284 b/tests/btrfs/284
similarity index 100%
rename from 284
rename to tests/btrfs/284
diff --git a/284.out b/tests/btrfs/284.out
similarity index 100%
rename from 284.out
rename to tests/btrfs/284.out
diff --git a/tests/btrfs/group b/tests/btrfs/group
new file mode 100644
index 0000000..8926c40
--- /dev/null
+++ b/tests/btrfs/group
@@ -0,0 +1,10 @@
+# QA groups control file
+# Defines test groups and nominal group owners
+# - do not start group names with a digit
+# - comment line before each group is "new" description
+#
+254 auto quick
+264 auto
+265 auto
+276 auto rw metadata
+284 auto
diff --git a/271 b/tests/ext4/271
similarity index 100%
rename from 271
rename to tests/ext4/271
diff --git a/271.out b/tests/ext4/271.out
similarity index 100%
rename from 271.out
rename to tests/ext4/271.out
diff --git a/tests/ext4/group b/tests/ext4/group
new file mode 100644
index 0000000..1d6c041
--- /dev/null
+++ b/tests/ext4/group
@@ -0,0 +1,6 @@
+# QA groups control file
+# Defines test groups and nominal group owners
+# - do not start group names with a digit
+# - comment line before each group is "new" description
+#
+271 auto rw quick
diff --git a/051 b/tests/shared/051
similarity index 100%
rename from 051
rename to tests/shared/051
diff --git a/051.out b/tests/shared/051.out
similarity index 100%
rename from 051.out
rename to tests/shared/051.out
diff --git a/068 b/tests/shared/068
similarity index 100%
rename from 068
rename to tests/shared/068
diff --git a/068.out b/tests/shared/068.out
similarity index 100%
rename from 068.out
rename to tests/shared/068.out
diff --git a/218 b/tests/shared/218
similarity index 100%
rename from 218
rename to tests/shared/218
diff --git a/218.out b/tests/shared/218.out
similarity index 100%
rename from 218.out
rename to tests/shared/218.out
diff --git a/243 b/tests/shared/243
similarity index 100%
rename from 243
rename to tests/shared/243
diff --git a/243.out b/tests/shared/243.out
similarity index 100%
rename from 243.out
rename to tests/shared/243.out
diff --git a/272 b/tests/shared/272
similarity index 100%
rename from 272
rename to tests/shared/272
diff --git a/272.out b/tests/shared/272.out
similarity index 100%
rename from 272.out
rename to tests/shared/272.out
diff --git a/tests/shared/group b/tests/shared/group
new file mode 100644
index 0000000..b2ff729
--- /dev/null
+++ b/tests/shared/group
@@ -0,0 +1,10 @@
+# QA groups control file
+# Defines test groups and nominal group owners
+# - do not start group names with a digit
+# - comment line before each group is "new" description
+#
+051 acl udf auto quick
+068 other auto freeze dangerous
+218 auto fsr quick
+243 auto quick prealloc
+272 auto enospc rw
diff --git a/098 b/tests/udf/098
similarity index 100%
rename from 098
rename to tests/udf/098
diff --git a/098.out b/tests/udf/098.out
similarity index 100%
rename from 098.out
rename to tests/udf/098.out
diff --git a/101 b/tests/udf/101
similarity index 100%
rename from 101
rename to tests/udf/101
diff --git a/101.out b/tests/udf/101.out
similarity index 100%
rename from 101.out
rename to tests/udf/101.out
diff --git a/102 b/tests/udf/102
similarity index 100%
rename from 102
rename to tests/udf/102
diff --git a/102.out b/tests/udf/102.out
similarity index 100%
rename from 102.out
rename to tests/udf/102.out
diff --git a/tests/udf/group b/tests/udf/group
new file mode 100644
index 0000000..24f682c
--- /dev/null
+++ b/tests/udf/group
@@ -0,0 +1,8 @@
+# QA groups control file
+# Defines test groups and nominal group owners
+# - do not start group names with a digit
+# - comment line before each group is "new" description
+#
+098 udf auto
+101 udf
+102 udf
diff --git a/040 b/tests/xfs/040
similarity index 100%
rename from 040
rename to tests/xfs/040
diff --git a/040.good b/tests/xfs/040.good
similarity index 100%
rename from 040.good
rename to tests/xfs/040.good
diff --git a/040.out b/tests/xfs/040.out
similarity index 100%
rename from 040.out
rename to tests/xfs/040.out
diff --git a/177 b/tests/xfs/177
similarity index 100%
rename from 177
rename to tests/xfs/177
diff --git a/177.out b/tests/xfs/177.out
similarity index 100%
rename from 177.out
rename to tests/xfs/177.out
diff --git a/252 b/tests/xfs/252
similarity index 100%
rename from 252
rename to tests/xfs/252
diff --git a/252.out b/tests/xfs/252.out
similarity index 100%
rename from 252.out
rename to tests/xfs/252.out
diff --git a/tests/xfs/group b/tests/xfs/group
index 6686e38..ff13804 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -31,6 +31,7 @@
037 dump ioctl remote tape
038 dump ioctl remote tape
039 dump ioctl remote tape
+040 other auto
041 growfs ioctl auto
042 fsr ioctl auto
043 dump ioctl tape
@@ -129,6 +130,7 @@
174 rw filestreams auto
175 dmapi auto
176 dmapi auto
+177 rw other auto
178 mkfs other auto
179 metadata rw auto
180 metadata rw auto
@@ -163,6 +165,7 @@
242 auto quick prealloc
244 auto quota quick
250 auto quick rw prealloc metadata
+252 auto quick prealloc
253 auto quick
259 auto quick
261 auto quick quota
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 14/18] xfstests: rework CLI individual test specification
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (12 preceding siblings ...)
2012-07-26 9:28 ` [PATCH 13/18] xfstests: move remaining tests out of top level directory Dave Chinner
@ 2012-07-26 9:28 ` Dave Chinner
2012-07-26 9:28 ` [PATCH 15/18] xfstests: make exclude groups aware of multiple subdirectories Dave Chinner
` (5 subsequent siblings)
19 siblings, 0 replies; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:28 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
Now that tests are in separate subdirectories, they cannot be selected purely by
test number on the command line. We need to specify the test by subdir and test
name, so effectively we move to specifying them by regexes on the command line
rather than by expanding a range internally. This is needed to support
non-numeric test names as well, so the change may as well be made here.
This means the command line parsing needs to change from trying to detect tests
by a regex match to a processing loop that simply parses the tests and checks
for there existence. Hence the moment we find an argument that is not a switch
(i.e no preceeding "-"), we move from the arg processing loop to the test name
processing loop. IOWs, tests must be specified last on the command line.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
check | 86 ++++++++++++++++++++++++++++-------------------------------------
1 file changed, 37 insertions(+), 49 deletions(-)
diff --git a/check b/check
index 6ffede6..b65b060 100755
--- a/check
+++ b/check
@@ -65,8 +65,7 @@ check options
testlist options
-g group[,group...] include tests from these groups
-x group[,group...] exclude tests from these groups
- NNN include test NNN
- NNN-NNN include test range (eg. 012-021)
+ [testlist] include tests matching names in testlist
'
exit 0
}
@@ -91,26 +90,6 @@ get_group_list()
echo $grpl
}
-expand_test_numbers()
-{
- # strip leading zeros, could be considered octal.
- start=`echo $1 | sed 's/^0*//'`
- end=`echo $2 | sed 's/^0*//'`
-
- $AWK_PROG </dev/null '
-BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
- | while read id
- do
- if grep -s "^$id " group >/dev/null ; then
- # in group file ... OK
- echo $id >>$tmp.list
- else
- # oops
- echo "$id - unknown test, ignored"
- fi
- done
-}
-
_wallclock()
{
date "+%H %M %S" | $AWK_PROG '{ print $1*3600 + $2*60 + $3 }'
@@ -140,6 +119,7 @@ then
exit 1
fi
+# Process command arguments first.
while [ $# -gt 0 ]; do
case "$1" in
-\? | -h | --help) usage ;;
@@ -196,42 +176,50 @@ while [ $# -gt 0 ]; do
-T) timestamp=true ;;
- "$SUPPORTED_TESTS")
- echo "No tests?"
- status=1
- exit $status
- ;;
-
- [0-9]*-[0-9]*)
- eval `echo $1 | sed -e 's/^/start=/' -e 's/-/ end=/'`
- expand_test_numbers $start $end
- have_test_arg=true
- ;;
-
- [0-9]*-)
- eval `echo $1 | sed -e 's/^/start=/' -e 's/-//'`
- end=`echo $SUPPORTED_TESTS | sed -e 's/\[0-9]//g' -e 's/ *$//' -e 's/.* //'`
- if [ -z "$end" ]; then
- echo "No tests in range \"$1\"?"
- status=1
- exit $status
- fi
- expand_test_numbers $start $end
- have_test_arg=true
- ;;
-
--large-fs) export LARGE_SCRATCH_DEV=yes ;;
--extra-space=*) export SCRATCH_DEV_EMPTY_SPACE=${r#*=} ;;
-*) usage ;;
- *) expand_test_numbers $1 $1 ;
- have_test_arg=true
- ;;
+ *) # not an argument, we've got tests now.
+ have_test_arg=true ;;
esac
+ # if we've found a test specification, the break out of the processing
+ # loop before we shift the arguments so that this is the first argument
+ # that we process in the test arg loop below.
+ if $have_test_arg; then
+ break;
+ fi
+
shift
done
+# Process tests from command line now.
+if $have_test_arg; then
+ while [ $# -gt 0 ]; do
+ case "$1" in
+ -*) echo "Argments before tests, please!"
+ status=1
+ exit $status
+ ;;
+ *) test_dir=`dirname $1`
+ test_name=`basename $1`
+ group_file=$SRC_DIR/$test_dir/group
+
+ if grep "^$testname" $group_file >/dev/null ; then
+ # in group file ... OK
+ echo $SRC_DIR/$1 >>$tmp.list
+ else
+ # oops
+ echo "$1 - unknown test, ignored"
+ fi
+ ;;
+ esac
+
+ shift
+ done
+fi
+
if [ -s $tmp.list ]; then
# found some valid test numbers ... this is good
:
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 15/18] xfstests: make exclude groups aware of multiple subdirectories
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (13 preceding siblings ...)
2012-07-26 9:28 ` [PATCH 14/18] xfstests: rework CLI individual test specification Dave Chinner
@ 2012-07-26 9:28 ` Dave Chinner
2012-07-26 9:28 ` [PATCH 16/18] xfstests: Introduce a results directory Dave Chinner
` (4 subsequent siblings)
19 siblings, 0 replies; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:28 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
Now that there are no tests in the top level directory, the exlude
group functionality no longer works (-x group) as it cannot find
tests to build an initial list of tests. Rework the the exclude
group implementation to operate correctly on the new test locations.
Also, swtich from sed to grep for exclusion because sed has problems
distnguishing the '/' in path names from regex control...
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
check | 35 +++++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 8 deletions(-)
diff --git a/check b/check
index b65b060..44659bb 100755
--- a/check
+++ b/check
@@ -90,6 +90,19 @@ get_group_list()
echo $grpl
}
+# find all tests, excluding files that are test metadata such as group files.
+# This assumes that tests are defined purely by alphanumeric filenames with no
+# ".xyz" extensions in the name.
+get_all_tests()
+{
+ touch $tmp.list
+ for d in $SRC_GROUPS $FSTYP; do
+ ls $SRC_DIR/$d/* | \
+ grep -v "\..*" | \
+ grep -v group >> $tmp.list 2>/dev/null
+ done
+}
+
_wallclock()
{
date "+%H %M %S" | $AWK_PROG '{ print $1*3600 + $2*60 + $3 }'
@@ -104,7 +117,7 @@ _timestamp()
# start the initialisation work now
_setenvironment
-rm -f $tmp.list $tmp.tmp $tmp.sed $here/$iam.out
+rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out
# Autodetect fs type based on what's on $TEST_DEV
if [ "$HOSTOS" == "Linux" ]; then
@@ -144,27 +157,33 @@ while [ $# -gt 0 ]; do
;;
-x) xgroup=$2 ; shift ;
- [ ! -s $tmp.list ] && ls $SUPPORTED_TESTS >$tmp.list 2>/dev/null
+
+ # Note: behaviour is dependent on command line ordering of
+ # -g and -x parameters. If there are no preceding -g commands,
+ # this works on all tests, otherwise just the tests specified by
+ # the early -g inclusions.
+ [ ! -s $tmp.list ] && get_all_tests
+
group_list=$(get_group_list $xgroup)
if [ -z "$group_list" ]; then
echo "Group \"$xgroup\" is empty or not defined?"
exit 1
fi
- rm -f $tmp.sed
+ rm -f $tmp.grep
numsed=0
for t in $group_list
do
if [ $numsed -gt 100 ]; then
- sed -f $tmp.sed <$tmp.list >$tmp.tmp
+ grep -v -f $tmp.grep <$tmp.list >$tmp.tmp
mv $tmp.tmp $tmp.list
numsed=0
- rm -f $tmp.sed
+ rm -f $tmp.grep
fi
- echo "/^$t\$/d" >>$tmp.sed
+ echo "^$t\$" >>$tmp.grep
numsed=`expr $numsed + 1`
done
- sed -f $tmp.sed <$tmp.list >$tmp.tmp
+ grep -v -f $tmp.grep <$tmp.list >$tmp.tmp
mv $tmp.tmp $tmp.list
;;
@@ -233,7 +252,7 @@ fi
# sort the list of tests into numeric order
list=`sort -n $tmp.list`
-rm -f $tmp.list $tmp.tmp $tmp.sed
+rm -f $tmp.list $tmp.tmp $tmp.grep
if $randomize
then
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 16/18] xfstests: Introduce a results directory
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (14 preceding siblings ...)
2012-07-26 9:28 ` [PATCH 15/18] xfstests: make exclude groups aware of multiple subdirectories Dave Chinner
@ 2012-07-26 9:28 ` Dave Chinner
2012-07-26 9:28 ` [PATCH 17/18] xfstests: convert tests to use new " Dave Chinner
` (3 subsequent siblings)
19 siblings, 0 replies; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:28 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
Currently each test gets it's sequence number from it's name. It
separates this from the path via basename, and uses it for
outputting full, notrun an dother status/log files. Hence these end
up in the top level directory.
All these output files need to go somewhere other than the top level
directory. Right now the check script is looking for them in the new
test directories (e.g. for the notrun files), but it woul dbe good
to be able to separate the test source form the test output.
Hence create an output directory which has a similar heirarchy to
the test source directory. Create it on demand when we build the
list of tests to run if it doesn't already exist.
Change the high level check script to set up this variable
appropriately for each test that is being run, and to use this new
output directory for it's result files as well. The next commit will
change all the tests themselves to use the new
This is the first (small) step in being able to store test results
in an external location for archival/data mining purposes
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
check | 34 ++++++++++++++------
common.attr | 4 +--
common.defrag | 4 +--
common.dump | 74 +++++++++++++++++++++---------------------
common.filestreams | 4 +--
common.log | 36 ++++++++++-----------
common.quota | 18 +++++------
common.rc | 90 ++++++++++++++++++++++++++--------------------------
common.scsi_debug | 2 +-
9 files changed, 140 insertions(+), 126 deletions(-)
diff --git a/check b/check
index 44659bb..10b801f 100755
--- a/check
+++ b/check
@@ -36,8 +36,9 @@ here=`pwd`
FSTYP=xfs
SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
-SRC_DIR="tests"
SRC_GROUPS="generic shared"
+export SRC_DIR="tests"
+export RESULT_BASE=${RESULT_BASE:="results"}
# generic initialization
iam=check
@@ -368,6 +369,12 @@ if [ ! -z "$SCRATCH_DEV" ]; then
fi
fi
+mkdir -p $RESULT_BASE
+if [ ! -d $RESULT_BASE ]; then
+ echo "failed to create results directory $RESULTS_BASE"
+ exit 1;
+fi
+
seq="check"
_check_test_fs
@@ -379,6 +386,13 @@ do
# we don't include the tests/ directory in the name output.
seqnum=`echo $seq | sed -e "s;$SRC_DIR/;;"`
+ # Similarly, the result directory needs to replace the tests/
+ # part of the test location.
+ group=`dirname $seq`
+ export RESULT_DIR=`echo $group | sed -e "s;$SRC_DIR;$RESULT_BASE;"`
+ mkdir -p $RESULT_DIR
+ seqres="$RESULT_BASE/$seqnum"
+
echo -n "$seqnum"
if $showme
@@ -391,7 +405,7 @@ do
else
# really going to try and run this one
#
- rm -f $seq.out.bad
+ rm -f $seqres.out.bad
# slashes now in names, sed barfs on them so use grep
lasttime=`grep -w ^$seq check.time | awk '// {print $2}'`
@@ -400,7 +414,7 @@ do
else
echo -n " " # prettier output with timestamps.
fi
- rm -f core $seq.notrun
+ rm -f core $seqres.notrun
start=`_wallclock`
$timestamp && echo -n " ["`date "+%T"`"]"
@@ -417,15 +431,15 @@ do
if [ -f core ]
then
echo -n " [dumped core]"
- mv core $seq.core
+ mv core $RESULT_BASE/$seqnum.core
err=true
fi
- if [ -f $seq.notrun ]
+ if [ -f $seqres.notrun ]
then
$timestamp || echo -n " [not run] "
$timestamp && echo " [not run]" && echo -n " $seqnum -- "
- cat $seq.notrun
+ cat $seqres.notrun
notrun="$notrun $seqnum"
else
if [ $sts -ne 0 ]
@@ -450,8 +464,8 @@ do
echo ""
else
echo " - output mismatch (see $seq.out.bad)"
- mv $tmp.out $seq.out.bad
- $diff $seq.out $seq.out.bad
+ mv $tmp.out $seqres.out.bad
+ $diff $seq.out $seqres.out.bad
err=true
fi
fi
@@ -467,13 +481,13 @@ do
n_bad=`expr $n_bad + 1`
quick=false
fi
- if [ ! -f $seq.notrun ]
+ if [ ! -f $seqres.notrun ]
then
try="$try $seqnum"
n_try=`expr $n_try + 1`
_check_test_fs
fi
-
+
seq="after_$seqnum"
done
diff --git a/common.attr b/common.attr
index 6e2c004..69bcb01 100644
--- a/common.attr
+++ b/common.attr
@@ -129,7 +129,7 @@ _require_acls()
#
touch $TEST_DIR/syscalltest
chacl -l $TEST_DIR/syscalltest > $TEST_DIR/syscalltest.out 2>&1
- cat $TEST_DIR/syscalltest.out >> $here/$seq.full
+ cat $TEST_DIR/syscalltest.out >> $RESULT_DIR/$seq.full
if grep -q 'Function not implemented' $TEST_DIR/syscalltest.out; then
_notrun "kernel does not support ACLs"
@@ -164,7 +164,7 @@ _require_attrs()
#
touch $TEST_DIR/syscalltest
attr -s "user.xfstests" -V "attr" $TEST_DIR > $TEST_DIR/syscalltest.out 2>&1
- cat $TEST_DIR/syscalltest.out >> $here/$seq.full
+ cat $TEST_DIR/syscalltest.out >> $RESULT_DIR/$seq.full
if grep -q 'Function not implemented' $TEST_DIR/syscalltest.out; then
_notrun "kernel does not support attrs"
diff --git a/common.defrag b/common.defrag
index ea6c14c..e49fa0d 100644
--- a/common.defrag
+++ b/common.defrag
@@ -44,7 +44,7 @@ _require_defrag()
_extent_count()
{
filefrag $1 | awk '{print $2}'
- filefrag -v $1 >> $seq.full 2>&1
+ filefrag -v $1 >> $RESULT_DIR/$seq.full 2>&1
}
# Defrag file, check it, and remove it.
@@ -54,7 +54,7 @@ _defrag()
_extent_count $1
CSUM_BEFORE=`md5sum $1`
STAT_BEFORE=`stat -c "a: %x m: %y c: %z" $1`
- $DEFRAG_PROG -v $1 >> $seq.full 2>&1
+ $DEFRAG_PROG -v $1 >> $RESULT_DIR/$seq.full 2>&1
_scratch_remount
STAT_AFTER=`stat -c "a: %x m: %y c: %z" $1`
CSUM_AFTER=`md5sum $1`
diff --git a/common.dump b/common.dump
index a33dc81..126c540 100644
--- a/common.dump
+++ b/common.dump
@@ -20,7 +20,7 @@
#
# --- initializations ---
-rm -f $here/$seq.full
+rm -f $RESULT_DIR/$seq.full
if [ -n "$DEBUGDUMP" ]; then
_dump_debug=-v4
@@ -124,7 +124,7 @@ _check_onl()
_limit=10
i=0
while [ $i -lt $_limit ]; do
- echo "Checking online..." >>$here/$seq.full
+ echo "Checking online..." >>$RESULT_DIR/$seq.full
if _mt status >$tmp.status 2>&1; then
break;
else
@@ -158,12 +158,12 @@ _check_onl()
_wait_tape()
{
- echo "Wait for tape, $dumptape, ..." >>$here/$seq.full
+ echo "Wait for tape, $dumptape, ..." >>$RESULT_DIR/$seq.full
i=0
while [ $i -lt 20 ]; do
- echo "Checking status..." >>$here/$seq.full
- if _mt status 2>&1 | tee -a $here/$seq.full | egrep -i "onl|ready" >/dev/null; then
+ echo "Checking status..." >>$RESULT_DIR/$seq.full
+ if _mt status 2>&1 | tee -a $RESULT_DIR/$seq.full | egrep -i "onl|ready" >/dev/null; then
break;
else
sleep 1
@@ -177,7 +177,7 @@ _wait_tape()
#
_rewind()
{
- echo "Initiate rewind..." >>$here/$seq.full
+ echo "Initiate rewind..." >>$RESULT_DIR/$seq.full
_wait_tape
_mt rewind >/dev/null
_wait_tape
@@ -190,7 +190,7 @@ _rewind()
#
_erase_soft()
{
- echo "Erasing tape" | tee -a $here/$seq.full
+ echo "Erasing tape" | tee -a $RESULT_DIR/$seq.full
_rewind
_mt weof 3
_rewind
@@ -198,7 +198,7 @@ _erase_soft()
_erase_hard()
{
- echo "Erasing tape" | tee -a $here/$seq.full
+ echo "Erasing tape" | tee -a $RESULT_DIR/$seq.full
_mt erase
}
@@ -242,8 +242,8 @@ _wipe_fs()
{
_require_scratch
- _scratch_mkfs_xfs >>$here/$seq.full || _fail "mkfs failed"
- _scratch_mount >>$here/$seq.full || _fail "mount failed"
+ _scratch_mkfs_xfs >>$RESULT_DIR/$seq.full || _fail "mkfs failed"
+ _scratch_mount >>$RESULT_DIR/$seq.full || _fail "mount failed"
}
#
@@ -294,8 +294,8 @@ _cleanup()
_stable_fs()
{
_saveddir=`pwd`; cd /
- umount $SCRATCH_MNT >>$here/$seq.full || _fail "unmount failed"
- _scratch_mount >>$here/$seq.full || _fail "mount failed"
+ umount $SCRATCH_MNT >>$RESULT_DIR/$seq.full || _fail "unmount failed"
+ _scratch_mount >>$RESULT_DIR/$seq.full || _fail "mount failed"
cd $_saveddir
}
@@ -325,12 +325,12 @@ _create_dumpdir_stress()
echo "-----------------------------------------------"
if ! $here/ltp/fsstress $_param -s 1 $FSSTRESS_AVOID -n $_count -d $dump_dir >$tmp.out 2>&1
then
- echo " fsstress (count=$_count) returned $? - see $here/$seq.full"
+ echo " fsstress (count=$_count) returned $? - see $RESULT_DIR/$seq.full"
- echo "--------------------------------------" >>$here/$seq.full
- echo "output from fsstress:" >>$here/$seq.full
- echo "--------------------------------------" >>$here/$seq.full
- cat $tmp.out >>$here/$seq.full
+ echo "--------------------------------------" >>$RESULT_DIR/$seq.full
+ echo "output from fsstress:" >>$RESULT_DIR/$seq.full
+ echo "--------------------------------------" >>$RESULT_DIR/$seq.full
+ cat $tmp.out >>$RESULT_DIR/$seq.full
status=1
fi
@@ -1025,7 +1025,7 @@ _do_dump_sub()
echo "Dumping to tape..."
opts="$_dump_debug$dump_args -s $dump_sdir -f $dumptape -M $media_label -L $session_label $SCRATCH_MNT"
echo "xfsdump $opts" | _dir_filter
- $XFSDUMP_PROG $opts 2>&1 | tee -a $here/$seq.full | _dump_filter
+ $XFSDUMP_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
}
#
@@ -1038,7 +1038,7 @@ _do_dump()
echo "Dumping to tape..."
opts="$_dump_debug$dump_args -f $dumptape -M $media_label -L $session_label $SCRATCH_MNT"
echo "xfsdump $opts" | _dir_filter
- $XFSDUMP_PROG $opts 2>&1 | tee -a $here/$seq.full | _dump_filter
+ $XFSDUMP_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
}
@@ -1053,7 +1053,7 @@ _do_dump_min()
onemeg=1048576
opts="$_dump_debug$dump_args -m -b $onemeg -l0 -f $dumptape -M $media_label -L $session_label $SCRATCH_MNT"
echo "xfsdump $opts" | _dir_filter
- $XFSDUMP_PROG $opts 2>&1 | tee -a $here/$seq.full | _dump_filter
+ $XFSDUMP_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
}
@@ -1067,7 +1067,7 @@ _do_dump_file()
echo "Dumping to file..."
opts="$_dump_debug$dump_args -f $dump_file -M $media_label -L $session_label $SCRATCH_MNT"
echo "xfsdump $opts" | _dir_filter
- $XFSDUMP_PROG $opts 2>&1 | tee -a $here/$seq.full | _dump_filter
+ $XFSDUMP_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
}
#
@@ -1089,7 +1089,7 @@ _do_dump_multi_file()
echo "Dumping to files..."
opts="$_dump_debug$dump_args $multi_args -L $session_label $SCRATCH_MNT"
echo "xfsdump $opts" | _dir_filter
- $XFSDUMP_PROG $opts 2>&1 | tee -a $here/$seq.full | _dump_filter
+ $XFSDUMP_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
}
@@ -1122,7 +1122,7 @@ _do_restore()
echo "Restoring from tape..."
opts="$_restore_debug$restore_args -f $dumptape -L $session_label $restore_dir"
echo "xfsrestore $opts" | _dir_filter
- $XFSRESTORE_PROG $opts 2>&1 | tee -a $here/$seq.full | _dump_filter
+ $XFSRESTORE_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
}
#
@@ -1137,7 +1137,7 @@ _do_restore_min()
onemeg=1048576
opts="$_restore_debug$restore_args -m -b $onemeg -f $dumptape -L $session_label $restore_dir"
echo "xfsrestore $opts" | _dir_filter
- $XFSRESTORE_PROG $opts 2>&1 | tee -a $here/$seq.full | _dump_filter
+ $XFSRESTORE_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
}
#
@@ -1151,7 +1151,7 @@ _do_restore_file()
echo "Restoring from file..."
opts="$_restore_debug$restore_args -f $dump_file -L $session_label $restore_dir"
echo "xfsrestore $opts" | _dir_filter
- $XFSRESTORE_PROG $opts 2>&1 | tee -a $here/$seq.full | _dump_filter
+ $XFSRESTORE_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
}
#
@@ -1166,7 +1166,7 @@ _do_restore_file_cum()
echo "Restoring cumumlative from file..."
opts="$_restore_debug$restore_args -f $dump_file -r $restore_dir"
echo "xfsrestore $opts" | _dir_filter
- $XFSRESTORE_PROG $opts 2>&1 | tee -a $here/$seq.full | _dump_filter
+ $XFSRESTORE_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
}
_do_restore_toc()
@@ -1177,7 +1177,7 @@ _do_restore_toc()
opts="$_restore_debug$restore_args -f $dump_file -t"
echo "xfsrestore $opts" | _dir_filter
cd $SCRATCH_MNT # for IRIX which needs xfs cwd
- $XFSRESTORE_PROG $opts 2>&1 | tee -a $here/$seq.full | _dump_filter_main |\
+ $XFSRESTORE_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter_main |\
_check_quota_file |\
_check_quota_entries |\
$AWK_PROG 'NF != 1 { print; next }
@@ -1208,7 +1208,7 @@ _do_restore_multi_file()
echo "Restoring from file..."
opts="$_restore_debug$restore_args $multi_args -L $session_label $restore_dir"
echo "xfsrestore $opts" | _dir_filter
- $XFSRESTORE_PROG $opts 2>&1 | tee -a $here/$seq.full | _dump_filter
+ $XFSRESTORE_PROG $opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
}
#
@@ -1228,7 +1228,7 @@ _do_dump_restore()
restore_opts="$_restore_debug$restore_args - $restore_dir"
dump_opts="$_dump_debug$dump_args -s $dump_sdir - $SCRATCH_MNT"
echo "xfsdump $dump_opts | xfsrestore $restore_opts" | _dir_filter
- $XFSDUMP_PROG $dump_opts 2>$tmp.dump.mlog | $XFSRESTORE_PROG $restore_opts 2>&1 | tee -a $here/$seq.full | _dump_filter
+ $XFSDUMP_PROG $dump_opts 2>$tmp.dump.mlog | $XFSRESTORE_PROG $restore_opts 2>&1 | tee -a $RESULT_DIR/$seq.full | _dump_filter
_dump_filter <$tmp.dump.mlog
}
@@ -1244,8 +1244,8 @@ _ls_compare_sub()
# verify we got back what we dumped
#
echo "Comparing listing of dump directory with restore directory"
- ls -nR $dump_dir | tee -a $here/$seq.full | _ls_filter >$tmp.dump_dir
- ls -nR $restore_dir/$dump_sdir | tee -a $here/$seq.full | _ls_filter \
+ ls -nR $dump_dir | tee -a $RESULT_DIR/$seq.full | _ls_filter >$tmp.dump_dir
+ ls -nR $restore_dir/$dump_sdir | tee -a $RESULT_DIR/$seq.full | _ls_filter \
| sed -e "s#$restore_sdir\/##" >$tmp.restore_dir
diff -bcs $tmp.dump_dir $tmp.restore_dir | sed -e "s#$tmp#TMP#g"
@@ -1267,8 +1267,8 @@ _ls_nodate_compare_sub()
# verify we got back what we dumped
#
echo "Comparing listing of dump directory with restore directory"
- ls -nR $dump_dir | tee -a $here/$seq.full | _ls_filter | _ls_nodate_filter >$tmp.dump_dir
- ls -nR $restore_dir/$dump_sdir | tee -a $here/$seq.full | _ls_filter \
+ ls -nR $dump_dir | tee -a $RESULT_DIR/$seq.full | _ls_filter | _ls_nodate_filter >$tmp.dump_dir
+ ls -nR $restore_dir/$dump_sdir | tee -a $RESULT_DIR/$seq.full | _ls_filter \
| _ls_nodate_filter | sed -e "s#$restore_sdir\/##" >$tmp.restore_dir
diff -bcs $tmp.dump_dir $tmp.restore_dir | sed -e "s#$tmp#TMP#g"
@@ -1366,7 +1366,7 @@ _diff_compare()
#
_dump_inventory()
{
- $XFSDUMP_PROG $_dump_debug -I | tee -a $here/$seq.full | _dump_filter_main
+ $XFSDUMP_PROG $_dump_debug -I | tee -a $RESULT_DIR/$seq.full | _dump_filter_main
}
#
@@ -1376,9 +1376,9 @@ _dump_inventory()
_do_invutil()
{
host=`hostname`
- echo "xfsinvutil $_invutil_debug -M $host:$SCRATCH_MNT \"$middate\" $*" >$here/$seq.full
+ echo "xfsinvutil $_invutil_debug -M $host:$SCRATCH_MNT \"$middate\" $*" >$RESULT_DIR/$seq.full
$XFSINVUTIL_PROG $_invutil_debug $* -M $host:$SCRATCH_MNT "$middate" \
- | tee -a $here/$seq.full | _invutil_filter
+ | tee -a $RESULT_DIR/$seq.full | _invutil_filter
}
#
@@ -1398,7 +1398,7 @@ _check_quota()
$here/src/feature -P $SCRATCH_DEV && pquota=1
$AWK_PROG -v uquota=$uquota -v gquota=$gquota -v pquota=$pquota \
- -v full=$here/$seq.full -v usermsg="$usermsg" \
+ -v full=$RESULT_DIR/$seq.full -v usermsg="$usermsg" \
-v groupmsg="$groupmsg" -v projectmsg="$projectmsg" '
$0 ~ projectmsg {
print "Found project quota:", $0 >>full
diff --git a/common.filestreams b/common.filestreams
index 08eaf90..b3aee27 100644
--- a/common.filestreams
+++ b/common.filestreams
@@ -116,7 +116,7 @@ _check_for_dupes()
for this_num_two in $num_str_two; do
if [ "$this_num_one" == "$this_num_two" ]; then
echo "duplicate AG $this_num_one found" \
- >> $here/$seq.full
+ >> $RESULT_DIR/$seq.full
return 1
fi
done
@@ -189,7 +189,7 @@ _test_streams() {
stream_index=1
while [ $stream_index -le $stream_count ]; do
this_stream_ags=`_get_stream_ags stream${stream_index}-dir`
- echo "stream $stream_index AGs: $this_stream_ags" >> $here/$seq.full
+ echo "stream $stream_index AGs: $this_stream_ags" >> $RESULT_DIR/$seq.full
_check_for_dupes "$ags_seen" "$this_stream_ags"
if [ $? -ne 0 ]; then
# this stream is not in seperate AGs to previous streams
diff --git a/common.log b/common.log
index 3958c48..e0e2bc6 100644
--- a/common.log
+++ b/common.log
@@ -20,7 +20,7 @@
# Created by dxm@sgi.com & tes@sgi.com
#
-fulldir=$seq.fulldir
+fulldir=$RESULT_DIR/$seq.fulldir
rm -rf $fulldir
_cleanup_logfiles()
@@ -33,16 +33,16 @@ _cleanup_logfiles()
_full()
{
- echo "" >>$seq.full
- echo "*** $* ***" >>$seq.full
- echo "" >>$seq.full
+ echo "" >>$RESULT_DIR/$seq.full
+ echo "*** $* ***" >>$RESULT_DIR/$seq.full
+ echo "" >>$RESULT_DIR/$seq.full
}
_echofull()
{
- echo "" | tee -a $seq.full
- echo "*** $* ***" | tee -a $seq.full
- echo "" | tee -a $seq.full
+ echo "" | tee -a $RESULT_DIR/$seq.full
+ echo "*** $* ***" | tee -a $RESULT_DIR/$seq.full
+ echo "" | tee -a $RESULT_DIR/$seq.full
}
# Handle the operations which get split over Log Record
@@ -212,13 +212,13 @@ _filter_logprint()
_check_log()
{
_full "clean_log : xfs_logprint"
- _scratch_xfs_logprint -t | tee -a $seq.full \
+ _scratch_xfs_logprint -t | tee -a $RESULT_DIR/$seq.full \
| head | grep -q "<CLEAN>" || _fail "DIRTY LOG"
}
_print_logstate()
{
- _scratch_xfs_logprint -t | tee -a $seq.full >$tmp.logprint
+ _scratch_xfs_logprint -t | tee -a $RESULT_DIR/$seq.full >$tmp.logprint
if grep -q "<DIRTY>" $tmp.logprint; then
echo "dirty log"
fi
@@ -288,7 +288,7 @@ _mkfs_log()
# mkfs options to append to log size otion can be specified ($*)
export MKFS_OPTIONS="-l size=2000b -l lazy-count=1 $*"
_full "mkfs"
- _scratch_mkfs_xfs >>$seq.full 2>&1
+ _scratch_mkfs_xfs >>$RESULT_DIR/$seq.full 2>&1
if [ $? -ne 0 ] ; then
_echofull "Cannot mkfs for this test using option specified: $MKFS_OPTIONS"
return 1
@@ -305,7 +305,7 @@ _create_log()
{
# mount the FS
_full "mount"
- _scratch_mount >>$seq.full 2>&1
+ _scratch_mount >>$RESULT_DIR/$seq.full 2>&1
if [ $? -ne 0 ] ; then
_echofull "mount failed: $MOUNT_OPTIONS"
return 1
@@ -318,7 +318,7 @@ _create_log()
# unmount the FS
_full "umount"
- umount $SCRATCH_DEV >>$seq.full 2>&1
+ umount $SCRATCH_DEV >>$RESULT_DIR/$seq.full 2>&1
if [ $? -ne 0 ] ; then
_echofull "umount failed"
return 1
@@ -334,7 +334,7 @@ _create_log_sync()
{
# mount the FS
_full " mount"
- _scratch_mount >>$seq.full 2>&1
+ _scratch_mount >>$RESULT_DIR/$seq.full 2>&1
if [ $? -ne 0 ] ; then
_echofull "mount failed: $MOUNT_OPTIONS"
return 1
@@ -349,7 +349,7 @@ _create_log_sync()
# unmount the FS
_full "umount"
- umount $SCRATCH_DEV >>$seq.full 2>&1
+ umount $SCRATCH_DEV >>$RESULT_DIR/$seq.full 2>&1
if [ $? -ne 0 ] ; then
_echofull "umount failed"
return 1
@@ -448,21 +448,21 @@ _require_v2log()
{
# test out mkfs to see if it supports "-l version=2"
export MKFS_OPTIONS="-l version=2"
- if ! _scratch_mkfs_xfs >>$seq.full 2>&1; then
+ if ! _scratch_mkfs_xfs >>$RESULT_DIR/$seq.full 2>&1; then
_notrun "mkfs does not support v2 logs"
fi
# test out mount to see if it mounts a v2 log fs
export MOUNT_OPTIONS="-o logbsize=32k"
- if ! _scratch_mount >>$seq.full 2>&1; then
+ if ! _scratch_mount >>$RESULT_DIR/$seq.full 2>&1; then
_notrun "mount/kernel does not support v2 logs"
fi
# check after unmount to see if it is clean
# i.e. it is not a 6.5.25 buggy version checking kernel
touch $SCRATCH_MNT/file
- umount $SCRATCH_DEV >>$seq.full 2>&1
- if _scratch_xfs_logprint -t | tee -a $seq.full \
+ umount $SCRATCH_DEV >>$RESULT_DIR/$seq.full 2>&1
+ if _scratch_xfs_logprint -t | tee -a $RESULT_DIR/$seq.full \
| head | grep -q "<DIRTY>"; then
_notrun "kernel does not support v2 logs"
fi
diff --git a/common.quota b/common.quota
index 2fa784b..ff80382 100644
--- a/common.quota
+++ b/common.quota
@@ -96,8 +96,8 @@ _file_as_id()
parent=`dirname $1`
if [ $3 = p ]; then
- echo PARENT: xfs_io -r -c "chproj $2" -c "chattr +P" $parent >>$seq.full
- $XFS_IO_PROG -r -c "chproj $2" -c "chattr +P" $parent >>$seq.full 2>&1
+ echo PARENT: xfs_io -r -c "chproj $2" -c "chattr +P" $parent >>$RESULT_DIR/$seq.full
+ $XFS_IO_PROG -r -c "chproj $2" -c "chattr +P" $parent >>$RESULT_DIR/$seq.full 2>&1
magik='$>' # (irrelevent, above set projid-inherit-on-parent)
elif [ $3 = u ]; then
magik='$>' # perlspeak for effective uid
@@ -107,7 +107,7 @@ _file_as_id()
_notrun "broken type in call to _file_as_id in test $seq"
fi
- perl <<EOF >>$seq.full 2>&1
+ perl <<EOF >>$RESULT_DIR/$seq.full 2>&1
\$| = 1;
$magik = $2;
if ($5 == 0) {
@@ -119,11 +119,11 @@ _file_as_id()
}
EOF
# for debugging the above euid change, try... [need write in cwd]
-# exec "dd if=/dev/zero of=$1 bs=$4 count=$5 >>$seq.full 2>&1";
+# exec "dd if=/dev/zero of=$1 bs=$4 count=$5 >>$RESULT_DIR/$seq.full 2>&1";
if [ $3 = p ]; then
- echo PARENT: xfs_io -r -c "chproj 0" -c "chattr -P" $parent >>$seq.full
- $XFS_IO_PROG -r -c "chproj 0" -c "chattr -P" $parent >>$seq.full 2>&1
+ echo PARENT: xfs_io -r -c "chproj 0" -c "chattr -P" $parent >>$RESULT_DIR/$seq.full
+ $XFS_IO_PROG -r -c "chproj 0" -c "chattr -P" $parent >>$RESULT_DIR/$seq.full 2>&1
fi
}
@@ -198,8 +198,8 @@ _qsetup()
_notrun "No quota support at mount time"
fi
- echo "Using output from '" `ls -l $seq.out` "'" >>$seq.full
- echo "and using type=$type id=$id" >>$seq.full
+ echo "Using output from '" `ls -l $seq.out` "'" >>$RESULT_DIR/$seq.full
+ echo "and using type=$type id=$id" >>$RESULT_DIR/$seq.full
}
#
@@ -229,7 +229,7 @@ _qmount_option()
# Ensure we have the given quota option - duplicates are fine
export MOUNT_OPTIONS="$MOUNT_OPTIONS -o $1"
- echo "MOUNT_OPTIONS = $MOUNT_OPTIONS" >>$seq.full
+ echo "MOUNT_OPTIONS = $MOUNT_OPTIONS" >>$RESULT_DIR/$seq.full
}
_check_quota_usage()
diff --git a/common.rc b/common.rc
index 7d5a66d..b53734b 100644
--- a/common.rc
+++ b/common.rc
@@ -357,9 +357,9 @@ _scratch_mkfs_xfs()
if [ $mkfs_status -ne 0 -a ! -z "$extra_mkfs_options" ]; then
echo "** mkfs failed with extra mkfs options added to \"$MKFS_OPTIONS\" by test $seq **" \
- >>$here/$seq.full
+ >>$RESULT_DIR/$seq.full
echo "** attempting to mkfs using only test $seq options: $extra_mkfs_options **" \
- >>$here/$seq.full
+ >>$RESULT_DIR/$seq.full
# running mkfs again. overwrite previous mkfs output files
$MKFS_XFS_PROG $SCRATCH_OPTIONS $extra_mkfs_options $SCRATCH_DEV \
2>$tmp_dir.mkfserr 1>$tmp_dir.mkfsstd
@@ -812,9 +812,9 @@ _do()
status=1; exit
fi
- (eval "echo '---' \"$_cmd\"") >>$here/$seq.full
+ (eval "echo '---' \"$_cmd\"") >>$RESULT_DIR/$seq.full
(eval "$_cmd") >$tmp._out 2>&1; ret=$?
- cat $tmp._out | _fix_malloc >>$here/$seq.full
+ cat $tmp._out | _fix_malloc >>$RESULT_DIR/$seq.full
if [ $# -eq 2 ]; then
if [ $ret -eq 0 ]; then
echo "done"
@@ -827,7 +827,7 @@ _do()
-o \( $# -eq 2 -a "$_do_die_on_error" = "message_only" \) ]
then
[ $# -ne 2 ] && echo
- eval "echo \"$_cmd\" failed \(returned $ret\): see $seq.full"
+ eval "echo \"$_cmd\" failed \(returned $ret\): see $RESULT_DIR/$seq.full"
status=1; exit
fi
@@ -838,7 +838,7 @@ _do()
#
_notrun()
{
- echo "$*" >$seq.notrun
+ echo "$*" > $RESULT_DIR/$seq.notrun
echo "$seq not run: $*"
status=0
exit
@@ -848,8 +848,8 @@ _notrun()
#
_fail()
{
- echo "$*" | tee -a $here/$seq.full
- echo "(see $seq.full for details)"
+ echo "$*" | tee -a $RESULT_DIR/$seq.full
+ echo "(see $RESULT_DIR/$seq.full for details)"
status=1
exit 1
}
@@ -1306,12 +1306,12 @@ _check_generic_filesystem()
fsck -t $FSTYP $FSCK_OPTIONS $device >$tmp.fsck 2>&1
if [ $? -ne 0 ]
then
- echo "_check_generic_filesystem: filesystem on $device is inconsistent (see $seq.full)"
+ echo "_check_generic_filesystem: filesystem on $device is inconsistent (see $RESULT_DIR/$seq.full)"
- echo "_check_generic filesystem: filesystem on $device is inconsistent" >>$here/$seq.full
- echo "*** fsck.$FSTYP output ***" >>$here/$seq.full
- cat $tmp.fsck >>$here/$seq.full
- echo "*** end fsck.$FSTYP output" >>$here/$seq.full
+ echo "_check_generic filesystem: filesystem on $device is inconsistent" >>$RESULT_DIR/$seq.full
+ echo "*** fsck.$FSTYP output ***" >>$RESULT_DIR/$seq.full
+ cat $tmp.fsck >>$RESULT_DIR/$seq.full
+ echo "*** end fsck.$FSTYP output" >>$RESULT_DIR/$seq.full
ok=0
fi
@@ -1319,9 +1319,9 @@ _check_generic_filesystem()
if [ $ok -eq 0 ]
then
- echo "*** mount output ***" >>$here/$seq.full
- _mount >>$here/$seq.full
- echo "*** end mount output" >>$here/$seq.full
+ echo "*** mount output ***" >>$RESULT_DIR/$seq.full
+ _mount >>$RESULT_DIR/$seq.full
+ echo "*** end mount output" >>$RESULT_DIR/$seq.full
elif [ "$type" = "$FSTYP" ]
then
# was mounted ...
@@ -1377,12 +1377,12 @@ _check_xfs_filesystem()
| tee $tmp.logprint | grep -q "<CLEAN>"
if [ $? -ne 0 -a "$HOSTOS" = "Linux" ]
then
- echo "_check_xfs_filesystem: filesystem on $device has dirty log (see $seq.full)"
+ echo "_check_xfs_filesystem: filesystem on $device has dirty log (see $RESULT_DIR/$seq.full)"
- echo "_check_xfs_filesystem: filesystem on $device has dirty log" >>$here/$seq.full
- echo "*** xfs_logprint -t output ***" >>$here/$seq.full
- cat $tmp.logprint >>$here/$seq.full
- echo "*** end xfs_logprint output" >>$here/$seq.full
+ echo "_check_xfs_filesystem: filesystem on $device has dirty log" >>$RESULT_DIR/$seq.full
+ echo "*** xfs_logprint -t output ***" >>$RESULT_DIR/$seq.full
+ cat $tmp.logprint >>$RESULT_DIR/$seq.full
+ echo "*** end xfs_logprint output" >>$RESULT_DIR/$seq.full
ok=0
fi
@@ -1391,12 +1391,12 @@ _check_xfs_filesystem()
_fix_malloc >$tmp.fs_check
if [ -s $tmp.fs_check ]
then
- echo "_check_xfs_filesystem: filesystem on $device is inconsistent (c) (see $seq.full)"
+ echo "_check_xfs_filesystem: filesystem on $device is inconsistent (c) (see $RESULT_DIR/$seq.full)"
- echo "_check_xfs_filesystem: filesystem on $device is inconsistent" >>$here/$seq.full
- echo "*** xfs_check output ***" >>$here/$seq.full
- cat $tmp.fs_check >>$here/$seq.full
- echo "*** end xfs_check output" >>$here/$seq.full
+ echo "_check_xfs_filesystem: filesystem on $device is inconsistent" >>$RESULT_DIR/$seq.full
+ echo "*** xfs_check output ***" >>$RESULT_DIR/$seq.full
+ cat $tmp.fs_check >>$RESULT_DIR/$seq.full
+ echo "*** end xfs_check output" >>$RESULT_DIR/$seq.full
ok=0
fi
@@ -1404,12 +1404,12 @@ _check_xfs_filesystem()
$XFS_REPAIR_PROG -n $extra_log_options $extra_rt_options $device >$tmp.repair 2>&1
if [ $? -ne 0 ]
then
- echo "_check_xfs_filesystem: filesystem on $device is inconsistent (r) (see $seq.full)"
+ echo "_check_xfs_filesystem: filesystem on $device is inconsistent (r) (see $RESULT_DIR/$seq.full)"
- echo "_check_xfs_filesystem: filesystem on $device is inconsistent" >>$here/$seq.full
- echo "*** xfs_repair -n output ***" >>$here/$seq.full
- cat $tmp.repair | _fix_malloc >>$here/$seq.full
- echo "*** end xfs_repair output" >>$here/$seq.full
+ echo "_check_xfs_filesystem: filesystem on $device is inconsistent" >>$RESULT_DIR/$seq.full
+ echo "*** xfs_repair -n output ***" >>$RESULT_DIR/$seq.full
+ cat $tmp.repair | _fix_malloc >>$RESULT_DIR/$seq.full
+ echo "*** end xfs_repair output" >>$RESULT_DIR/$seq.full
ok=0
fi
@@ -1417,9 +1417,9 @@ _check_xfs_filesystem()
if [ $ok -eq 0 ]
then
- echo "*** mount output ***" >>$here/$seq.full
- _mount >>$here/$seq.full
- echo "*** end mount output" >>$here/$seq.full
+ echo "*** mount output ***" >>$RESULT_DIR/$seq.full
+ _mount >>$RESULT_DIR/$seq.full
+ echo "*** end mount output" >>$RESULT_DIR/$seq.full
elif [ "$type" = "xfs" ]
then
_mount_or_remount_rw "$extra_mount_options" $device $mountpoint
@@ -1467,12 +1467,12 @@ _check_udf_filesystem()
OPT_ARG="-lastvalidblock $LAST_BLOCK"
fi
- rm -f $seq.checkfs
+ rm -f $RESULT_DIR/$seq.checkfs
sleep 1 # Due to a problem with time stamps in udf_test
- $here/src/udf_test $OPT_ARG $device | tee $here/$seq.checkfs | egrep "Error|Warning" | \
+ $here/src/udf_test $OPT_ARG $device | tee $RESULT_DIR/$seq.checkfs | egrep "Error|Warning" | \
_udf_test_known_error_filter | \
egrep -iv "Error count:.*[0-9]+.*total occurrences:.*[0-9]+|Warning count:.*[0-9]+.*total occurrences:.*[0-9]+" | \
- sed "s/^.*$/Warning UDF Verifier reported errors see $seq.checkfs./g"
+ sed "s/^.*$/Warning UDF Verifier reported errors see $RESULT_DIR/$seq.checkfs./g"
}
@@ -1513,12 +1513,12 @@ _check_btrfs_filesystem()
btrfsck $device >$tmp.fsck 2>&1
if [ $? -ne 0 ]
then
- echo "_check_btrfs_filesystem: filesystem on $device is inconsistent (see $seq.full)"
+ echo "_check_btrfs_filesystem: filesystem on $device is inconsistent (see $RESULT_DIR/$seq.full)"
- echo "_check_btrfs_filesystem: filesystem on $device is inconsistent" >>$here/$seq.full
- echo "*** fsck.$FSTYP output ***" >>$here/$seq.full
- cat $tmp.fsck >>$here/$seq.full
- echo "*** end fsck.$FSTYP output" >>$here/$seq.full
+ echo "_check_btrfs_filesystem: filesystem on $device is inconsistent" >>$RESULT_DIR/$seq.full
+ echo "*** fsck.$FSTYP output ***" >>$RESULT_DIR/$seq.full
+ cat $tmp.fsck >>$RESULT_DIR/$seq.full
+ echo "*** end fsck.$FSTYP output" >>$RESULT_DIR/$seq.full
ok=0
fi
@@ -1526,9 +1526,9 @@ _check_btrfs_filesystem()
if [ $ok -eq 0 ]
then
- echo "*** mount output ***" >>$here/$seq.full
- _mount >>$here/$seq.full
- echo "*** end mount output" >>$here/$seq.full
+ echo "*** mount output ***" >>$RESULT_DIR/$seq.full
+ _mount >>$RESULT_DIR/$seq.full
+ echo "*** end mount output" >>$RESULT_DIR/$seq.full
elif [ "$type" = "$FSTYP" ]
then
# was mounted ...
diff --git a/common.scsi_debug b/common.scsi_debug
index a085a67..f05c8db 100644
--- a/common.scsi_debug
+++ b/common.scsi_debug
@@ -47,7 +47,7 @@ _get_scsi_debug_dev()
let phys_exp=phys_exp+1
done
opts="sector_size=$logical physblk_exp=$phys_exp lowest_aligned=$unaligned dev_size_mb=$size"
- echo "scsi_debug options $opts" >> $seq.full
+ echo "scsi_debug options $opts" >> $RESULT_DIR/$seq.full
modprobe scsi_debug $opts
[ $? -eq 0 ] || _fail "scsi_debug modprobe failed"
sleep 1
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 17/18] xfstests: convert tests to use new results directory
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (15 preceding siblings ...)
2012-07-26 9:28 ` [PATCH 16/18] xfstests: Introduce a results directory Dave Chinner
@ 2012-07-26 9:28 ` Dave Chinner
2012-09-05 12:00 ` Boris Ranto
2012-07-26 9:28 ` [PATCH 18/18] xfstests: fix _link_out_file callers Dave Chinner
` (2 subsequent siblings)
19 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:28 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
Essentially the change is simply this. Converting:
... >> $seq.????
to:
.... >> $RESULT_DIR/$seq.????
so that output files are directed to the defined output directory.
sed to the rescue:
$ sed -i -e '/^seq=.*$/a seqres=$RESULT_DIR/$seq' -e 's/seq.full/seqres.full/' tests/*/*
will do most of the work automatically.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
new | 3 ++-
tests/btrfs/254 | 1 +
tests/btrfs/264 | 1 +
tests/btrfs/265 | 1 +
tests/btrfs/276 | 31 ++++++++++++++++---------------
tests/btrfs/284 | 1 +
tests/ext4/271 | 3 ++-
tests/generic/001 | 9 +++++----
tests/generic/002 | 1 +
tests/generic/005 | 1 +
tests/generic/006 | 1 +
tests/generic/007 | 1 +
tests/generic/010 | 5 +++--
tests/generic/011 | 7 ++++---
tests/generic/013 | 21 +++++++++++----------
tests/generic/014 | 1 +
tests/generic/015 | 9 +++++----
tests/generic/020 | 9 +++++----
tests/generic/053 | 1 +
tests/generic/062 | 15 ++++++++-------
tests/generic/069 | 13 +++++++------
tests/generic/070 | 3 ++-
tests/generic/074 | 11 ++++++-----
tests/generic/075 | 7 ++++---
tests/generic/076 | 13 +++++++------
tests/generic/077 | 21 +++++++++++----------
tests/generic/079 | 1 +
tests/generic/083 | 15 ++++++++-------
tests/generic/088 | 3 ++-
tests/generic/089 | 7 ++++---
tests/generic/091 | 9 +++++----
tests/generic/093 | 3 ++-
tests/generic/097 | 3 ++-
tests/generic/099 | 3 ++-
tests/generic/100 | 11 ++++++-----
tests/generic/105 | 11 ++++++-----
tests/generic/112 | 7 ++++---
tests/generic/113 | 1 +
tests/generic/117 | 15 ++++++++-------
tests/generic/120 | 1 +
tests/generic/123 | 1 +
tests/generic/124 | 1 +
tests/generic/125 | 1 +
tests/generic/126 | 1 +
tests/generic/127 | 1 +
tests/generic/128 | 1 +
tests/generic/129 | 1 +
tests/generic/130 | 1 +
tests/generic/131 | 1 +
tests/generic/132 | 1 +
tests/generic/133 | 1 +
tests/generic/135 | 1 +
tests/generic/141 | 1 +
tests/generic/169 | 15 ++++++++-------
tests/generic/184 | 1 +
tests/generic/192 | 9 +++++----
tests/generic/193 | 3 ++-
tests/generic/198 | 3 ++-
tests/generic/204 | 5 +++--
tests/generic/207 | 1 +
tests/generic/208 | 1 +
tests/generic/209 | 1 +
tests/generic/210 | 1 +
tests/generic/211 | 1 +
tests/generic/212 | 1 +
tests/generic/213 | 3 ++-
tests/generic/214 | 3 ++-
tests/generic/215 | 3 ++-
tests/generic/219 | 15 ++++++++-------
tests/generic/221 | 1 +
tests/generic/223 | 13 +++++++------
tests/generic/224 | 7 ++++---
tests/generic/225 | 3 ++-
tests/generic/226 | 9 +++++----
tests/generic/228 | 3 ++-
tests/generic/230 | 41 +++++++++++++++++++++--------------------
tests/generic/231 | 9 +++++----
tests/generic/232 | 11 ++++++-----
tests/generic/233 | 11 ++++++-----
tests/generic/234 | 7 ++++---
tests/generic/235 | 13 +++++++------
tests/generic/236 | 1 +
tests/generic/237 | 3 ++-
tests/generic/239 | 1 +
tests/generic/240 | 3 ++-
tests/generic/241 | 5 +++--
tests/generic/245 | 1 +
tests/generic/246 | 1 +
tests/generic/247 | 1 +
tests/generic/248 | 1 +
tests/generic/249 | 7 ++++---
tests/generic/251 | 1 +
tests/generic/255 | 1 +
tests/generic/256 | 1 +
tests/generic/257 | 3 ++-
tests/generic/258 | 1 +
tests/generic/260 | 1 +
tests/generic/263 | 9 +++++----
tests/generic/269 | 7 ++++---
tests/generic/270 | 7 ++++---
tests/generic/273 | 7 ++++---
tests/generic/274 | 41 +++++++++++++++++++++--------------------
tests/generic/275 | 5 +++--
tests/generic/277 | 1 +
tests/generic/280 | 3 ++-
tests/shared/051 | 3 ++-
tests/shared/068 | 29 +++++++++++++++--------------
tests/shared/218 | 15 ++++++++-------
tests/shared/243 | 23 ++++++++++++-----------
tests/shared/272 | 11 ++++++-----
tests/udf/098 | 3 ++-
tests/udf/101 | 1 +
tests/udf/102 | 1 +
tests/xfs/003 | 1 +
tests/xfs/004 | 17 +++++++++--------
tests/xfs/008 | 1 +
tests/xfs/009 | 1 +
tests/xfs/012 | 1 +
tests/xfs/016 | 35 ++++++++++++++++++-----------------
tests/xfs/017 | 31 ++++++++++++++++---------------
tests/xfs/018 | 3 ++-
tests/xfs/019 | 3 ++-
tests/xfs/021 | 5 +++--
tests/xfs/022 | 1 +
tests/xfs/023 | 1 +
tests/xfs/024 | 5 +++--
tests/xfs/025 | 1 +
tests/xfs/026 | 1 +
tests/xfs/027 | 1 +
tests/xfs/028 | 3 ++-
tests/xfs/029 | 1 +
tests/xfs/030 | 1 +
tests/xfs/031 | 13 +++++++------
tests/xfs/032 | 15 ++++++++-------
tests/xfs/033 | 1 +
tests/xfs/034 | 13 +++++++------
tests/xfs/035 | 1 +
tests/xfs/036 | 1 +
tests/xfs/037 | 1 +
tests/xfs/038 | 1 +
tests/xfs/039 | 1 +
tests/xfs/040 | 7 ++++---
tests/xfs/041 | 5 +++--
tests/xfs/042 | 7 ++++---
tests/xfs/043 | 1 +
tests/xfs/044 | 1 +
tests/xfs/045 | 1 +
tests/xfs/046 | 1 +
tests/xfs/047 | 3 ++-
tests/xfs/048 | 1 +
tests/xfs/049 | 53 +++++++++++++++++++++++++++--------------------------
tests/xfs/050 | 31 ++++++++++++++++---------------
tests/xfs/052 | 19 ++++++++++---------
tests/xfs/054 | 7 ++++---
tests/xfs/055 | 1 +
tests/xfs/056 | 1 +
tests/xfs/057 | 1 +
tests/xfs/058 | 1 +
tests/xfs/059 | 1 +
tests/xfs/060 | 1 +
tests/xfs/061 | 1 +
tests/xfs/063 | 1 +
tests/xfs/064 | 9 +++++----
tests/xfs/065 | 1 +
tests/xfs/066 | 1 +
tests/xfs/067 | 9 +++++----
tests/xfs/071 | 17 +++++++++--------
tests/xfs/072 | 3 ++-
tests/xfs/073 | 1 +
tests/xfs/078 | 1 +
tests/xfs/080 | 1 +
tests/xfs/081 | 3 ++-
tests/xfs/082 | 3 ++-
tests/xfs/084 | 1 +
tests/xfs/085 | 11 ++++++-----
tests/xfs/086 | 13 +++++++------
tests/xfs/087 | 17 +++++++++--------
tests/xfs/090 | 1 +
tests/xfs/092 | 1 +
tests/xfs/094 | 1 +
tests/xfs/095 | 1 +
tests/xfs/096 | 5 +++--
tests/xfs/103 | 1 +
tests/xfs/104 | 15 ++++++++-------
tests/xfs/106 | 5 +++--
tests/xfs/107 | 5 +++--
tests/xfs/108 | 15 ++++++++-------
tests/xfs/109 | 3 ++-
tests/xfs/110 | 1 +
tests/xfs/111 | 1 +
tests/xfs/114 | 31 ++++++++++++++++---------------
tests/xfs/115 | 11 ++++++-----
tests/xfs/116 | 1 +
tests/xfs/118 | 3 ++-
tests/xfs/119 | 1 +
tests/xfs/121 | 17 +++++++++--------
tests/xfs/122 | 7 ++++---
tests/xfs/134 | 5 +++--
tests/xfs/136 | 1 +
tests/xfs/137 | 1 +
tests/xfs/138 | 1 +
tests/xfs/139 | 1 +
tests/xfs/140 | 1 +
tests/xfs/142 | 1 +
tests/xfs/143 | 1 +
tests/xfs/144 | 1 +
tests/xfs/145 | 1 +
tests/xfs/146 | 1 +
tests/xfs/147 | 1 +
tests/xfs/148 | 1 +
tests/xfs/149 | 13 +++++++------
tests/xfs/150 | 1 +
tests/xfs/151 | 3 ++-
tests/xfs/152 | 1 +
tests/xfs/153 | 1 +
tests/xfs/154 | 1 +
tests/xfs/155 | 1 +
tests/xfs/156 | 5 +++--
tests/xfs/157 | 1 +
tests/xfs/158 | 1 +
tests/xfs/159 | 1 +
tests/xfs/160 | 1 +
tests/xfs/161 | 1 +
tests/xfs/162 | 1 +
tests/xfs/163 | 1 +
tests/xfs/164 | 5 +++--
tests/xfs/165 | 7 ++++---
tests/xfs/166 | 5 +++--
tests/xfs/167 | 5 +++--
tests/xfs/168 | 5 +++--
tests/xfs/170 | 3 ++-
tests/xfs/171 | 3 ++-
tests/xfs/172 | 3 ++-
tests/xfs/173 | 3 ++-
tests/xfs/174 | 3 ++-
tests/xfs/175 | 3 ++-
tests/xfs/176 | 3 ++-
tests/xfs/177 | 1 +
tests/xfs/178 | 1 +
tests/xfs/179 | 1 +
tests/xfs/180 | 1 +
tests/xfs/181 | 17 +++++++++--------
tests/xfs/182 | 1 +
tests/xfs/183 | 1 +
tests/xfs/185 | 1 +
tests/xfs/186 | 7 ++++---
tests/xfs/187 | 5 +++--
tests/xfs/188 | 3 ++-
tests/xfs/189 | 3 ++-
tests/xfs/190 | 13 +++++++------
tests/xfs/191 | 5 +++--
tests/xfs/194 | 19 ++++++++++---------
tests/xfs/195 | 3 ++-
tests/xfs/196 | 3 ++-
tests/xfs/197 | 3 ++-
tests/xfs/199 | 3 ++-
tests/xfs/200 | 3 ++-
tests/xfs/201 | 3 ++-
tests/xfs/202 | 3 ++-
tests/xfs/203 | 3 ++-
tests/xfs/205 | 7 ++++---
tests/xfs/206 | 3 ++-
tests/xfs/216 | 1 +
tests/xfs/217 | 1 +
tests/xfs/220 | 1 +
tests/xfs/222 | 3 ++-
tests/xfs/227 | 25 +++++++++++++------------
tests/xfs/229 | 1 +
tests/xfs/238 | 1 +
tests/xfs/242 | 1 +
tests/xfs/244 | 17 +++++++++--------
tests/xfs/250 | 1 +
tests/xfs/252 | 1 +
tests/xfs/253 | 1 +
tests/xfs/259 | 1 +
tests/xfs/261 | 1 +
tests/xfs/262 | 1 +
tests/xfs/266 | 1 +
tests/xfs/267 | 1 +
tests/xfs/268 | 1 +
tests/xfs/278 | 25 +++++++++++++------------
tests/xfs/279 | 11 ++++++-----
tests/xfs/281 | 1 +
tests/xfs/282 | 5 +++--
tests/xfs/283 | 5 +++--
285 files changed, 905 insertions(+), 620 deletions(-)
diff --git a/new b/new
index 8dde6c5..94638f6 100755
--- a/new
+++ b/new
@@ -106,6 +106,7 @@ cat <<End-of-File >$id
#
# creator
seq=\`basename \$0\`
+seqres=$RESULT_DIR/$seq
echo "QA output created by \$seq"
here=\`pwd\`
@@ -134,7 +135,7 @@ exit
# optional stuff if your test has verbose output to help resolve problems
#echo
-#echo "If failure, check \$seq.full (this) and \$seq.full.ok (reference)"
+#echo "If failure, check \$seqres.full (this) and \$seqres.full.ok (reference)"
# success, all done
status=0
diff --git a/tests/btrfs/254 b/tests/btrfs/254
index 73089d1..ec3d2c5 100755
--- a/tests/btrfs/254
+++ b/tests/btrfs/254
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/btrfs/264 b/tests/btrfs/264
index a589c7c..46a4926 100755
--- a/tests/btrfs/264
+++ b/tests/btrfs/264
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/btrfs/265 b/tests/btrfs/265
index f28d4e5..760f383 100755
--- a/tests/btrfs/265
+++ b/tests/btrfs/265
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/btrfs/276 b/tests/btrfs/276
index fc87c28..63dec4d 100755
--- a/tests/btrfs/276
+++ b/tests/btrfs/276
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -54,7 +55,7 @@ _require_nobigloopfs
_require_btrfs inspect-internal
_require_command "/usr/sbin/filefrag"
-rm -f $seq.full
+rm -f $seqres.full
FILEFRAG_FILTER='if (/, blocksize (\d+)/) {$blocksize = $1; next} ($ext, '\
'$logical, $physical, $expected, $length, $flags) = (/^\s*(\d+)\s+(\d+)'\
@@ -68,18 +69,18 @@ FILEFRAG_FILTER='if (/, blocksize (\d+)/) {$blocksize = $1; next} ($ext, '\
# sample output: "1234#10#5678" -> physical 1234, length 10, logical 5678
_filter_extents()
{
- tee -a $seq.full | $PERL_PROG -ne "$FILEFRAG_FILTER"
+ tee -a $seqres.full | $PERL_PROG -ne "$FILEFRAG_FILTER"
}
_check_file_extents()
{
cmd="filefrag -vx $1"
- echo "# $cmd" >> $seq.full
+ echo "# $cmd" >> $seqres.full
out=`$cmd | _filter_extents`
if [ -z "$out" ]; then
return 1
fi
- echo "after filter: $out" >> $seq.full
+ echo "after filter: $out" >> $seqres.full
echo $out
return 0
}
@@ -95,9 +96,9 @@ _btrfs_inspect_addr()
expect_inum=$4
file=$5
cmd="$BTRFS_UTIL_PROG inspect-internal logical-resolve -P $addr $mp"
- echo "# $cmd" >> $seq.full
+ echo "# $cmd" >> $seqres.full
out=`$cmd`
- echo "$out" >> $seq.full
+ echo "$out" >> $seqres.full
grep_expr="inode $expect_inum offset $expect_addr root"
echo "$out" | grep "^$grep_expr 5$" >/dev/null
ret=$?
@@ -128,9 +129,9 @@ _btrfs_inspect_inum()
snap_name=$3
mp="$SCRATCH_MNT/$snap_name"
cmd="$BTRFS_UTIL_PROG inspect-internal inode-resolve $inum $mp"
- echo "# $cmd" >> $seq.full
+ echo "# $cmd" >> $seqres.full
out=`$cmd`
- echo "$out" >> $seq.full
+ echo "$out" >> $seqres.full
grep_expr="^$file$"
cnt=`echo "$out" | grep "$grep_expr" | wc -l`
if [ $cnt -ge "1" ]; then
@@ -151,9 +152,9 @@ _btrfs_inspect_check()
logical=$4
snap_name=$5
cmd="stat -c %i $file"
- echo "# $cmd" >> $seq.full
+ echo "# $cmd" >> $seqres.full
inum=`$cmd`
- echo "$inum" >> $seq.full
+ echo "$inum" >> $seqres.full
_btrfs_inspect_addr $SCRATCH_MNT $physical $logical $inum $file
ret=$?
if [ $ret -eq 0 ]; then
@@ -165,8 +166,8 @@ _btrfs_inspect_check()
run_check()
{
- echo "# $@" >> $seq.full 2>&1
- "$@" >> $seq.full 2>&1 || _fail "failed: '$@'"
+ echo "# $@" >> $seqres.full 2>&1
+ "$@" >> $seqres.full 2>&1 || _fail "failed: '$@'"
}
workout()
@@ -177,9 +178,9 @@ workout()
snap_name=$4
umount $SCRATCH_DEV >/dev/null 2>&1
- echo "*** mkfs -dsize=$fsz" >>$seq.full
- echo "" >>$seq.full
- _scratch_mkfs_sized $fsz >>$seq.full 2>&1 \
+ echo "*** mkfs -dsize=$fsz" >>$seqres.full
+ echo "" >>$seqres.full
+ _scratch_mkfs_sized $fsz >>$seqres.full 2>&1 \
|| _fail "size=$fsz mkfs failed"
run_check _scratch_mount
# -w ensures that the only ops are ones which cause write I/O
diff --git a/tests/btrfs/284 b/tests/btrfs/284
index f8d0340..41688d3 100644
--- a/tests/btrfs/284
+++ b/tests/btrfs/284
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here="`pwd`"
tmp=/tmp/$$
diff --git a/tests/ext4/271 b/tests/ext4/271
index 50b4c0b..6a0e7b1 100755
--- a/tests/ext4/271
+++ b/tests/ext4/271
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -40,7 +41,7 @@ _supported_os Linux
_need_to_be_root
_require_scratch
-_scratch_mkfs_sized $((128 * 1024 * 1024)) >> $seq.full 2>&1
+_scratch_mkfs_sized $((128 * 1024 * 1024)) >> $seqres.full 2>&1
# -onoload and EXT4_SYNC_FL on file is important becase result in
# metadata sync writes inside ext4_handle_dirty_metadata()
diff --git a/tests/generic/001 b/tests/generic/001
index b9997f3..a6659ab 100755
--- a/tests/generic/001
+++ b/tests/generic/001
@@ -32,6 +32,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
# get standard environment, filters and checks
@@ -189,7 +190,7 @@ _mark_iteration()
#
_chain()
{
- $AWK_PROG -v full_file=$here/$seq.full -v verify=$verify <$tmp.config '
+ $AWK_PROG -v full_file=$here/$seqres.full -v verify=$verify <$tmp.config '
BEGIN { nfile = 0 }
/^\#/ { next }
{ file[nfile] = $1
@@ -237,7 +238,7 @@ END { srand('$iter')
}
}
}' \
- | tee -a $here/$seq.full | sh
+ | tee -a $here/$seqres.full | sh
}
_check()
@@ -291,7 +292,7 @@ _cleanup()
fi
}
-rm -f $here/$seq.full
+rm -f $here/$seqres.full
status=0
_cleanup
status=1
@@ -305,7 +306,7 @@ _setup
for iter in 1 2 3 4 5
do
echo -n "iter $iter chain ... "
- echo "iter $iter" >> $here/$seq.full
+ echo "iter $iter" >> $here/$seqres.full
_chain
_check
if [ -f $tmp.bad ]
diff --git a/tests/generic/002 b/tests/generic/002
index db63fa0..ba1a5cf 100755
--- a/tests/generic/002
+++ b/tests/generic/002
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
# get standard environment, filters and checks
diff --git a/tests/generic/005 b/tests/generic/005
index 27da3d3..ba28502 100755
--- a/tests/generic/005
+++ b/tests/generic/005
@@ -33,6 +33,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/006 b/tests/generic/006
index 1437b46..9949d84 100755
--- a/tests/generic/006
+++ b/tests/generic/006
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/007 b/tests/generic/007
index 2bb981f..2d026a3 100755
--- a/tests/generic/007
+++ b/tests/generic/007
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/010 b/tests/generic/010
index 245f407..3587f21 100755
--- a/tests/generic/010
+++ b/tests/generic/010
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -59,11 +60,11 @@ _supported_os IRIX Linux
_setup_testdir
-rm -f $seq.full
+rm -f $seqres.full
cd $testdir
-$here/src/dbtest -l 5 -n 1000 2>&1 | tee -a $here/$seq.full | _filter_dbtest
+$here/src/dbtest -l 5 -n 1000 2>&1 | tee -a $here/$seqres.full | _filter_dbtest
# success, all done
exit
diff --git a/tests/generic/011 b/tests/generic/011
index 4ede2d8..e5c6bbf 100755
--- a/tests/generic/011
+++ b/tests/generic/011
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
out=""
@@ -51,7 +52,7 @@ _setup_testdir
out=$testdir/dirstress.$$
-rm -f $seq.full
+rm -f $seqres.full
_test()
{
@@ -63,8 +64,8 @@ _test()
if ! $here/src/dirstress -d $out -f $count $args >$tmp.out 2>&1
then
echo " dirstress failed"
- echo "*** TEST $test -d $out -f $count $args" >>$seq.full
- cat $tmp.out >>$seq.full
+ echo "*** TEST $test -d $out -f $count $args" >>$seqres.full
+ cat $tmp.out >>$seqres.full
status=1
fi
}
diff --git a/tests/generic/013 b/tests/generic/013
index 0879a2a..984ed09 100755
--- a/tests/generic/013
+++ b/tests/generic/013
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -73,15 +74,15 @@ _do_test()
echo "fsstress.$_n : $_param"
echo "-----------------------------------------------"
# -m limits number of users/groups so check doesn't fail (malloc) later
- dbgoutfile=$seq.full
+ dbgoutfile=$seqres.full
if ! $FSSTRESS_PROG $_param $FSSTRESS_AVOID -v -m 8 -n $_count -d $out >>$dbgoutfile 2>&1
then
- echo " fsstress (count=$_count) returned $? - see $seq.full"
- echo "--------------------------------------" >>$here/$seq.full
- echo "$_n - output from fsstress:" >>$here/$seq.full
- echo "--------------------------------------" >>$here/$seq.full
- echo "<NOT LOGGED>" >>$here/$seq.full
- #cat $tmp.out >>$here/$seq.full
+ echo " fsstress (count=$_count) returned $? - see $seqres.full"
+ echo "--------------------------------------" >>$here/$seqres.full
+ echo "$_n - output from fsstress:" >>$here/$seqres.full
+ echo "--------------------------------------" >>$here/$seqres.full
+ echo "<NOT LOGGED>" >>$here/$seqres.full
+ #cat $tmp.out >>$here/$seqres.full
status=1
fi
@@ -95,7 +96,7 @@ _supported_os IRIX Linux
_setup_testdir
-rm -f $here/$seq.full
+rm -f $here/$seqres.full
echo "brevity is wit..."
count=1000
@@ -115,8 +116,8 @@ _do_test 2 "-p $procs -r" $count
_do_test 3 "-p 4 -z -f rmdir=10 -f link=10 -f creat=10 -f mkdir=10 -f rename=30 -f stat=30 -f unlink=30 -f truncate=20" $count
-# if all ok by here then probably don't need $seq.full
-rm -f $seq.full
+# if all ok by here then probably don't need $seqres.full
+rm -f $seqres.full
exit
diff --git a/tests/generic/014 b/tests/generic/014
index 93caaa6..096e4e5 100755
--- a/tests/generic/014
+++ b/tests/generic/014
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/015 b/tests/generic/015
index 52ab251..a77d2f7 100755
--- a/tests/generic/015
+++ b/tests/generic/015
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -56,7 +57,7 @@ _scratch_mkfs_sized `expr 50 \* 1024 \* 1024` >/dev/null 2>&1 \
|| _fail "mkfs failed"
_scratch_mount || _fail "mount failed"
out=$SCRATCH_MNT/fillup.$$
-rm -f $seq.full
+rm -f $seqres.full
free0=`_free`
if [ -z "$free0" ]
@@ -64,7 +65,7 @@ then
echo " *** failed to get free space (0)"
exit 1
fi
-echo "free space at start $free0" >> $seq.full
+echo "free space at start $free0" >> $seqres.full
echo "fill disk:" # well, filesystem really - not disk
@@ -78,7 +79,7 @@ then
echo " *** failed to get free space (1)"
exit 1
fi
-echo "free space after fill $free1" >> $seq.full
+echo "free space after fill $free1" >> $seqres.full
if [ ! -e $out ]
then
@@ -116,7 +117,7 @@ then
echo " *** failed to get free space (2)"
exit 1
fi
-echo "free space after delete $free2" >> $seq.full
+echo "free space after delete $free2" >> $seqres.full
echo -n " !!! "
_within_tolerance "free space" $free2 $free0 1% -v
diff --git a/tests/generic/020 b/tests/generic/020
index 2bd1d9f..42465d8 100755
--- a/tests/generic/020
+++ b/tests/generic/020
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -85,7 +86,7 @@ _require_attrs
_setup_testdir
-rm -f $seq.full
+rm -f $seqres.full
testfile=$testdir/attribute_$$
@@ -120,7 +121,7 @@ v=0
while [ $v -lt $MAX_ATTRS ]
do
- echo -n "value_$v" | attr -s "attribute_$v" $testfile >>$seq.full
+ echo -n "value_$v" | attr -s "attribute_$v" $testfile >>$seqres.full
if [ $? -ne 0 ]
then
echo "!!! failed to add \"attribute_$v\""
@@ -133,7 +134,7 @@ done
echo "*** check"
# don't print it all out...
getfattr --absolute-names $testfile \
- | tee -a $seq.full \
+ | tee -a $seqres.full \
| $AWK_PROG '
/^#/ { next }
/^[ ]*$/ { next }
@@ -145,7 +146,7 @@ echo "*** remove lots of attributes"
v=0
while [ $v -lt $MAX_ATTRS ]
do
- if ! $ATTR_PROG -r "attribute_$v" $testfile >>$seq.full
+ if ! $ATTR_PROG -r "attribute_$v" $testfile >>$seqres.full
then
echo "!!! failed to remove \"attribute_$v\""
exit 1
diff --git a/tests/generic/053 b/tests/generic/053
index 388c9b4..99dd1b0 100755
--- a/tests/generic/053
+++ b/tests/generic/053
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/062 b/tests/generic/062
index 5a6081e..27907a9 100755
--- a/tests/generic/062
+++ b/tests/generic/062
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -75,7 +76,7 @@ _supported_os Linux
_require_scratch
_require_attrs
-rm -f $tmp.backup1 $tmp.backup2 $seq.full
+rm -f $tmp.backup1 $tmp.backup2 $seqres.full
# real QA test starts here
_scratch_mkfs > /dev/null 2>&1 || _fail "mkfs failed"
@@ -181,8 +182,8 @@ _backup()
{
# NB: no filtering of scratch here... (need to restore too)
$GETFATTR_PROG --absolute-names -dh -R -m '.' $SCRATCH_MNT >$1
- echo BACKUP $1 >>$seq.full
- cat $1 >> $seq.full
+ echo BACKUP $1 >>$seqres.full
+ cat $1 >> $seqres.full
[ ! -s $1 ] && echo "warning: $1 (backup file) is empty"
}
@@ -191,8 +192,8 @@ _backup $tmp.backup1
echo "*** clear out the scratch device"
rm -fr $SCRATCH_MNT/*
-echo "AFTER REMOVE" >>$seq.full
-getfattr -L -R -m '.' $SCRATCH_MNT >>$seq.full
+echo "AFTER REMOVE" >>$seqres.full
+getfattr -L -R -m '.' $SCRATCH_MNT >>$seqres.full
echo "*** reset test bed with no extended attributes"
_create_test_bed
@@ -202,8 +203,8 @@ echo "*** restore everything"
setfattr -h --restore=$tmp.backup1
_backup $tmp.backup2
-echo "AFTER RESTORE" >>$seq.full
-getfattr -L -R -m '.' $SCRATCH_MNT >>$seq.full
+echo "AFTER RESTORE" >>$seqres.full
+getfattr -L -R -m '.' $SCRATCH_MNT >>$seqres.full
echo "*** compare before and after backups"
diff $tmp.backup1 $tmp.backup2
diff --git a/tests/generic/069 b/tests/generic/069
index 3451715..b2b18a9 100755
--- a/tests/generic/069
+++ b/tests/generic/069
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -39,7 +40,7 @@ _supported_fs generic
_supported_os IRIX Linux
_require_scratch
-rm -f $seq.full
+rm -f $seqres.full
umount $SCRATCH_DEV >/dev/null 2>&1
@@ -60,19 +61,19 @@ done
cd $here
wait
-ls -lh $SCRATCH_MNT >> $seq.full
-echo "*** PIDs file" >> $seq.full
-cat $SCRATCH_MNT/pids >> $seq.full
+ls -lh $SCRATCH_MNT >> $seqres.full
+echo "*** PIDs file" >> $seqres.full
+cat $SCRATCH_MNT/pids >> $seqres.full
cat $SCRATCH_MNT/pids | while read pid size
do
echo "*** checking file with $size integers"
- echo checking pid=$pid size=$size >> $seq.full
+ echo checking pid=$pid size=$size >> $seqres.full
$here/src/append_reader $SCRATCH_MNT/testfile.$pid
status=$?
[ $status -ne 0 ] && \
echo "maybe corrupt O_APPEND to $SCRATCH_MOUNT/testfile.$pid!"
- echo status: $status >> $seq.full
+ echo status: $status >> $seqres.full
done
# success, all done
diff --git a/tests/generic/070 b/tests/generic/070
index 1d978cd..4e86de8 100755
--- a/tests/generic/070
+++ b/tests/generic/070
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -60,7 +61,7 @@ $FSSTRESS_PROG \
-f unresvsp=0 \
-f attr_set=100 \
-f attr_remove=100 \
- -p 1 -n 10000 -S c >$seq.full 2>&1
+ -p 1 -n 10000 -S c >$seqres.full 2>&1
status=$?
exit
diff --git a/tests/generic/074 b/tests/generic/074
index 0e5e820..c795dc7 100755
--- a/tests/generic/074
+++ b/tests/generic/074
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -64,9 +65,9 @@ _do_test()
echo "-----------------------------------------------"
echo "fstest.$_n : $_filter_param"
echo "-----------------------------------------------"
- if ! $here/src/fstest $_param -p $out >>$seq.full
+ if ! $here/src/fstest $_param -p $out >>$seqres.full
then
- echo " fstest ($_param) returned $? - see $seq.full"
+ echo " fstest ($_param) returned $? - see $seqres.full"
status=1
exit
fi
@@ -107,7 +108,7 @@ _process_args()
# real QA test starts here
-rm -f $here/$seq.full
+rm -f $here/$seqres.full
_supported_fs generic
_supported_os IRIX Linux
@@ -153,8 +154,8 @@ fi
# can override the params here
_process_args "$@"
-echo "Params are for $param_type" >>$seq.full
-echo "Params: n = $numchildren l = $numloops f = $numfiles" >>$seq.full
+echo "Params are for $param_type" >>$seqres.full
+echo "Params: n = $numchildren l = $numloops f = $numfiles" >>$seqres.full
_setup_testdir
diff --git a/tests/generic/075 b/tests/generic/075
index de581b6..8012cc1 100755
--- a/tests/generic/075
+++ b/tests/generic/075
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -133,12 +134,12 @@ numops2=10000
# can override the params here
_process_args "$@"
-echo "Params are for $param_type" >>$seq.full
-echo "Params: n = $numops1 N = $numops2 l = $filelen" >>$seq.full
+echo "Params are for $param_type" >>$seqres.full
+echo "Params: n = $numops1 N = $numops2 l = $filelen" >>$seqres.full
_setup_testdir
-rm -f $here/$seq.full
+rm -f $here/$seqres.full
echo "brevity is wit..."
_check_test_fs
diff --git a/tests/generic/076 b/tests/generic/076
index a8b5d4a..b8db582 100755
--- a/tests/generic/076
+++ b/tests/generic/076
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -58,13 +59,13 @@ _require_scratch
echo "*** init fs"
-rm -f $seq.full
+rm -f $seqres.full
umount $SCRATCH_DEV >/dev/null 2>&1
-echo "*** MKFS ***" >>$seq.full
-echo "" >>$seq.full
-_scratch_mkfs >>$seq.full 2>&1 \
+echo "*** MKFS ***" >>$seqres.full
+echo "" >>$seqres.full
+_scratch_mkfs >>$seqres.full 2>&1 \
|| _fail "mkfs failed"
-_scratch_mount >>$seq.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed"
echo "*** test concurrent block/fs access"
@@ -72,7 +73,7 @@ echo "*** test concurrent block/fs access"
cat $SCRATCH_DEV >/dev/null &
pid=$!
-$FSSTRESS_PROG -d $SCRATCH_MNT -p 2 -n 2000 $FSSTRESS_AVOID >>$seq.full
+$FSSTRESS_PROG -d $SCRATCH_MNT -p 2 -n 2000 $FSSTRESS_AVOID >>$seqres.full
_lets_get_pidst
_check_scratch_fs
diff --git a/tests/generic/077 b/tests/generic/077
index 2b86a37..3113119 100755
--- a/tests/generic/077
+++ b/tests/generic/077
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -56,29 +57,29 @@ _require_user
echo "*** create filesystem"
-rm -f $seq.full
+rm -f $seqres.full
umount $SCRATCH_DEV >/dev/null 2>&1
-echo "*** MKFS ***" >>$seq.full
-echo "" >>$seq.full
+echo "*** MKFS ***" >>$seqres.full
+echo "" >>$seqres.full
SIZE=`expr 50 \* 1024 \* 1024`
-_scratch_mkfs_sized $SIZE >>$seq.full 2>&1 \
+_scratch_mkfs_sized $SIZE >>$seqres.full 2>&1 \
|| _fail "mkfs failed"
-_scratch_mount >>$seq.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed"
mkdir $SCRATCH_MNT/subdir
echo "*** set default ACL"
setfacl -R -dm u:fsgqa:rwx,g::rwx,o::r-x,m::rwx $SCRATCH_MNT/subdir
-echo "*** populate filesystem, pass #1" | tee -a $seq.full
-cp -rf $filler $SCRATCH_MNT/subdir >$seq.full 2>&1
+echo "*** populate filesystem, pass #1" | tee -a $seqres.full
+cp -rf $filler $SCRATCH_MNT/subdir >$seqres.full 2>&1
-echo "*** populate filesystem, pass #2" | tee -a $seq.full
-cp -rf $filler $SCRATCH_MNT/subdir >$seq.full 2>&1
+echo "*** populate filesystem, pass #2" | tee -a $seqres.full
+cp -rf $filler $SCRATCH_MNT/subdir >$seqres.full 2>&1
_check_scratch_fs
echo "*** all done"
-rm -f $seq.full
+rm -f $seqres.full
status=0
exit
diff --git a/tests/generic/079 b/tests/generic/079
index 048b220..3faf106 100755
--- a/tests/generic/079
+++ b/tests/generic/079
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/083 b/tests/generic/083
index dd60118..f0aab4d 100755
--- a/tests/generic/083
+++ b/tests/generic/083
@@ -33,6 +33,7 @@
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -58,7 +59,7 @@ _supported_os IRIX Linux
_require_scratch
_require_no_large_scratch_dev
-rm -f $seq.full
+rm -f $seqres.full
workout()
{
@@ -68,22 +69,22 @@ workout()
nops=$4
umount $SCRATCH_DEV >/dev/null 2>&1
- echo "*** mkfs -dsize=$fsz,agcount=$ags" >>$seq.full
- echo "" >>$seq.full
+ echo "*** mkfs -dsize=$fsz,agcount=$ags" >>$seqres.full
+ echo "" >>$seqres.full
if [ $FSTYP = xfs ]
then
- _scratch_mkfs_xfs -dsize=$fsz,agcount=$ags >>$seq.full 2>&1 \
+ _scratch_mkfs_xfs -dsize=$fsz,agcount=$ags >>$seqres.full 2>&1 \
|| _fail "size=$fsz,agcount=$ags mkfs failed"
else
- _scratch_mkfs_sized $fsz >>$seq.full 2>&1 \
+ _scratch_mkfs_sized $fsz >>$seqres.full 2>&1 \
|| _fail "size=$fsz mkfs failed"
fi
- _scratch_mount >>$seq.full 2>&1 \
+ _scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed"
# -w ensures that the only ops are ones which cause write I/O
$FSSTRESS_PROG -d $SCRATCH_MNT -w -p $procs -n $nops $FSSTRESS_AVOID \
- >>$seq.full
+ >>$seqres.full
_check_scratch_fs
}
diff --git a/tests/generic/088 b/tests/generic/088
index b6266ef..1386322 100755
--- a/tests/generic/088
+++ b/tests/generic/088
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -48,7 +49,7 @@ _supported_fs generic
_supported_os IRIX Linux
path=$TEST_DIR/t_access
-src/t_access_root $path | tee $seq.full | _filter
+src/t_access_root $path | tee $seqres.full | _filter
# success, all done
status=0
diff --git a/tests/generic/089 b/tests/generic/089
index 2653183..5e8210d 100755
--- a/tests/generic/089
+++ b/tests/generic/089
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
mtab_output=$TEST_DIR/mtab_output
@@ -51,7 +52,7 @@ addentries()
_supported_fs generic
_supported_os Linux
-rm -f $seq.full
+rm -f $seqres.full
[ "X$TEST_DIR" = "X" ] && exit 1
cd $TEST_DIR
rm -fr test
@@ -72,8 +73,8 @@ mtab()
echo directory entries:
ls | grep mtab
- echo directory entries >> $here/$seq.full
- ls -li >> $here/$seq.full
+ echo directory entries >> $here/$seqres.full
+ ls -li >> $here/$seqres.full
}
# directory with only a few entries
diff --git a/tests/generic/091 b/tests/generic/091
index ad82b8e..755281e 100755
--- a/tests/generic/091
+++ b/tests/generic/091
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -38,16 +39,16 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
_supported_fs generic
_supported_os Linux
-rm -f $seq.full
+rm -f $seqres.full
run_fsx()
{
- echo fsx $@ | tee -a $seq.full
+ echo fsx $@ | tee -a $seqres.full
args=`echo $@ | sed -e "s/ BSIZE / $bsize /g" -e "s/ PSIZE / $psize /g"`
rm -f $TEST_DIR/junk
- $here/ltp/fsx $args $TEST_DIR/junk >>$seq.full 2>&1
+ $here/ltp/fsx $args $TEST_DIR/junk >>$seqres.full 2>&1
if [ $? -ne 0 ]; then
- cat $seq.full
+ cat $seqres.full
exit 1
fi
}
diff --git a/tests/generic/093 b/tests/generic/093
index 881a833..12ef580 100755
--- a/tests/generic/093
+++ b/tests/generic/093
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
here=`pwd`
tmp=/tmp/$$
@@ -62,7 +63,7 @@ _require_attrs
[ -x $runas ] || _notrun "$runas executable not found"
-rm -f $seq.full
+rm -f $seqres.full
_setup_testdir
_need_to_be_root
diff --git a/tests/generic/097 b/tests/generic/097
index d3174e4..60f7e4d 100755
--- a/tests/generic/097
+++ b/tests/generic/097
@@ -28,6 +28,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -250,7 +251,7 @@ _check_scratch_fs
# optional stuff if your test has verbose output to help resolve problems
#echo
-#echo "If failure, check $seq.full (this) and $seq.full.ok (reference)"
+#echo "If failure, check $seqres.full (this) and $seqres.full.ok (reference)"
# success, all done
status=0
diff --git a/tests/generic/099 b/tests/generic/099
index edd88a9..6efa7a7 100755
--- a/tests/generic/099
+++ b/tests/generic/099
@@ -24,6 +24,7 @@
# modifier
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -72,7 +73,7 @@ _cleanup()
# -> this would be done by simultaneously matching on ACEs
# -> interesting if it allows user to specify ACEs in any order
#
-rm -f $seq.full
+rm -f $seqres.full
#-------------------------------------------------------
# real QA test starts here
diff --git a/tests/generic/100 b/tests/generic/100
index 1ba5eb7..34cfde7 100755
--- a/tests/generic/100
+++ b/tests/generic/100
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -54,17 +55,17 @@ DEPTH=5
POPULATED_DIR=$TEMP_DIR/populate_root
SIZE=10
-rm -f $seq.full
+rm -f $seqres.full
# Clean up if file exist from prevous run
rm -rf $POPULATED_DIR
rm -f $TEMP_DIR/$TAR_FILE
# Create the new directory structure
-_populate_fs -n $NDIRS -f $NFILES -d $DEPTH -r $POPULATED_DIR -s $SIZE >>$here/$seq.full 2>&1
+_populate_fs -n $NDIRS -f $NFILES -d $DEPTH -r $POPULATED_DIR -s $SIZE >>$here/$seqres.full 2>&1
# Then tar up the directory structure
-tar -cvf $TEMP_DIR/$TAR_FILE $POPULATED_DIR >>$here/$seq.full 2>&1
+tar -cvf $TEMP_DIR/$TAR_FILE $POPULATED_DIR >>$here/$seqres.full 2>&1
# create f/s
_require_scratch
@@ -72,12 +73,12 @@ _setup_testdir
# untar on f/s
cd $testdir
-tar -xRvf $TEMP_DIR/$TAR_FILE >>$here/$seq.full 2>&1
+tar -xRvf $TEMP_DIR/$TAR_FILE >>$here/$seqres.full 2>&1
cd $here
# use diff -qr to compare
-ls -R -l ${testdir}${POPULATED_DIR} >>$here/$seq.full 2>&1
+ls -R -l ${testdir}${POPULATED_DIR} >>$here/$seqres.full 2>&1
diff -qr $POPULATED_DIR ${testdir}${POPULATED_DIR}
cd /
diff --git a/tests/generic/105 b/tests/generic/105
index 01bae98..d5b2cb2 100755
--- a/tests/generic/105
+++ b/tests/generic/105
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -49,7 +50,7 @@ _supported_os IRIX Linux
# real QA test starts here
-rm -f $seq.full
+rm -f $seqres.full
_require_scratch
_require_acls
@@ -57,11 +58,11 @@ _require_acls
_acl_setup_ids
umount $SCRATCH_DEV >/dev/null 2>&1
-echo "*** MKFS ***" >>$seq.full
-echo "" >>$seq.full
-_scratch_mkfs >>$seq.full 2>&1 \
+echo "*** MKFS ***" >>$seqres.full
+echo "" >>$seqres.full
+_scratch_mkfs >>$seqres.full 2>&1 \
|| _fail "mkfs failed"
-_scratch_mount >>$seq.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed"
cd $SCRATCH_MNT
diff --git a/tests/generic/112 b/tests/generic/112
index bcdcfec..8959c8b 100755
--- a/tests/generic/112
+++ b/tests/generic/112
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -134,12 +135,12 @@ numops2=10000
# can override the params here
_process_args "$@"
-echo "Params are for $param_type" >>$seq.full
-echo "Params: n = $numops1 N = $numops2 l = $filelen" >>$seq.full
+echo "Params are for $param_type" >>$seqres.full
+echo "Params: n = $numops1 N = $numops2 l = $filelen" >>$seqres.full
_setup_testdir
-rm -f $here/$seq.full
+rm -f $here/$seqres.full
echo "brevity is wit..."
_check_test_fs
diff --git a/tests/generic/113 b/tests/generic/113
index fd301cd..b2a7317 100755
--- a/tests/generic/113
+++ b/tests/generic/113
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/117 b/tests/generic/117
index 8afc962..624bfd8 100755
--- a/tests/generic/117
+++ b/tests/generic/117
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -82,13 +83,13 @@ _setup_testdir
_require_scratch
_require_attrs
-rm -f $seq.full
+rm -f $seqres.full
umount $SCRATCH_DEV >/dev/null 2>&1
-echo "*** MKFS ***" >>$seq.full
-echo "" >>$seq.full
-_scratch_mkfs >>$seq.full 2>&1 \
+echo "*** MKFS ***" >>$seqres.full
+echo "" >>$seqres.full
+_scratch_mkfs >>$seqres.full 2>&1 \
|| _fail "mkfs failed"
-_scratch_mount >>$seq.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed"
mkdir -p $SCRATCH_MNT/fsstress
@@ -97,10 +98,10 @@ echo
echo Running fsstress in serial:
i=0
while [ $i -lt $ITERATIONS ]; do
- echo fsstress iteration: $i | tee -a $seq.full
+ echo fsstress iteration: $i | tee -a $seqres.full
$FSSTRESS_PROG \
-d $SCRATCH_MNT/fsstress \
- $fss_ops -S c >>$seq.full 2>&1
+ $fss_ops -S c >>$seqres.full 2>&1
let i=$i+1
done
diff --git a/tests/generic/120 b/tests/generic/120
index 8389925..c3069f1 100755
--- a/tests/generic/120
+++ b/tests/generic/120
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/123 b/tests/generic/123
index d45c516..2387676 100755
--- a/tests/generic/123
+++ b/tests/generic/123
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/124 b/tests/generic/124
index 6fbb028..65c94b4 100755
--- a/tests/generic/124
+++ b/tests/generic/124
@@ -27,6 +27,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/125 b/tests/generic/125
index c7215a3..f489e96 100755
--- a/tests/generic/125
+++ b/tests/generic/125
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/126 b/tests/generic/126
index a95c1e4..83671df 100755
--- a/tests/generic/126
+++ b/tests/generic/126
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/127 b/tests/generic/127
index d1101df..021a571 100755
--- a/tests/generic/127
+++ b/tests/generic/127
@@ -27,6 +27,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/128 b/tests/generic/128
index 85d0f45..165aa00 100755
--- a/tests/generic/128
+++ b/tests/generic/128
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/129 b/tests/generic/129
index 18d891b..e74098f 100755
--- a/tests/generic/129
+++ b/tests/generic/129
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/130 b/tests/generic/130
index 943df72..96491f7 100755
--- a/tests/generic/130
+++ b/tests/generic/130
@@ -32,6 +32,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/131 b/tests/generic/131
index 176c8b4..02835ab 100755
--- a/tests/generic/131
+++ b/tests/generic/131
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/132 b/tests/generic/132
index 98229a9..2abfccf 100755
--- a/tests/generic/132
+++ b/tests/generic/132
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/133 b/tests/generic/133
index ec225f3..478419c 100755
--- a/tests/generic/133
+++ b/tests/generic/133
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/135 b/tests/generic/135
index f0bf9b9..b5854f4 100755
--- a/tests/generic/135
+++ b/tests/generic/135
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/141 b/tests/generic/141
index 45c1b5e..cb7aae2 100755
--- a/tests/generic/141
+++ b/tests/generic/141
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/169 b/tests/generic/169
index 413a86b..6293654 100755
--- a/tests/generic/169
+++ b/tests/generic/169
@@ -23,11 +23,12 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
-rm -f $seq.full
+rm -f $seqres.full
status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -56,10 +57,10 @@ _supported_os Linux
_require_scratch
-_scratch_mkfs >>$seq.full 2>&1 \
+_scratch_mkfs >>$seqres.full 2>&1 \
|| _fail "mkfs scratch failed"
-_scratch_mount >>$seq.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed: $MOUNT_OPTIONS"
echo "# creating new file for io"
@@ -73,11 +74,11 @@ xfs_io -F -a -c "pwrite 0 5k" -c "fsync" \
| _show_wrote_and_stat_only
echo "# unmounting scratch"
-umount $SCRATCH_MNT>>$seq.full 2>&1 \
+umount $SCRATCH_MNT>>$seqres.full 2>&1 \
|| _fail "unmount failed"
echo "# mounting scratch"
-_scratch_mount >>$seq.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed: $MOUNT_OPTIONS"
echo "# stating file to confirm correct size"
@@ -90,11 +91,11 @@ xfs_io -F -f -c "pwrite 0 5" -c s -c "pwrite 5 5" \
| _show_wrote_and_stat_only
echo "# unmounting scratch"
-umount $SCRATCH_MNT>>$seq.full 2>&1 \
+umount $SCRATCH_MNT>>$seqres.full 2>&1 \
|| _fail "unmount failed"
echo "# mounting scratch"
-_scratch_mount >>$seq.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed: $MOUNT_OPTIONS"
echo "# stating file to confirm correct size"
diff --git a/tests/generic/184 b/tests/generic/184
index a37f700..929e0eb 100755
--- a/tests/generic/184
+++ b/tests/generic/184
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq - silence is golden"
here=`pwd`
diff --git a/tests/generic/192 b/tests/generic/192
index 691ab7d..4b9d0bb 100755
--- a/tests/generic/192
+++ b/tests/generic/192
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -53,20 +54,20 @@ delay=40
testfile=$TEST_DIR/testfile
rm -f $testfile
-rm -f $seq.full
+rm -f $seqres.full
echo test >$testfile
-time1=`_access_time $testfile | tee -a $seq.full`
+time1=`_access_time $testfile | tee -a $seqres.full`
echo "sleep for $delay"
sleep $delay # sleep to allow time to move on for access
cat $testfile
-time2=`_access_time $testfile | tee -a $seq.full`
+time2=`_access_time $testfile | tee -a $seqres.full`
cd /
umount $TEST_DIR
_test_mount
-time3=`_access_time $testfile | tee -a $here/$seq.full`
+time3=`_access_time $testfile | tee -a $here/$seqres.full`
delta1=`expr $time2 - $time1`
delta2=`expr $time3 - $time1`
diff --git a/tests/generic/193 b/tests/generic/193
index 88ab971..8b3b9db 100755
--- a/tests/generic/193
+++ b/tests/generic/193
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -247,5 +248,5 @@ _cleanup_files
# success, all done
echo "*** done"
-rm -f $seq.full
+rm -f $seqres.full
status=0
diff --git a/tests/generic/198 b/tests/generic/198
index 31de96c..5aac37f 100755
--- a/tests/generic/198
+++ b/tests/generic/198
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -47,7 +48,7 @@ _require_aiodio aiodio_sparse2
echo "Silence is golden."
# real QA test starts here
-rm -f $seq.full
+rm -f $seqres.full
rm -f "$TEST_DIR/aiodio_sparse*"
$AIO_TEST "$TEST_DIR/aiodio_sparse"
diff --git a/tests/generic/204 b/tests/generic/204
index 6c4a3f0..ae87930 100755
--- a/tests/generic/204
+++ b/tests/generic/204
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -44,7 +45,7 @@ _scratch_mount
# fix the reserve block pool to a known size so that the enospc calculations
# work out correctly.
-_scratch_resvblks 1024 > $seq.full 2>&1
+_scratch_resvblks 1024 > $seqres.full 2>&1
for i in `seq 1 22500`; do
echo -n > $SCRATCH_MNT/$i
@@ -53,5 +54,5 @@ done
# success, all done
echo "*** done"
-rm -f $seq.full
+rm -f $seqres.full
status=0
diff --git a/tests/generic/207 b/tests/generic/207
index 6eaf50c..b520bee 100755
--- a/tests/generic/207
+++ b/tests/generic/207
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/208 b/tests/generic/208
index 7ea7514..4c34e7b 100755
--- a/tests/generic/208
+++ b/tests/generic/208
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/209 b/tests/generic/209
index 8b2a4e1..82d5e6a 100755
--- a/tests/generic/209
+++ b/tests/generic/209
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/210 b/tests/generic/210
index 56ac8ad..16908cc 100755
--- a/tests/generic/210
+++ b/tests/generic/210
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/211 b/tests/generic/211
index 5667d20..6d7b996 100755
--- a/tests/generic/211
+++ b/tests/generic/211
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/212 b/tests/generic/212
index e211cc4..6e86e94 100755
--- a/tests/generic/212
+++ b/tests/generic/212
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/213 b/tests/generic/213
index e297fdf..1fa573c 100755
--- a/tests/generic/213
+++ b/tests/generic/213
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
_cleanup()
@@ -51,7 +52,7 @@ _supported_os Linux
[ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found"
-rm -f $seq.full
+rm -f $seqres.full
_require_xfs_io_falloc
diff --git a/tests/generic/214 b/tests/generic/214
index 0a27fc5..20acca1 100755
--- a/tests/generic/214
+++ b/tests/generic/214
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
_cleanup()
@@ -49,7 +50,7 @@ _supported_os Linux
[ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found"
-rm -f $seq.full
+rm -f $seqres.full
rm -f $TEST_DIR/ouch*
_require_xfs_io_falloc
diff --git a/tests/generic/215 b/tests/generic/215
index 749b27b..73cdd14 100755
--- a/tests/generic/215
+++ b/tests/generic/215
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
_cleanup()
@@ -79,5 +80,5 @@ fi
# success, all done
echo "*** done"
-rm -f $seq.full
+rm -f $seqres.full
status=0
diff --git a/tests/generic/219 b/tests/generic/219
index 047e285..3a8deb6 100755
--- a/tests/generic/219
+++ b/tests/generic/219
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -76,17 +77,17 @@ check_usage()
test_accounting()
{
echo "### some controlled buffered, direct and mmapd IO (type=$type)"
- echo "--- initiating parallel IO..." >>$seq.full
+ echo "--- initiating parallel IO..." >>$seqres.full
# Small ios here because ext3 will account for indirect blocks too ...
# 48k will fit w/o indirect for 4k blocks (default blocksize)
$XFS_IO_PROG -F -c 'pwrite 0 48k' -c 'fsync' \
- $SCRATCH_MNT/buffer >>$seq.full 2>&1 &
+ $SCRATCH_MNT/buffer >>$seqres.full 2>&1 &
$XFS_IO_PROG -F -c 'pwrite 0 48k' -d \
- $SCRATCH_MNT/direct >>$seq.full 2>&1 &
+ $SCRATCH_MNT/direct >>$seqres.full 2>&1 &
$XFS_IO_PROG -F -c 't 48k' -c 'mm -rw 0 48k' -c 'mw 0 48k' -c 'ms -s' \
- $SCRATCH_MNT/mmap >>$seq.full 2>&1 &
+ $SCRATCH_MNT/mmap >>$seqres.full 2>&1 &
wait
- echo "--- completed parallel IO ($type)" >>$seq.full
+ echo "--- completed parallel IO ($type)" >>$seqres.full
for file in $SCRATCH_MNT/{buffer,direct,mmap}; do
$here/src/lstat64 $file | head -3 | _filter_scratch
@@ -101,13 +102,13 @@ test_accounting()
}
# real QA test starts here
-rm -f $seq.full
+rm -f $seqres.full
uid=1
gid=2
umount $SCRATCH_DEV 2>/dev/null
-_scratch_mkfs >> $seq.full 2>&1
+_scratch_mkfs >> $seqres.full 2>&1
_scratch_mount "-o usrquota,grpquota"
quotacheck -u -g $SCRATCH_MNT 2>/dev/null
quotaon $SCRATCH_MNT 2>/dev/null
diff --git a/tests/generic/221 b/tests/generic/221
index 9cab3c4..7fca5bb 100755
--- a/tests/generic/221
+++ b/tests/generic/221
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/223 b/tests/generic/223
index 8eba2d7..a6932da 100755
--- a/tests/generic/223
+++ b/tests/generic/223
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -47,7 +48,7 @@ _supported_os Linux
_require_scratch
_require_xfs_io_falloc
-rm -f $seq.full
+rm -f $seqres.full
BLOCKSIZE=4096
@@ -57,7 +58,7 @@ for SUNIT_K in 8 16 32 64 128; do
echo "=== mkfs with su $SUNIT_BLOCKS blocks x 4 ==="
export MKFS_OPTIONS=""
- _scratch_mkfs_geom $SUNIT_BYTES 4 $BLOCKSIZE >> $seq.full 2>&1
+ _scratch_mkfs_geom $SUNIT_BYTES 4 $BLOCKSIZE >> $seqres.full 2>&1
_scratch_mount
for SIZE_MULT in 1 2 8 64 256; do
@@ -67,10 +68,10 @@ for SUNIT_K in 8 16 32 64 128; do
for FILE in 1 2 3 4; do
xfs_io -F -f -c "falloc 0 $SIZE" \
$SCRATCH_MNT/file-$FILE-$SIZE-falloc \
- >> $seq.full 2>&1
+ >> $seqres.full 2>&1
xfs_io -F -f -c "pwrite 0 $SIZE" \
$SCRATCH_MNT/file-$FILE-$SIZE-write \
- >> $seq.full 2>&1
+ >> $seqres.full 2>&1
src/t_stripealign $SCRATCH_MNT/file-$FILE-$SIZE-falloc \
$SUNIT_BLOCKS | _filter_scratch
src/t_stripealign $SCRATCH_MNT/file-$FILE-$SIZE-write \
@@ -80,7 +81,7 @@ for SUNIT_K in 8 16 32 64 128; do
echo "=== Testing size 1g falloc on ${SUNIT_K}k stripe ==="
xfs_io -F -f -c "falloc 0 1g" \
- $SCRATCH_MNT/file-1g-falloc >> $seq.full 2>&1
+ $SCRATCH_MNT/file-1g-falloc >> $seqres.full 2>&1
src/t_stripealign $SCRATCH_MNT/file-1g-falloc $SUNIT_BLOCKS \
| _filter_scratch
@@ -88,7 +89,7 @@ for SUNIT_K in 8 16 32 64 128; do
echo "=== Testing size 1073745920 falloc on ${SUNIT_K}k stripe ==="
xfs_io -F -f -c "falloc 0 1073745920" \
- $SCRATCH_MNT/file-1073745920-falloc >> $seq.full 2>&1
+ $SCRATCH_MNT/file-1073745920-falloc >> $seqres.full 2>&1
src/t_stripealign $SCRATCH_MNT/file-1073745920-falloc \
$SUNIT_BLOCKS | _filter_scratch
diff --git a/tests/generic/224 b/tests/generic/224
index 23ee7c2..313d9c2 100755
--- a/tests/generic/224
+++ b/tests/generic/224
@@ -28,6 +28,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -53,12 +54,12 @@ _supported_os Linux
_require_scratch
# make a 1GB filesystem
-_scratch_mkfs_sized `expr 1024 \* 1024 \* 1024` > $seq.full 2>&1
-_scratch_mount >> $seq.full 2>&1
+_scratch_mkfs_sized `expr 1024 \* 1024 \* 1024` > $seqres.full 2>&1
+_scratch_mount >> $seqres.full 2>&1
# set the reserved block pool to almost empty for XFS
if [ "$FSTYP" = "xfs" ]; then
- xfs_io -x -c "resblks 4" $SCRATCH_MNT >> $seq.full 2>&1
+ xfs_io -x -c "resblks 4" $SCRATCH_MNT >> $seqres.full 2>&1
fi
FILES=1000
diff --git a/tests/generic/225 b/tests/generic/225
index c09bd2a..ea44f2e 100755
--- a/tests/generic/225
+++ b/tests/generic/225
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -48,7 +49,7 @@ _require_scratch
_scratch_mkfs > /dev/null 2>&1
_scratch_mount > /dev/null 2>&1
-rm -f $seq.full
+rm -f $seqres.full
fiemapfile=$SCRATCH_MNT/$seq.fiemap
fiemaplog=$SCRATCH_MNT/$seq.log
diff --git a/tests/generic/226 b/tests/generic/226
index 2179f2a..da45c9e 100755
--- a/tests/generic/226
+++ b/tests/generic/226
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -38,11 +39,11 @@ _supported_os Linux IRIX
_require_scratch
# real QA test starts here
-rm -f $seq.full
+rm -f $seqres.full
umount $SCRATCH_DEV 2>/dev/null
echo "--> mkfs 256m filesystem"
-_scratch_mkfs_sized `expr 256 \* 1024 \* 1024` >> $seq.full 2>&1
+_scratch_mkfs_sized `expr 256 \* 1024 \* 1024` >> $seqres.full 2>&1
_scratch_mount
loops=16
@@ -54,7 +55,7 @@ echo "--> $loops buffered 64m writes in a loop"
for I in `seq 1 $loops`; do
echo -n "$I "
xfs_io -F -f \
- -c "pwrite ${buffer} 0 64m" $SCRATCH_MNT/test >> $seq.full
+ -c "pwrite ${buffer} 0 64m" $SCRATCH_MNT/test >> $seqres.full
rm -f $SCRATCH_MNT/test
done
@@ -66,7 +67,7 @@ echo "--> $loops direct 64m writes in a loop"
for I in `seq 1 $loops`; do
echo -n "$I "
xfs_io -F -f -d \
- -c "pwrite ${buffer} 0 64m" $SCRATCH_MNT/test >> $seq.full
+ -c "pwrite ${buffer} 0 64m" $SCRATCH_MNT/test >> $seqres.full
rm -f $SCRATCH_MNT/test
done
diff --git a/tests/generic/228 b/tests/generic/228
index 2704934..c8af133 100755
--- a/tests/generic/228
+++ b/tests/generic/228
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
_cleanup()
@@ -49,7 +50,7 @@ _supported_os Linux
[ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found"
-rm -f $seq.full
+rm -f $seqres.full
# Sanity check to see if fallocate works
_require_xfs_io_falloc
diff --git a/tests/generic/230 b/tests/generic/230
index a442857..c3db20b 100755
--- a/tests/generic/230
+++ b/tests/generic/230
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -58,49 +59,49 @@ test_files()
test_enforcement()
{
echo "### some buffered IO (type=$type)"
- echo "--- initiating IO..." >>$seq.full
+ echo "--- initiating IO..." >>$seqres.full
# Firstly fit below block soft limit
echo "Write 900k..."
su $qa_user -c "$XFS_IO_PROG -F -c 'pwrite 0 900k' -c fsync \
- $SCRATCH_MNT/file1" 2>&1 >>$seq.full | tee -a $seq.full
- repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seq.full 2>&1
+ $SCRATCH_MNT/file1" 2>&1 >>$seqres.full | tee -a $seqres.full
+ repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
# Secondly overcome block soft limit
echo "Rewrite 1001k..."
su $qa_user -c "$XFS_IO_PROG -F -c 'pwrite 0 1001k' -c fsync \
- $SCRATCH_MNT/file1" 2>&1 >>$seq.full | tee -a $seq.full
- repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seq.full 2>&1
+ $SCRATCH_MNT/file1" 2>&1 >>$seqres.full | tee -a $seqres.full
+ repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
# Now try to overcome block hardlimit
echo "Write 1000k..."
su $qa_user -c "$XFS_IO_PROG -F -c 'pwrite 0 1000k' -c fsync \
- $SCRATCH_MNT/file2" 2>&1 >>$seq.full | tee -a $seq.full
- repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seq.full 2>&1
+ $SCRATCH_MNT/file2" 2>&1 >>$seqres.full | tee -a $seqres.full
+ repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
# Now sleep for grace time and check that softlimit got enforced
sleep $((grace+1))
echo "Write 4096..."
su $qa_user -c "$XFS_IO_PROG -F -c 'truncate 0' -c 'pwrite 0 4096' \
- $SCRATCH_MNT/file2" 2>&1 >>$seq.full | tee -a $seq.full
- repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seq.full 2>&1
+ $SCRATCH_MNT/file2" 2>&1 >>$seqres.full | tee -a $seqres.full
+ repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
# And now the softlimit test for inodes
# First reset space limits so that we don't have problems with
# space reservations on XFS
setquota -$type $qa_user 0 0 3 5 $SCRATCH_MNT
echo "Touch 3+4"
su $qa_user -c "touch $SCRATCH_MNT/file3 $SCRATCH_MNT/file4" \
- 2>&1 >>$seq.full | _filter_scratch | tee -a $seq.full
- repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seq.full 2>&1
+ 2>&1 >>$seqres.full | _filter_scratch | tee -a $seqres.full
+ repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
# Try to exceed inode hardlimit
echo "Touch 5+6"
su $qa_user -c "touch $SCRATCH_MNT/file5 $SCRATCH_MNT/file6" \
- 2>&1 >>$seq.full | _filter_scratch | tee -a $seq.full
- repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seq.full 2>&1
+ 2>&1 >>$seqres.full | _filter_scratch | tee -a $seqres.full
+ repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
# Wait and check grace time enforcement
- rm -f $SCRATCH_MNT/file5 >>$seq.full 2>&1
+ rm -f $SCRATCH_MNT/file5 >>$seqres.full 2>&1
sleep $((grace+1))
echo "Touch 5"
- su $qa_user -c "touch $SCRATCH_MNT/file5" 2>&1 >>$seq.full |
- _filter_scratch | tee -a $seq.full
- repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seq.full 2>&1
- echo "--- completed IO ($type)" >>$seq.full
+ su $qa_user -c "touch $SCRATCH_MNT/file5" 2>&1 >>$seqres.full |
+ _filter_scratch | tee -a $seqres.full
+ repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
+ echo "--- completed IO ($type)" >>$seqres.full
}
cleanup_files()
@@ -109,11 +110,11 @@ cleanup_files()
}
# real QA test starts here
-rm -f $seq.full
+rm -f $seqres.full
grace=2
-_scratch_mkfs >> $seq.full 2>&1
+_scratch_mkfs >> $seqres.full 2>&1
_scratch_mount "-o usrquota,grpquota"
quotacheck -u -g $SCRATCH_MNT 2>/dev/null
quotaon $SCRATCH_MNT 2>/dev/null
diff --git a/tests/generic/231 b/tests/generic/231
index 6d8bda7..1a434d4 100755
--- a/tests/generic/231
+++ b/tests/generic/231
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -45,19 +46,19 @@ _fsx()
echo "=== FSX Standard Mode, Memory Mapping, $tasks Tasks ==="
for (( i = 1; i <= $tasks; i++ )); do
SEED=$RANDOM
- echo "ltp/fsx $FSX_ARGS -S $SEED $SCRATCH_MNT/fsx_file$i" >>$seq.full
+ echo "ltp/fsx $FSX_ARGS -S $SEED $SCRATCH_MNT/fsx_file$i" >>$seqres.full
su $qa_user -c "ltp/fsx $FSX_ARGS -S $SEED \
$SCRATCH_MNT/fsx_file$i" >$tmp.output$i 2>&1 &
done
for (( i = 1; i <= $tasks; i++ )); do
if ! wait %$i; then
- cat $tmp.output$i | tee -a $seq.full
+ cat $tmp.output$i | tee -a $seqres.full
wait
return 1
fi
$XFS_IO_PROG -F -c 'fsync' $SCRATCH_MNT/fsx_file$i
- cat $tmp.output$i | tee -a $seq.full
+ cat $tmp.output$i | tee -a $seqres.full
done
return 0
}
@@ -70,7 +71,7 @@ _require_quota
_require_user
_need_to_be_root
-_scratch_mkfs >> $seq.full 2>&1
+_scratch_mkfs >> $seqres.full 2>&1
_scratch_mount "-o usrquota,grpquota"
chmod 777 $SCRATCH_MNT
quotacheck -u -g $SCRATCH_MNT 2>/dev/null
diff --git a/tests/generic/232 b/tests/generic/232
index 81cd3ca..f716ede 100755
--- a/tests/generic/232
+++ b/tests/generic/232
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -38,7 +39,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
_filter_num()
{
- tee -a $here/$seq.full |\
+ tee -a $here/$seqres.full |\
sed -e 's/[0-9][0-9]* inodes/I inodes/g' \
-e 's/[0-9][0-9]* paths/P paths/g' \
-e 's/seed = [0-9][0-9]*/seed = S/'
@@ -54,11 +55,11 @@ _fsstress()
count=2000
args="-n $count -d $out -p 7"
- echo "fsstress $args" | tee -a $here/$seq.full | sed -e "s#$out#outdir#"
- if ! $FSSTRESS_PROG $args | tee -a $here/$seq.full | _filter_num
+ echo "fsstress $args" | tee -a $here/$seqres.full | sed -e "s#$out#outdir#"
+ if ! $FSSTRESS_PROG $args | tee -a $here/$seqres.full | _filter_num
then
echo " fsstress $args returned $?"
- cat $tmp.out | tee -a $here/$seq.full
+ cat $tmp.out | tee -a $here/$seqres.full
status=1
fi
}
@@ -70,7 +71,7 @@ _require_scratch
_require_quota
_need_to_be_root
-_scratch_mkfs >> $seq.full 2>&1
+_scratch_mkfs >> $seqres.full 2>&1
_scratch_mount "-o usrquota,grpquota"
chmod 777 $SCRATCH_MNT
quotacheck -u -g $SCRATCH_MNT 2>/dev/null
diff --git a/tests/generic/233 b/tests/generic/233
index 52d2259..f0fde22 100755
--- a/tests/generic/233
+++ b/tests/generic/233
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -42,7 +43,7 @@ FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -S 191110531 -N 100000"
_filter_num()
{
- tee -a $here/$seq.full |\
+ tee -a $here/$seqres.full |\
sed -e 's/[0-9][0-9]* inodes/I inodes/g' \
-e 's/[0-9][0-9]* paths/P paths/g' \
-e 's/seed = [0-9][0-9]*/seed = S/'
@@ -61,11 +62,11 @@ _fsstress()
-f rename=10 -f fsync=2 -f write=15 -f dwrite=15 \
-n $count -d $out -p 7"
- echo "fsstress $args" | tee -a $here/$seq.full | sed -e "s#$out#outdir#"
- if ! su $qa_user -c "$FSSTRESS_PROG $args" | tee -a $here/$seq.full | _filter_num
+ echo "fsstress $args" | tee -a $here/$seqres.full | sed -e "s#$out#outdir#"
+ if ! su $qa_user -c "$FSSTRESS_PROG $args" | tee -a $here/$seqres.full | _filter_num
then
echo " fsstress $args returned $?"
- cat $tmp.out | tee -a $here/$seq.full
+ cat $tmp.out | tee -a $here/$seqres.full
status=1
fi
}
@@ -78,7 +79,7 @@ _require_quota
_require_user
_need_to_be_root
-_scratch_mkfs >> $seq.full 2>&1
+_scratch_mkfs >> $seqres.full 2>&1
_scratch_mount "-o usrquota,grpquota"
chmod 777 $SCRATCH_MNT
quotacheck -u -g $SCRATCH_MNT 2>/dev/null
diff --git a/tests/generic/234 b/tests/generic/234
index dbb13f6..e5c94e9 100755
--- a/tests/generic/234
+++ b/tests/generic/234
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -46,7 +47,7 @@ test_setting()
idmod=200000
seed=$RANDOM
RANDOM=$seed
- echo "Starting test with procs=$procs, idmod=$idmod, and seed=$seed" >>$seq.full
+ echo "Starting test with procs=$procs, idmod=$idmod, and seed=$seed" >>$seqres.full
for (( i = 0; i < $procs; i++ )); do
( SETUCOUNT=1; SETGCOUNT=1; SETUIDS[0]=0; SETGIDS[0]=0
@@ -93,9 +94,9 @@ _require_quota
_need_to_be_root
# real QA test starts here
-rm -f $seq.full
+rm -f $seqres.full
-_scratch_mkfs >> $seq.full 2>&1
+_scratch_mkfs >> $seqres.full 2>&1
_scratch_mount "-o usrquota,grpquota"
quotacheck -u -g $SCRATCH_MNT 2>/dev/null
quotaon -u -g $SCRATCH_MNT 2>/dev/null
diff --git a/tests/generic/235 b/tests/generic/235
index f4a1fce..85ed782 100755
--- a/tests/generic/235
+++ b/tests/generic/235
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -47,9 +48,9 @@ _require_user
_need_to_be_root
# real QA test starts here
-rm -f $seq.full
+rm -f $seqres.full
-_scratch_mkfs >> $seq.full 2>&1
+_scratch_mkfs >> $seqres.full 2>&1
_scratch_mount "-o usrquota,grpquota"
quotacheck -u -g $SCRATCH_MNT 2>/dev/null
quotaon $SCRATCH_MNT 2>/dev/null
@@ -64,12 +65,12 @@ repquota -u -g $SCRATCH_MNT | grep -v "^root" | _filter_scratch
#
# We work around it by editing the context out of mtab. Sigh.
sed -i "s#^$SCRATCH_DEV\(.*\),context=\"system_u:object_r:nfs_t:s0\"#$SCRATCH_DEV\1#" /etc/mtab
-mount -o remount,ro $SCRATCH_DEV 2>&1 | tee -a $seq.full | _filter_scratch
-touch $SCRATCH_MNT/failed 2>&1 | tee -a $seq.full | _filter_scratch
-mount -o remount,rw $SCRATCH_DEV 2>&1 | tee -a $seq.full | _filter_scratch
+mount -o remount,ro $SCRATCH_DEV 2>&1 | tee -a $seqres.full | _filter_scratch
+touch $SCRATCH_MNT/failed 2>&1 | tee -a $seqres.full | _filter_scratch
+mount -o remount,rw $SCRATCH_DEV 2>&1 | tee -a $seqres.full | _filter_scratch
$XFS_IO_PROG -F -c 'pwrite 0 8k' -c 'fsync' \
- $SCRATCH_MNT/testfile >>$seq.full 2>&1
+ $SCRATCH_MNT/testfile >>$seqres.full 2>&1
repquota -u -g $SCRATCH_MNT | grep -v "^root" | _filter_scratch
umount $SCRATCH_DEV 2>/dev/null
diff --git a/tests/generic/236 b/tests/generic/236
index ec70cdb..016afae 100755
--- a/tests/generic/236
+++ b/tests/generic/236
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
_cleanup()
diff --git a/tests/generic/237 b/tests/generic/237
index 7ebb88e..7e54aed 100755
--- a/tests/generic/237
+++ b/tests/generic/237
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -52,7 +53,7 @@ _supported_os Linux
[ -x $runas ] || _notrun "$runas executable not found"
-rm -f $seq.full
+rm -f $seqres.full
_setup_testdir
diff --git a/tests/generic/239 b/tests/generic/239
index 8aa4ed0..e25a6a0 100755
--- a/tests/generic/239
+++ b/tests/generic/239
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/240 b/tests/generic/240
index d5f8940..77fffe8 100755
--- a/tests/generic/240
+++ b/tests/generic/240
@@ -29,6 +29,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -55,7 +56,7 @@ _require_aiodio aiodio_sparse2
echo "Silence is golden."
# real QA test starts here
-rm -f $seq.full
+rm -f $seqres.full
rm -f $TEST_DIR/aiodio_sparse
diff --git a/tests/generic/241 b/tests/generic/241
index ee572a7..b55344b 100755
--- a/tests/generic/241
+++ b/tests/generic/241
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -47,12 +48,12 @@ _supported_os Linux
echo "Silence is golden."
# real QA test starts here
-rm -f $seq.full
+rm -f $seqres.full
rm -rf $TEST_DIR/dbench
mkdir $TEST_DIR/dbench
-dbench -t 60 -D $TEST_DIR/dbench 4 >> $seq.full
+dbench -t 60 -D $TEST_DIR/dbench 4 >> $seqres.full
status=$?
exit
diff --git a/tests/generic/245 b/tests/generic/245
index fb81d39..9832e92 100755
--- a/tests/generic/245
+++ b/tests/generic/245
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/246 b/tests/generic/246
index d82e27d..872e513 100755
--- a/tests/generic/246
+++ b/tests/generic/246
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/247 b/tests/generic/247
index 3a2f735..8a7e2c6 100755
--- a/tests/generic/247
+++ b/tests/generic/247
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/248 b/tests/generic/248
index f245c1c..7bb42a1 100755
--- a/tests/generic/248
+++ b/tests/generic/248
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/249 b/tests/generic/249
index e72092d..288328c 100755
--- a/tests/generic/249
+++ b/tests/generic/249
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -50,11 +51,11 @@ echo "Feel the serenity."
SRC=$TEST_DIR/$seq.src
DST=$TEST_DIR/$seq.dst
-rm -f $seq.full
+rm -f $seqres.full
-$XFS_IO_PROG -F -f -c "pwrite -S 0xa5a55a5a 0 32768k" -c fsync $SRC >> $seq.full 2>&1
+$XFS_IO_PROG -F -f -c "pwrite -S 0xa5a55a5a 0 32768k" -c fsync $SRC >> $seqres.full 2>&1
[ $? -ne 0 ] && _fail "xfs_io pwrite failed"
-$XFS_IO_PROG -F -f -c "sendfile -i $SRC 0 32768k" -c fsync $DST >> $seq.full 2>&1
+$XFS_IO_PROG -F -f -c "sendfile -i $SRC 0 32768k" -c fsync $DST >> $seqres.full 2>&1
[ $? -ne 0 ] && _fail "xfs_io sendfile failed"
diff -q $SRC $DST
diff --git a/tests/generic/251 b/tests/generic/251
index c5fc79e..f49f1e9 100755
--- a/tests/generic/251
+++ b/tests/generic/251
@@ -25,6 +25,7 @@
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/255 b/tests/generic/255
index e08c726..8db0978 100755
--- a/tests/generic/255
+++ b/tests/generic/255
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/256 b/tests/generic/256
index 0d72795..d60584b 100755
--- a/tests/generic/256
+++ b/tests/generic/256
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/257 b/tests/generic/257
index b58bd56..09a8fd8 100755
--- a/tests/generic/257
+++ b/tests/generic/257
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -50,5 +51,5 @@ src/t_dir_offset2 $TEST_DIR/ttt
# success, all done
echo "*** done"
-rm -f $seq.full
+rm -f $seqres.full
status=0
diff --git a/tests/generic/258 b/tests/generic/258
index 87817bc..ac03bb5 100755
--- a/tests/generic/258
+++ b/tests/generic/258
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/260 b/tests/generic/260
index 5bd3b39..032baa5 100755
--- a/tests/generic/260
+++ b/tests/generic/260
@@ -23,6 +23,7 @@
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/generic/263 b/tests/generic/263
index 18cd5de..3e86efc 100755
--- a/tests/generic/263
+++ b/tests/generic/263
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -38,16 +39,16 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
_supported_fs generic
_supported_os Linux
-rm -f $seq.full
+rm -f $seqres.full
run_fsx()
{
- echo fsx $@ | tee -a $seq.full
+ echo fsx $@ | tee -a $seqres.full
args=`echo $@ | sed -e "s/ BSIZE / $bsize /g" -e "s/ PSIZE / $psize /g"`
rm -f $TEST_DIR/junk
- $here/ltp/fsx $args $TEST_DIR/junk >>$seq.full 2>&1
+ $here/ltp/fsx $args $TEST_DIR/junk >>$seqres.full 2>&1
if [ $? -ne 0 ]; then
- cat $seq.full
+ cat $seqres.full
exit 1
fi
}
diff --git a/tests/generic/269 b/tests/generic/269
index 5bf24af..3c5f68a 100755
--- a/tests/generic/269
+++ b/tests/generic/269
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -44,7 +45,7 @@ _workout()
enospc_time=2
out=$SCRATCH_MNT/fsstress.$$
args="-p128 -n999999999 -f setattr=1 $FSSTRESS_AVOID -d $out"
- echo "fsstress $args" >> $here/$seq.full
+ echo "fsstress $args" >> $here/$seqres.full
$FSSTRESS_PROG $args > /dev/null 2>&1 &
pid=$!
echo "Run dd writers in parallel"
@@ -52,7 +53,7 @@ _workout()
do
# File will be opened with O_TRUNC each time
dd if=/dev/zero of=$SCRATCH_MNT/SPACE_CONSUMER bs=1M \
- >> $here/$seq.full 2>&1
+ >> $here/$seqres.full 2>&1
sleep $enospc_time
done
kill $pid
@@ -65,7 +66,7 @@ _supported_os Linux
_need_to_be_root
_require_scratch
-_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seq.full 2>&1
+_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full 2>&1
_scratch_mount
if ! _workout; then
diff --git a/tests/generic/270 b/tests/generic/270
index c095606..8d6555b 100755
--- a/tests/generic/270
+++ b/tests/generic/270
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -47,7 +48,7 @@ _workout()
enospc_time=2
out=$SCRATCH_MNT/fsstress.$$
args="-p128 -n999999999 -f setattr=1 $FSSTRESS_AVOID -d $out"
- echo "fsstress $args" >> $here/$seq.full
+ echo "fsstress $args" >> $here/$seqres.full
# Grant chown capability
cp $FSSTRESS_PROG $tmp.fsstress.bin
if [ "`whereis setcap`" == "setcap:" ]; then
@@ -64,7 +65,7 @@ _workout()
# File will be opened with O_TRUNC each time
su $qa_user -c "dd if=/dev/zero \
of=$SCRATCH_MNT/SPACE_CONSUMER bs=1M " \
- >> $here/$seq.full 2>&1
+ >> $here/$seqres.full 2>&1
sleep $enospc_time
done
@@ -80,7 +81,7 @@ _require_user
_need_to_be_root
_require_scratch
-_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seq.full 2>&1
+_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full 2>&1
_scratch_mount "-o usrquota,grpquota"
chmod 777 $SCRATCH_MNT
quotacheck -u -g $SCRATCH_MNT 2>/dev/null
diff --git a/tests/generic/273 b/tests/generic/273
index 9a40394..5a8d593 100755
--- a/tests/generic/273
+++ b/tests/generic/273
@@ -24,6 +24,7 @@
#creator
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -91,7 +92,7 @@ _porter()
exit
fi
- cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seq.full 2>&1
+ cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seqres.full 2>&1
if [ $? -ne 0 ]
then
echo "_porter $_suffix not complete"
@@ -129,10 +130,10 @@ echo "------------------------------"
echo "start the workload"
echo "------------------------------"
-rm -f $seq.full
+rm -f $seqres.full
_scratch_unmount 2>/dev/null
-_scratch_mkfs_sized $((2 * 1024 * 1024 * 1024)) >>$seq.full 2>&1
+_scratch_mkfs_sized $((2 * 1024 * 1024 * 1024)) >>$seqres.full 2>&1
_scratch_mount
_do_workload
diff --git a/tests/generic/274 b/tests/generic/274
index 9b0fb71..d5f09a4 100755
--- a/tests/generic/274
+++ b/tests/generic/274
@@ -26,6 +26,7 @@
#creator
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -53,48 +54,48 @@ echo "------------------------------"
echo "preallocation test"
echo "------------------------------"
-rm -f $seq.full
+rm -f $seqres.full
umount $SCRATCH_DEV 2>/dev/null
-_scratch_mkfs_sized $((1 * 1024 * 1024 * 1024)) >>$seq.full 2>&1
+_scratch_mkfs_sized $((1 * 1024 * 1024 * 1024)) >>$seqres.full 2>&1
_scratch_mount
# Create a 4k file and Allocate 4M past EOF on that file
xfs_io -F -f -c "pwrite 0 4k" -c "falloc -k 4k 4m" $SCRATCH_MNT/test \
- >>$seq.full 2>&1 || _fail "failed to create test file"
+ >>$seqres.full 2>&1 || _fail "failed to create test file"
# Fill the rest of the fs completely
-# Note, this will show ENOSPC errors in $seq.full, that's ok.
-echo "Fill fs with 1M IOs; ENOSPC expected" >> $seq.full
-dd if=/dev/zero of=$SCRATCH_MNT/tmp1 bs=1M >>$seq.full 2>&1
-echo "Fill fs with 4K IOs; ENOSPC expected" >> $seq.full
-dd if=/dev/zero of=$SCRATCH_MNT/tmp2 bs=4K >>$seq.full 2>&1
+# Note, this will show ENOSPC errors in $seqres.full, that's ok.
+echo "Fill fs with 1M IOs; ENOSPC expected" >> $seqres.full
+dd if=/dev/zero of=$SCRATCH_MNT/tmp1 bs=1M >>$seqres.full 2>&1
+echo "Fill fs with 4K IOs; ENOSPC expected" >> $seqres.full
+dd if=/dev/zero of=$SCRATCH_MNT/tmp2 bs=4K >>$seqres.full 2>&1
sync
# Last effort, use O_SYNC
-echo "Fill fs with 4K DIOs; ENOSPC expected" >> $seq.full
-dd if=/dev/zero of=$SCRATCH_MNT/tmp3 bs=4K oflag=sync >>$seq.full 2>&1
+echo "Fill fs with 4K DIOs; ENOSPC expected" >> $seqres.full
+dd if=/dev/zero of=$SCRATCH_MNT/tmp3 bs=4K oflag=sync >>$seqres.full 2>&1
# Save space usage info
-echo "Post-fill space:" >> $seq.full
-df $SCRATCH_MNT >>$seq.full 2>&1
+echo "Post-fill space:" >> $seqres.full
+df $SCRATCH_MNT >>$seqres.full 2>&1
# Now attempt a write into all of the preallocated space -
# in a very nasty way, badly fragmenting it and then filling it in.
-echo "Fill in prealloc space; fragment at offsets:" >> $seq.full
+echo "Fill in prealloc space; fragment at offsets:" >> $seqres.full
for i in `seq 1 2 1023`; do
- echo -n "$i " >> $seq.full
+ echo -n "$i " >> $seqres.full
dd if=/dev/zero of=$SCRATCH_MNT/test seek=$i bs=4K count=1 conv=notrunc \
- >>$seq.full 2>/dev/null || _fail "failed to write to test file"
+ >>$seqres.full 2>/dev/null || _fail "failed to write to test file"
done
sync
-echo >> $seq.full
-echo "Fill in prealloc space; fill holes at offsets:" >> $seq.full
+echo >> $seqres.full
+echo "Fill in prealloc space; fill holes at offsets:" >> $seqres.full
for i in `seq 2 2 1023`; do
- echo -n "$i " >> $seq.full
+ echo -n "$i " >> $seqres.full
dd if=/dev/zero of=$SCRATCH_MNT/test seek=$i bs=4K count=1 conv=notrunc \
- >>$seq.full 2>/dev/null || _fail "failed to fill test file"
+ >>$seqres.full 2>/dev/null || _fail "failed to fill test file"
done
sync
-echo >> $seq.full
+echo >> $seqres.full
echo "done"
exit
diff --git a/tests/generic/275 b/tests/generic/275
index 5bf06e4..949ffdb 100755
--- a/tests/generic/275
+++ b/tests/generic/275
@@ -25,6 +25,7 @@
#creator
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -51,10 +52,10 @@ echo "------------------------------"
echo "write lack test"
echo "------------------------------"
-rm -f $seq.full
+rm -f $seqres.full
umount $SCRATCH_DEV 2>/dev/null
-_scratch_mkfs_sized $((1 * 1024 * 1024 * 1024)) >>$seq.full 2>&1
+_scratch_mkfs_sized $((1 * 1024 * 1024 * 1024)) >>$seqres.full 2>&1
_scratch_mount
rm -rf $SCRATCH_MNT/*
diff --git a/tests/generic/277 b/tests/generic/277
index 8ef809c..b85e429 100755
--- a/tests/generic/277
+++ b/tests/generic/277
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
status=1 # failure is the default!
diff --git a/tests/generic/280 b/tests/generic/280
index 69c9afd..a43c211 100755
--- a/tests/generic/280
+++ b/tests/generic/280
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -52,7 +53,7 @@ _supported_os Linux
_supported_fs ext3 ext4 xfs
umount $SCRATCH_DEV 2>/dev/null
-_scratch_mkfs >> $seq.full 2>&1
+_scratch_mkfs >> $seqres.full 2>&1
_scratch_mount "-o usrquota,grpquota"
quotacheck -u -g $SCRATCH_MNT 2>/dev/null
quotaon $SCRATCH_MNT 2>/dev/null
diff --git a/tests/shared/051 b/tests/shared/051
index 07d5a9b..0671f83 100755
--- a/tests/shared/051
+++ b/tests/shared/051
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
here=`pwd`
tmp=/tmp/$$
@@ -73,7 +74,7 @@ _supported_os Linux
[ -x $runas ] || _notrun "$runas executable not found"
-rm -f $seq.full
+rm -f $seqres.full
_setup_testdir
diff --git a/tests/shared/068 b/tests/shared/068
index fe4684c..c8128c5 100755
--- a/tests/shared/068
+++ b/tests/shared/068
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -56,13 +57,13 @@ _require_scratch
echo "*** init FS"
-rm -f $seq.full
+rm -f $seqres.full
umount $SCRATCH_DEV >/dev/null 2>&1
-echo "*** MKFS ***" >>$seq.full
-echo "" >>$seq.full
-_scratch_mkfs >>$seq.full 2>&1 \
+echo "*** MKFS ***" >>$seqres.full
+echo "" >>$seqres.full
+_scratch_mkfs >>$seqres.full 2>&1 \
|| _fail "mkfs failed"
-_scratch_mount >>$seq.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed"
touch $tmp.running
@@ -90,23 +91,23 @@ touch $tmp.running
i=0
let ITERATIONS=$ITERATIONS-1
-echo | tee -a $seq.full
+echo | tee -a $seqres.full
while [ $i -le $ITERATIONS ]
do
- echo "*** iteration: $i" | tee -a $seq.full
- echo "*** freezing \$SCRATCH_MNT" | tee -a $seq.full
- xfs_freeze -f "$SCRATCH_MNT" | tee -a $seq.full
+ echo "*** iteration: $i" | tee -a $seqres.full
+ echo "*** freezing \$SCRATCH_MNT" | tee -a $seqres.full
+ xfs_freeze -f "$SCRATCH_MNT" | tee -a $seqres.full
[ $? != 0 ] && echo xfs_freeze -f "$SCRATCH_MNT" failed | \
- tee -a $seq.full
+ tee -a $seqres.full
sleep 2
- echo "*** thawing \$SCRATCH_MNT" | tee -a $seq.full
- xfs_freeze -u "$SCRATCH_MNT" | tee -a $seq.full
+ echo "*** thawing \$SCRATCH_MNT" | tee -a $seqres.full
+ xfs_freeze -u "$SCRATCH_MNT" | tee -a $seqres.full
[ $? != 0 ] && echo xfs_freeze -u "$SCRATCH_MNT" failed | \
- tee -a $seq.full
+ tee -a $seqres.full
sleep 2
- echo | tee -a $seq.full
+ echo | tee -a $seqres.full
let i=$i+1
done
diff --git a/tests/shared/218 b/tests/shared/218
index 4b46452..7c2bd53 100755
--- a/tests/shared/218
+++ b/tests/shared/218
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -59,36 +60,36 @@ rm -f $fragfile
# Craft some fragmented files, defrag them, check the result.
-echo "zero-length file:" | tee -a $seq.full
+echo "zero-length file:" | tee -a $seqres.full
touch $fragfile
_defrag $fragfile
-echo "Sparse file (no blocks):" | tee -a $seq.full
+echo "Sparse file (no blocks):" | tee -a $seqres.full
xfs_io -F -f -c "truncate 1m" $fragfile
_defrag $fragfile
-echo "Contiguous file:" | tee -a $seq.full
+echo "Contiguous file:" | tee -a $seqres.full
dd if=/dev/zero of=$fragfile bs=4k count=4 &>/dev/null
_defrag $fragfile
-echo "Write backwards sync, but contiguous - should defrag to 1 extent" | tee -a $seq.full
+echo "Write backwards sync, but contiguous - should defrag to 1 extent" | tee -a $seqres.full
for I in `seq 9 -1 0`; do
dd if=/dev/zero of=$fragfile bs=4k count=1 conv=notrunc seek=$I oflag=sync &>/dev/null
done
_defrag $fragfile
-echo "Write backwards sync leaving holes - defrag should do nothing" | tee -a $seq.full
+echo "Write backwards sync leaving holes - defrag should do nothing" | tee -a $seqres.full
for I in `seq 31 -2 0`; do
dd if=/dev/zero of=$fragfile bs=4k count=1 conv=notrunc seek=$I oflag=sync &>/dev/null
done
_defrag $fragfile
-echo "Write forwards sync leaving holes - defrag should do nothing" | tee -a $seq.full
+echo "Write forwards sync leaving holes - defrag should do nothing" | tee -a $seqres.full
for I in `seq 0 2 31`; do
dd if=/dev/zero of=$fragfile bs=4k count=1 conv=notrunc seek=$I oflag=sync &>/dev/null
done
_defrag $fragfile
-rm -f $seq.full
+rm -f $seqres.full
status=0
exit
diff --git a/tests/shared/243 b/tests/shared/243
index 6a1b6d7..4884e29 100755
--- a/tests/shared/243
+++ b/tests/shared/243
@@ -42,6 +42,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -85,23 +86,23 @@ _check_ext4_eof_flag()
# Ensure that the iflags value was parsed correctly.
if [ -z ${iflags} ]; then
- echo "iFlags value was not parsed successfully." >> $seq.full
+ echo "iFlags value was not parsed successfully." >> $seqres.full
status=1
exit ${status}
fi
# Check if EOFBLOCKS_FL is set.
if ((${iflags} & 0x400000)); then
- echo "EOFBLOCK_FL bit is set." >> $seq.full
+ echo "EOFBLOCK_FL bit is set." >> $seqres.full
bit_set=1
else
- echo "EOFBLOCK_FL bit is not set." >> $seq.full
+ echo "EOFBLOCK_FL bit is not set." >> $seqres.full
bit_set=0
fi
# Check current bit state to expected value.
if [ ${bit_set} -ne ${2} ]; then
- echo "Error: Current bit state incorrect." >> $seq.full
+ echo "Error: Current bit state incorrect." >> $seqres.full
status=1
exit ${status}
fi
@@ -121,14 +122,14 @@ _supported_os Linux
_require_xfs_io_falloc
# Real QA test starts here.
-rm -f $seq.full
+rm -f $seqres.full
# Remove any leftover files from last run.
rm -f ${TEST_DIR}/test_?
# Begin test cases.
echo "Test 1: Fallocate 40960 bytes and write 4096 bytes (buffered io)." \
- >> $seq.full
+ >> $seqres.full
${XFS_IO_PROG} -F -f \
-c 'falloc -k 0 40960' \
-c 'pwrite 0 4096' \
@@ -136,7 +137,7 @@ ${XFS_IO_PROG} -F -f \
_check_ext4_eof_flag test_1 ${BIT_SET}
echo "Test 2: Fallocate 40960 bytes and write 4096 bytes (direct io)." \
- >> $seq.full
+ >> $seqres.full
${XFS_IO_PROG} -F -f -d \
-c 'falloc -k 0 40960' \
-c 'pwrite 0 4096' \
@@ -144,7 +145,7 @@ ${XFS_IO_PROG} -F -f -d \
_check_ext4_eof_flag test_2 ${BIT_SET}
echo "Test 3: Fallocate 40960 bytes and write 40960 bytes (buffered io)." \
- >> $seq.full
+ >> $seqres.full
${XFS_IO_PROG} -F -f \
-c 'falloc -k 0 40960' \
-c 'pwrite 0 40960' \
@@ -152,7 +153,7 @@ ${XFS_IO_PROG} -F -f \
_check_ext4_eof_flag test_3 ${BIT_NOT_SET}
echo "Test 4: Fallocate 40960 bytes and write 40960 bytes (direct io)." \
- >> $seq.full
+ >> $seqres.full
${XFS_IO_PROG} -F -f -d \
-c 'falloc -k 0 40960' \
-c 'pwrite 0 40960' \
@@ -160,7 +161,7 @@ ${XFS_IO_PROG} -F -f -d \
_check_ext4_eof_flag test_4 ${BIT_NOT_SET}
echo "Test 5: Fallocate 128k, seek 256k and write 4k block (buffered io)." \
- >> $seq.full
+ >> $seqres.full
${XFS_IO_PROG} -F -f \
-c 'falloc -k 0 128k' \
-c 'pwrite 256k 4k' \
@@ -168,7 +169,7 @@ ${XFS_IO_PROG} -F -f \
_check_ext4_eof_flag test_5 ${BIT_NOT_SET}
echo "Test 6: Fallocate 128k, seek to 256k and write a 4k block (direct io)." \
- >> $seq.full
+ >> $seqres.full
${XFS_IO_PROG} -F -f -d \
-c 'falloc -k 0 128k' \
-c 'pwrite 256k 4k' \
diff --git a/tests/shared/272 b/tests/shared/272
index ed85216..f5b826f 100755
--- a/tests/shared/272
+++ b/tests/shared/272
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -52,8 +53,8 @@ _workout()
chattr_opt: $chattr_opt"
dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \
bs=1M count=4 $write_opt \
- >> $seq.full 2>&1 || exit
- chattr $chattr_opt $SCRATCH_MNT/file.$idx >> $seq.full \
+ >> $seqres.full 2>&1 || exit
+ chattr $chattr_opt $SCRATCH_MNT/file.$idx >> $seqres.full \
|| exit
done
done
@@ -69,9 +70,9 @@ chattr_opt: $chattr_opt"
echo "OP write_opt: $write_opt ENOSPC, \
chattr_opt: $chattr_opt"
dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \
- bs=1M $write_opt >> $seq.full 2>&1
+ bs=1M $write_opt >> $seqres.full 2>&1
chattr $chattr_opt $SCRATCH_MNT/file.$idx \
- >> $seq.full || exit
+ >> $seqres.full || exit
done
sync
unlink $SCRATCH_MNT/file.$idx
@@ -84,7 +85,7 @@ _supported_os Linux
_need_to_be_root
_require_scratch
-_scratch_mkfs_sized $((64 * 1024 * 1024)) >> $seq.full 2>&1
+_scratch_mkfs_sized $((64 * 1024 * 1024)) >> $seqres.full 2>&1
_scratch_mount
if ! _workout; then
diff --git a/tests/udf/098 b/tests/udf/098
index 58d2a95..dd1e9ad 100755
--- a/tests/udf/098
+++ b/tests/udf/098
@@ -30,6 +30,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -268,7 +269,7 @@ _check_udf_filesystem $SCRATCH_DEV
# optional stuff if your test has verbose output to help resolve problems
#echo
-#echo "If failure, check $seq.full (this) and $seq.full.ok (reference)"
+#echo "If failure, check $seqres.full (this) and $seqres.full.ok (reference)"
# success, all done
status=0
diff --git a/tests/udf/101 b/tests/udf/101
index 0d274e5..89507a9 100755
--- a/tests/udf/101
+++ b/tests/udf/101
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/udf/102 b/tests/udf/102
index 68407a7..bf3edd2 100755
--- a/tests/udf/102
+++ b/tests/udf/102
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/003 b/tests/xfs/003
index 79b6bc5..56dd852 100755
--- a/tests/xfs/003
+++ b/tests/xfs/003
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
# get standard environment, filters and checks
diff --git a/tests/xfs/004 b/tests/xfs/004
index d75c3c0..fb02b95 100755
--- a/tests/xfs/004
+++ b/tests/xfs/004
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -39,8 +40,8 @@ trap "_cleanup" 0 1 2 3 15
_populate_scratch()
{
- echo "=== mkfs output ===" >>$seq.full
- _scratch_mkfs_xfs | tee -a $seq.full | _filter_mkfs 2>$tmp.mkfs
+ echo "=== mkfs output ===" >>$seqres.full
+ _scratch_mkfs_xfs | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs
. $tmp.mkfs
_scratch_mount
dd if=/dev/zero of=$SCRATCH_MNT/foo count=200 bs=4096 >/dev/null 2>&1 &
@@ -64,7 +65,7 @@ _need_to_be_root
_require_scratch
_require_no_large_scratch_dev
-rm -f $seq.full
+rm -f $seqres.full
_populate_scratch
@@ -72,16 +73,16 @@ _populate_scratch
eval `$DF_PROG $SCRATCH_MNT 2>&1 \
| tail -1 | $AWK_PROG '{ printf "blocks=%u used=%u avail=%u\n", $3, $4, $5 }'`
-echo "df gave: blocks=$blocks used=$used avail=$avail" >>$seq.full
-echo "blocksize from mkfs is '$dbsize'" >>$seq.full
+echo "df gave: blocks=$blocks used=$used avail=$avail" >>$seqres.full
+echo "blocksize from mkfs is '$dbsize'" >>$seqres.full
xfs_db -r -c "freesp -s" $SCRATCH_DEV >$tmp.xfs_db
-echo "xfs_db for $SCRATCH_DEV" >>$seq.full
-cat $tmp.xfs_db >>$seq.full
+echo "xfs_db for $SCRATCH_DEV" >>$seqres.full
+cat $tmp.xfs_db >>$seqres.full
eval `$XFS_IO_PROG -x -c resblks $SCRATCH_MNT 2>&1 \
| $AWK_PROG '/available/ { printf "resblks=%u\n", $5 }'`
-echo "resblks gave: resblks=$resblks" >>$seq.full
+echo "resblks gave: resblks=$resblks" >>$seqres.full
# check the 'blocks' field from freesp command is OK
# since 2.6.18, df does not report the 4 blocks per AG that cannot
diff --git a/tests/xfs/008 b/tests/xfs/008
index 0dee9f5..1f66779 100755
--- a/tests/xfs/008
+++ b/tests/xfs/008
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/009 b/tests/xfs/009
index 1883f15..3e74160 100755
--- a/tests/xfs/009
+++ b/tests/xfs/009
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/012 b/tests/xfs/012
index 10498d5..4bd2afc 100755
--- a/tests/xfs/012
+++ b/tests/xfs/012
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/016 b/tests/xfs/016
index 538ba14..fcb0637 100755
--- a/tests/xfs/016
+++ b/tests/xfs/016
@@ -36,6 +36,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -72,7 +73,7 @@ _init()
if _scratch_mkfs_xfs -N -K $force_opts >/dev/null 2>&1; then
force_opts="-K $force_opts"
fi
- echo mkfs_xfs $force_opts $SCRATCH_DEV >>$seq.full
+ echo mkfs_xfs $force_opts $SCRATCH_DEV >>$seqres.full
_scratch_mkfs_xfs $force_opts >$tmp.mkfs0 2>&1
[ $? -ne 0 ] && \
_notrun "Cannot mkfs for this test using MKFS_OPTIONS specified"
@@ -163,8 +164,8 @@ _check_corrupt()
{
f="c6c6c6c6"
echo "*** check for corruption"
- echo "expect $f..." >>$seq.full
- xfs_db -r -c "fsblock $2" -c "print" $1 | head | tee -a $seq.full | \
+ echo "expect $f..." >>$seqres.full
+ xfs_db -r -c "fsblock $2" -c "print" $1 | head | tee -a $seqres.full | \
grep -q -v "$f $f $f $f $f $f $f $f" && \
_fail "!!! block $2 corrupted!"
}
@@ -177,7 +178,7 @@ _check_corrupt()
_supported_fs xfs
_supported_os Linux
-rm -f $seq.full
+rm -f $seqres.full
# mkfs sizes
log_size=2097152
@@ -187,15 +188,15 @@ _require_scratch
_init
block=`_after_log $SCRATCH_DEV`
-echo "fsblock after log = $block" >>$seq.full
+echo "fsblock after log = $block" >>$seqres.full
_check_corrupt $SCRATCH_DEV $block
actual_log_size=`_log_size`
-echo "log size = $actual_log_size BB" >>$seq.full
+echo "log size = $actual_log_size BB" >>$seqres.full
head=`_log_head`
-echo "log position = $head" >>$seq.full
+echo "log position = $head" >>$seqres.full
lsunit=`_log_sunit`
-echo "log sunit = $lsunit" >>$seq.full
+echo "log sunit = $lsunit" >>$seqres.full
# sanity checks
[ $actual_log_size -eq $log_size_bb ] || \
@@ -206,36 +207,36 @@ echo "log sunit = $lsunit" >>$seq.full
# find how how many blocks per op for 100 ops
# ignore the fact that it will also include an unmount record etc...
# this should be small overall
-echo " lots of traffic for sampling" >>$seq.full
+echo " lots of traffic for sampling" >>$seqres.full
sample_size_ops=100
_log_traffic $sample_size_ops
head1=`_log_head`
num_blocks=`expr $head1 - $head`
blocks_per_op=`echo "scale=3; $num_blocks / $sample_size_ops" | bc`
-echo "blocks_per_op = $blocks_per_op" >>$seq.full
+echo "blocks_per_op = $blocks_per_op" >>$seqres.full
num_expected_ops=`echo "$log_size_bb / $blocks_per_op" | bc`
-echo "num_expected_ops = $num_expected_ops" >>$seq.full
+echo "num_expected_ops = $num_expected_ops" >>$seqres.full
num_expected_to_go=`echo "$num_expected_ops - $sample_size_ops" | bc`
-echo "num_expected_to_go = $num_expected_to_go" >>$seq.full
+echo "num_expected_to_go = $num_expected_to_go" >>$seqres.full
-echo " lots more traffic" >>$seq.full
+echo " lots more traffic" >>$seqres.full
_log_traffic $num_expected_to_go
head=`_log_head`
-echo "log position = $head" >>$seq.full
+echo "log position = $head" >>$seqres.full
# e.g. 3891
near_end_min=`echo "0.95 * $log_size_bb" | bc | sed 's/\..*//'`
-echo "near_end_min = $near_end_min" >>$seq.full
+echo "near_end_min = $near_end_min" >>$seqres.full
[ $head -gt $near_end_min -a $head -lt $log_size_bb ] || \
_fail "!!! unexpected near end log position $head"
for c in `seq 0 20`
do
- echo " little traffic" >>$seq.full
+ echo " little traffic" >>$seqres.full
_log_traffic 2
head=`_log_head`
- echo "log position = $head" >>$seq.full
+ echo "log position = $head" >>$seqres.full
_check_corrupt $SCRATCH_DEV $block
done
diff --git a/tests/xfs/017 b/tests/xfs/017
index 59d092d..7c29d21 100755
--- a/tests/xfs/017
+++ b/tests/xfs/017
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -52,13 +53,13 @@ _require_no_large_scratch_dev
echo "*** init FS"
-rm -f $seq.full
+rm -f $seqres.full
umount $SCRATCH_DEV >/dev/null 2>&1
-echo "*** MKFS ***" >>$seq.full
-echo "" >>$seq.full
-_scratch_mkfs_xfs >>$seq.full 2>&1 \
+echo "*** MKFS ***" >>$seqres.full
+echo "" >>$seqres.full
+_scratch_mkfs_xfs >>$seqres.full 2>&1 \
|| _fail "mkfs failed"
-_scratch_mount >>$seq.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed"
echo "*** test"
@@ -66,21 +67,21 @@ echo "*** test"
for l in 0 1 2 3 4
do
echo " *** test $l"
- $FSSTRESS_PROG -d $SCRATCH_MNT -n 1000 $FSSTRESS_AVOID >>$seq.full
+ $FSSTRESS_PROG -d $SCRATCH_MNT -n 1000 $FSSTRESS_AVOID >>$seqres.full
_scratch_mount -o remount,ro \
|| _fail "remount ro failed"
- echo "" >>$seq.full
- echo "*** xfs_logprint ***" >>$seq.full
- echo "" >>$seq.full
- _scratch_xfs_logprint -tb | tee -a $seq.full \
+ echo "" >>$seqres.full
+ echo "*** xfs_logprint ***" >>$seqres.full
+ echo "" >>$seqres.full
+ _scratch_xfs_logprint -tb | tee -a $seqres.full \
| head | grep -q "<CLEAN>" || _fail "DIRTY LOG"
- echo "" >>$seq.full
- echo "*** XFS_CHECK ***" >>$seq.full
- echo "" >>$seq.full
- _scratch_xfs_check >>$seq.full 2>&1 \
+ echo "" >>$seqres.full
+ echo "*** XFS_CHECK ***" >>$seqres.full
+ echo "" >>$seqres.full
+ _scratch_xfs_check >>$seqres.full 2>&1 \
|| _fail "xfs_check failed"
_scratch_mount -o remount,rw \
|| _fail "remount rw failed"
@@ -88,6 +89,6 @@ done
echo "*** done"
# happy exit
-rm -f $seq.full
+rm -f $seqres.full
status=0
exit 0
diff --git a/tests/xfs/018 b/tests/xfs/018
index 156cc1d..ed99f20 100755
--- a/tests/xfs/018
+++ b/tests/xfs/018
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -47,7 +48,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fs xfs
_supported_os IRIX Linux
# prelim
-rm -f $seq.full $tmp.*
+rm -f $seqres.full $tmp.*
_require_scratch
_require_v2log
diff --git a/tests/xfs/019 b/tests/xfs/019
index 1fb0d83..c4bb681 100755
--- a/tests/xfs/019
+++ b/tests/xfs/019
@@ -23,11 +23,12 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
-seqfull="$seq.full"
+seqfull="$seqres.full"
status=1 # failure is the default!
# get standard environment, filters and checks
. ./common.rc
diff --git a/tests/xfs/021 b/tests/xfs/021
index 18fe40e..3cbf088 100755
--- a/tests/xfs/021
+++ b/tests/xfs/021
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -78,7 +79,7 @@ _supported_os Linux
_require_scratch
_require_attrs
-rm -f $seq.full
+rm -f $seqres.full
umount $SCRATCH_DEV >/dev/null 2>&1
echo "*** mkfs"
@@ -124,7 +125,7 @@ echo ""
inum_2=`ls -li $testfile.2 | $AWK_PROG '{ print $1 }'`
echo "*** unmount FS"
-umount $SCRATCH_DEV >>$seq.full 2>&1 \
+umount $SCRATCH_DEV >>$seqres.full 2>&1 \
|| _fail "umount failed"
echo "*** dump attributes (1)"
diff --git a/tests/xfs/022 b/tests/xfs/022
index 962316f..0251936 100755
--- a/tests/xfs/022
+++ b/tests/xfs/022
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/023 b/tests/xfs/023
index 3e7fdd2..7bb77da 100755
--- a/tests/xfs/023
+++ b/tests/xfs/023
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/024 b/tests/xfs/024
index b7f1c10..ec5edc5 100755
--- a/tests/xfs/024
+++ b/tests/xfs/024
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -42,11 +43,11 @@ _require_tape $TAPE_DEV
_create_dumpdir_fill
# ensure file/dir timestamps precede dump timestamp
sleep 2
-src/bstat $SCRATCH_MNT >>$here/$seq.full
+src/bstat $SCRATCH_MNT >>$here/$seqres.full
_erase_hard
_do_dump
_append_dumpdir_fill
-src/bstat $SCRATCH_MNT >>$here/$seq.full
+src/bstat $SCRATCH_MNT >>$here/$seqres.full
_erase_hard
_do_dump -l 1
_do_restore
diff --git a/tests/xfs/025 b/tests/xfs/025
index 4ccb5de..1e44732 100755
--- a/tests/xfs/025
+++ b/tests/xfs/025
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/026 b/tests/xfs/026
index 37a23cc..04bda76 100755
--- a/tests/xfs/026
+++ b/tests/xfs/026
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/027 b/tests/xfs/027
index 772705d..712378d 100755
--- a/tests/xfs/027
+++ b/tests/xfs/027
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/028 b/tests/xfs/028
index 0bf042f..e70bc57 100755
--- a/tests/xfs/028
+++ b/tests/xfs/028
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -59,7 +60,7 @@ while [ $i -lt 5 ]; do
let i=$i+1
done
-echo "middate = $middate" >>$seq.full
+echo "middate = $middate" >>$seqres.full
#
# Now do the xfsinvutil and
diff --git a/tests/xfs/029 b/tests/xfs/029
index 70c0d10..4916c33 100755
--- a/tests/xfs/029
+++ b/tests/xfs/029
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/030 b/tests/xfs/030
index 080d3fe..f9c1dfb 100755
--- a/tests/xfs/030
+++ b/tests/xfs/030
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/031 b/tests/xfs/031
index 422a271..3dec089 100755
--- a/tests/xfs/031
+++ b/tests/xfs/031
@@ -23,13 +23,14 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
status=1 # failure is the default!
trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
-rm -f $seq.full
+rm -f $seqres.full
# get standard environment, filters and checks
. ./common.rc
@@ -41,15 +42,15 @@ _link_out_file $seq.out
_check_repair()
{
- echo "Repairing, round 0" >> $seq.full
- _scratch_xfs_repair 2>&1 | _filter_repair | tee -a $seq.full >$tmp.0
+ echo "Repairing, round 0" >> $seqres.full
+ _scratch_xfs_repair 2>&1 | _filter_repair | tee -a $seqres.full >$tmp.0
for i in 1 2 3 4
do
- echo "Repairing, iteration $i" | tee -a $seq.full
+ echo "Repairing, iteration $i" | tee -a $seqres.full
_scratch_xfs_repair 2>&1 | _filter_repair >$tmp.$i
- diff $tmp.0 $tmp.$i >> $seq.full
+ diff $tmp.0 $tmp.$i >> $seqres.full
if [ $? -ne 0 ]; then
- echo "ERROR: repair round $i differs to round 0 (see $seq.full)" | tee -a $seq.full
+ echo "ERROR: repair round $i differs to round 0 (see $seqres.full)" | tee -a $seqres.full
break
fi
# echo all interesting stuff...
diff --git a/tests/xfs/032 b/tests/xfs/032
index ad1909d..9836bcc 100755
--- a/tests/xfs/032
+++ b/tests/xfs/032
@@ -23,13 +23,14 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
status=1 # failure is the default!
trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
-rm -f $seq.full
+rm -f $seqres.full
# get standard environment, filters and checks
. ./common.rc
@@ -69,18 +70,18 @@ do
src/devzero -n 20 $SCRATCH_DEV >/dev/null
# create a filesystem of this type
- echo "=== Creating $fs filesystem..." >>$seq.full
- echo " ( $preop mkfs -t $fs $preargs $SCRATCH_DEV $postargs )" >>$seq.full
- eval $preop mkfs -t $fs $preargs $SCRATCH_DEV $postargs >>$seq.full 2>&1
+ echo "=== Creating $fs filesystem..." >>$seqres.full
+ echo " ( $preop mkfs -t $fs $preargs $SCRATCH_DEV $postargs )" >>$seqres.full
+ eval $preop mkfs -t $fs $preargs $SCRATCH_DEV $postargs >>$seqres.full 2>&1
if [ $? -eq 0 ] ; then
# next, ensure we don't overwrite it
- echo "=== Attempting XFS overwrite of $fs..." >>$seq.full
- /sbin/mkfs.xfs $SCRATCH_DEV >>$seq.full 2>&1
+ echo "=== Attempting XFS overwrite of $fs..." >>$seqres.full
+ /sbin/mkfs.xfs $SCRATCH_DEV >>$seqres.full 2>&1
[ $? -eq 0 ] && echo "Failed - overwrote fs type ${fs}!"
else
- echo "mkfs of type ${fs} failed" >>$seq.full
+ echo "mkfs of type ${fs} failed" >>$seqres.full
fi
done
diff --git a/tests/xfs/033 b/tests/xfs/033
index dc5a32d..1540a1c 100755
--- a/tests/xfs/033
+++ b/tests/xfs/033
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/034 b/tests/xfs/034
index 27f3f22..372dead 100755
--- a/tests/xfs/034
+++ b/tests/xfs/034
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -50,13 +51,13 @@ _require_scratch
echo "*** init FS"
-rm -f $seq.full
+rm -f $seqres.full
umount $SCRATCH_DEV >/dev/null 2>&1
-echo "*** MKFS ***" >>$seq.full
-echo "" >>$seq.full
-_scratch_mkfs_xfs >>$seq.full 2>&1 \
+echo "*** MKFS ***" >>$seqres.full
+echo "" >>$seqres.full
+_scratch_mkfs_xfs >>$seqres.full 2>&1 \
|| _fail "mkfs failed"
-_scratch_mount >>$seq.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed"
echo "*** test"
@@ -69,7 +70,7 @@ then
exit
fi
-if ! src/xfsctl $SCRATCH_MNT $SCRATCH_MNT/fish >>$seq.full 2>&1
+if ! src/xfsctl $SCRATCH_MNT $SCRATCH_MNT/fish >>$seqres.full 2>&1
then
echo "!!! failed to run xfsctl test program"
exit
diff --git a/tests/xfs/035 b/tests/xfs/035
index b2fc417..cd743f6 100755
--- a/tests/xfs/035
+++ b/tests/xfs/035
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/036 b/tests/xfs/036
index e9bb411..5a7ee01 100755
--- a/tests/xfs/036
+++ b/tests/xfs/036
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/037 b/tests/xfs/037
index e2e71c5..ca10429 100755
--- a/tests/xfs/037
+++ b/tests/xfs/037
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/038 b/tests/xfs/038
index b62a4c9..64d2428 100755
--- a/tests/xfs/038
+++ b/tests/xfs/038
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/039 b/tests/xfs/039
index 428e8bb..21574d6 100755
--- a/tests/xfs/039
+++ b/tests/xfs/039
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/040 b/tests/xfs/040
index 0021c22..119a770 100755
--- a/tests/xfs/040
+++ b/tests/xfs/040
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -49,9 +50,9 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
# real QA test starts here
cd "$WORKAREA/xfstests"
echo Silence is golden.
-perl tools/srcdiff -q >$seq.full
-if ! diff $seq.full $seq.good >/dev/null; then
- echo "FAILED: srcdiff output $seq.full differs to $seq.good"
+perl tools/srcdiff -q >$seqres.full
+if ! diff $seqres.full $seq.good >/dev/null; then
+ echo "FAILED: srcdiff output $seqres.full differs to $seq.good"
exit 1
fi
diff --git a/tests/xfs/041 b/tests/xfs/041
index a9a9a23..dd50301 100755
--- a/tests/xfs/041
+++ b/tests/xfs/041
@@ -25,6 +25,7 @@
set +x
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -59,7 +60,7 @@ _fill()
}
_do_die_on_error=message_only
-rm -f $seq.full
+rm -f $seqres.full
agsize=32
echo -n "Make $agsize megabyte filesystem on SCRATCH_DEV and mount... "
_scratch_mkfs_xfs -dsize=${agsize}m,agcount=1 2>&1 >/dev/null || _fail "mkfs failed"
@@ -84,7 +85,7 @@ do
echo "done"
echo -n "Check files... "
if ! _do "src/fill2fs_check $tmp.manifest"; then
- echo "fail (see $seq.full)"
+ echo "fail (see $seqres.full)"
_do "cat $tmp.manifest"
_do "ls -altrR $SCRATCH_MNT"
_do "dd if=$SCRATCH_DEV bs=4096 count=$grow_size | gzip -9 > $seq.fsimage.gz"
diff --git a/tests/xfs/042 b/tests/xfs/042
index 15fa5dc..1127b46 100755
--- a/tests/xfs/042
+++ b/tests/xfs/042
@@ -26,6 +26,7 @@
set +x
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -86,7 +87,7 @@ _cull_files()
# create 3 minimum sized (16Mb) allocation groups
# xfs_repair is going to need three to verify the superblock
-rm -f $seq.full
+rm -f $seqres.full
_do_die_on_error=message_only
echo -n "Make a 48 megabyte filesystem on SCRATCH_DEV and mount... "
@@ -147,7 +148,7 @@ echo -n "Check fill file... "
_do "sum $SCRATCH_MNT/fill >$tmp.fillsum2"
if ! _do "diff $tmp.fillsum1 $tmp.fillsum2"; then
echo "fail"
- echo "Fill file is corrupt/missing after fsr. Test failed see $seq.full"
+ echo "Fill file is corrupt/missing after fsr. Test failed see $seqres.full"
status=1; exit
fi
echo "done"
@@ -157,7 +158,7 @@ echo -n "Check large file... "
_do "sum $SCRATCH_MNT/fragmented >$tmp.sum2"
if ! _do "diff $tmp.sum1 $tmp.sum2"; then
echo "fail"
- echo "File is corrupt/missing after fsr. Test failed see $seq.full"
+ echo "File is corrupt/missing after fsr. Test failed see $seqres.full"
status=1; exit
fi
echo "done"
diff --git a/tests/xfs/043 b/tests/xfs/043
index ef92c0a..75c2d38 100755
--- a/tests/xfs/043
+++ b/tests/xfs/043
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/044 b/tests/xfs/044
index d0d8bd8..3b330b9 100755
--- a/tests/xfs/044
+++ b/tests/xfs/044
@@ -27,6 +27,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/045 b/tests/xfs/045
index c20e3a8..9d07570 100755
--- a/tests/xfs/045
+++ b/tests/xfs/045
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/046 b/tests/xfs/046
index fb83b7a..d5f4fca 100755
--- a/tests/xfs/046
+++ b/tests/xfs/046
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/047 b/tests/xfs/047
index 7c5e896..18960ea 100755
--- a/tests/xfs/047
+++ b/tests/xfs/047
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -59,7 +60,7 @@ while [ $i -lt 5 ]; do
let i=$i+1
done
-echo "middate = $middate" >>$seq.full
+echo "middate = $middate" >>$seqres.full
# Only say No to 1st question to prune
cat >$tmp.input <<EOF
diff --git a/tests/xfs/048 b/tests/xfs/048
index 6139361..a39ec66 100755
--- a/tests/xfs/048
+++ b/tests/xfs/048
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/049 b/tests/xfs/049
index 0a6e69c..e2d1293 100755
--- a/tests/xfs/049
+++ b/tests/xfs/049
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
_cleanup()
@@ -32,10 +33,10 @@ _cleanup()
umount -d $SCRATCH_MNT/test > /dev/null 2>&1
rm -f $tmp.*
- if [ -w $seq.full ]
+ if [ -w $seqres.full ]
then
- echo "--- mounts at end (after cleanup)" >> $seq.full
- mount >> $seq.full
+ echo "--- mounts at end (after cleanup)" >> $seqres.full
+ mount >> $seqres.full
fi
}
@@ -55,7 +56,7 @@ _supported_os Linux
_log()
{
echo "--- $*"
- echo "--- $*" >> $seq.full
+ echo "--- $*" >> $seqres.full
}
_require_nonexternal
@@ -64,75 +65,75 @@ _require_no_large_scratch_dev
_require_loop
_require_ext2
-rm -f $seq.full
+rm -f $seqres.full
-echo "(dev=$SCRATCH_DEV, mount=$SCRATCH_MNT)" >> $seq.full
-echo "" >> $seq.full
+echo "(dev=$SCRATCH_DEV, mount=$SCRATCH_MNT)" >> $seqres.full
+echo "" >> $seqres.full
-echo "--- mounts" >> $seq.full
-mount >> $seq.full
+echo "--- mounts" >> $seqres.full
+mount >> $seqres.full
_log "Create ext2 fs on scratch"
-mkfs -t ext2 -F $SCRATCH_DEV >> $seq.full 2>&1 \
+mkfs -t ext2 -F $SCRATCH_DEV >> $seqres.full 2>&1 \
|| _fail "!!! failed to mkfs ext2"
_log "Mount ext2 fs on scratch"
-mount -t ext2 $SCRATCH_DEV $SCRATCH_MNT >> $seq.full 2>&1 \
+mount -t ext2 $SCRATCH_DEV $SCRATCH_MNT >> $seqres.full 2>&1 \
|| _fail "!!! failed to mount"
_log "Create xfs fs in file on scratch"
/sbin/mkfs.xfs -f -dfile,name=$SCRATCH_MNT/test.xfs,size=40m \
- >> $seq.full 2>&1 \
+ >> $seqres.full 2>&1 \
|| _fail "!!! failed to mkfs xfs"
_log "Make mount points"
-mkdir $SCRATCH_MNT/test $SCRATCH_MNT/test2 >> $seq.full 2>&1 \
+mkdir $SCRATCH_MNT/test $SCRATCH_MNT/test2 >> $seqres.full 2>&1 \
|| _fail "!!! failed to make mount points"
_log "Mount xfs via loop"
-mount -t xfs -o loop $SCRATCH_MNT/test.xfs $SCRATCH_MNT/test >> $seq.full 2>&1 \
+mount -t xfs -o loop $SCRATCH_MNT/test.xfs $SCRATCH_MNT/test >> $seqres.full 2>&1 \
|| _fail "!!! failed to loop mount xfs"
_log "stress"
-$FSSTRESS_PROG -d $SCRATCH_MNT/test -n 1000 $FSSTRESS_AVOID >> $seq.full 2>&1 \
+$FSSTRESS_PROG -d $SCRATCH_MNT/test -n 1000 $FSSTRESS_AVOID >> $seqres.full 2>&1 \
|| _fail "!!! stress failed"
_log "clean"
-rm -rf $SCRATCH_MNT/test/* >> $seq.full 2>&1 \
+rm -rf $SCRATCH_MNT/test/* >> $seqres.full 2>&1 \
|| _fail "!!! clean failed"
_log "create file for ext2 fs"
-dd if=/dev/zero of=$SCRATCH_MNT/test/test.ext2 bs=1024 count=10240 >> $seq.full 2>&1 \
+dd if=/dev/zero of=$SCRATCH_MNT/test/test.ext2 bs=1024 count=10240 >> $seqres.full 2>&1 \
|| _fail "!!! create file failed"
_log "Create ext2 fs in file on looped xfs"
-echo y | mkfs -t ext2 $SCRATCH_MNT/test/test.ext2 >> $seq.full 2>&1 \
+echo y | mkfs -t ext2 $SCRATCH_MNT/test/test.ext2 >> $seqres.full 2>&1 \
|| _fail "!!! failed to mkfs ext2 on xfs"
_log "Mount ext2 on xfs via loop"
-mount -t ext2 -o loop $SCRATCH_MNT/test/test.ext2 $SCRATCH_MNT/test2 >> $seq.full 2>&1 \
+mount -t ext2 -o loop $SCRATCH_MNT/test/test.ext2 $SCRATCH_MNT/test2 >> $seqres.full 2>&1 \
|| _fail "!!! failed to loop mount xfs"
_log "stress ext2 on xfs via loop"
-$FSSTRESS_PROG -d $SCRATCH_MNT/test2 -n 1000 $FSSTRESS_AVOID >> $seq.full 2>&1 \
+$FSSTRESS_PROG -d $SCRATCH_MNT/test2 -n 1000 $FSSTRESS_AVOID >> $seqres.full 2>&1 \
|| _fail "!!! stress ext2 failed"
_log "clean"
-rm -rf $SCRATCH_MNT/test/* >> $seq.full 2>&1 \
+rm -rf $SCRATCH_MNT/test/* >> $seqres.full 2>&1 \
|| _fail "!!! clean failed"
_log "umount ext2 on xfs"
-umount -d $SCRATCH_MNT/test2 >> $seq.full 2>&1 \
+umount -d $SCRATCH_MNT/test2 >> $seqres.full 2>&1 \
|| _fail "!!! umount ext2 failed"
_log "umount xfs"
-umount -d $SCRATCH_MNT/test >> $seq.full 2>&1 \
+umount -d $SCRATCH_MNT/test >> $seqres.full 2>&1 \
|| _fail "!!! umount xfs failed"
-echo "--- mounts at end (before cleanup)" >> $seq.full
-mount >> $seq.full
+echo "--- mounts at end (before cleanup)" >> $seqres.full
+mount >> $seqres.full
-rm -f $seq.full
+rm -f $seqres.full
# success, all done
status=0
exit
diff --git a/tests/xfs/050 b/tests/xfs/050
index 6a66032..d402cbf 100755
--- a/tests/xfs/050
+++ b/tests/xfs/050
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -49,8 +50,8 @@ _supported_fs xfs
_supported_os Linux IRIX
-cp /dev/null $seq.full
-chmod a+rwx $seq.full # arbitrary users will write here
+cp /dev/null $seqres.full
+chmod a+rwx $seqres.full # arbitrary users will write here
_require_scratch
_require_xfs_quota
@@ -94,7 +95,7 @@ _filter_and_check_blks()
_exercise()
{
_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
- cat $tmp.mkfs >>$seq.full
+ cat $tmp.mkfs >>$seqres.full
# keep the blocksize and data size for dd later
. $tmp.mkfs
@@ -111,20 +112,20 @@ _exercise()
_qsetup
- echo "Using output from '" `ls -l $seq.out` "'" >>$seq.full
- echo "and using type=$type id=$id" >>$seq.full
+ echo "Using output from '" `ls -l $seq.out` "'" >>$seqres.full
+ echo "and using type=$type id=$id" >>$seqres.full
echo
- echo "*** report no quota settings" | tee -a $seq.full
+ echo "*** report no quota settings" | tee -a $seqres.full
xfs_quota -D $tmp.projects -P $tmp.projid -x \
-c "repquota -birnN -$type" $SCRATCH_DEV |
_filter_report | LC_COLLATE=POSIX sort -ru
echo
- echo "*** report initial settings" | tee -a $seq.full
+ echo "*** report initial settings" | tee -a $seqres.full
_file_as_id $SCRATCH_MNT/initme $id $type 1024 0
- echo "ls -l $SCRATCH_MNT" >>$seq.full
- ls -l $SCRATCH_MNT >>$seq.full
+ echo "ls -l $SCRATCH_MNT" >>$seqres.full
+ ls -l $SCRATCH_MNT >>$seqres.full
xfs_quota -D $tmp.projects -P $temp.projid -x \
-c "limit -$type bsoft=${bsoft}k bhard=${bhard}k $id" \
-c "limit -$type isoft=$isoft ihard=$ihard $id" \
@@ -134,7 +135,7 @@ _exercise()
_filter_report | LC_COLLATE=POSIX sort -ru
echo
- echo "*** push past the soft inode limit" | tee -a $seq.full
+ echo "*** push past the soft inode limit" | tee -a $seqres.full
_file_as_id $SCRATCH_MNT/softie1 $id $type 1024 0
_file_as_id $SCRATCH_MNT/softie2 $id $type 1024 0
_qmount
@@ -143,7 +144,7 @@ _exercise()
_filter_report | LC_COLLATE=POSIX sort -ru
echo
- echo "*** push past the soft block limit" | tee -a $seq.full
+ echo "*** push past the soft block limit" | tee -a $seqres.full
_file_as_id $SCRATCH_MNT/softie $id $type 1024 140
_qmount
xfs_quota -D $tmp.projects -P $tmp.projid -x \
@@ -152,7 +153,7 @@ _exercise()
echo
# Note: for quota accounting (not enforcement), EDQUOT is not expected
- echo "*** push past the hard inode limit (expect EDQUOT)" | tee -a $seq.full
+ echo "*** push past the hard inode limit (expect EDQUOT)" | tee -a $seqres.full
for i in 1 2 3 4 5 6 7 8 9 10 11 12
do
_file_as_id $SCRATCH_MNT/hard$i $id $type 1024 0
@@ -164,10 +165,10 @@ _exercise()
echo
# Note: for quota accounting (not enforcement), EDQUOT is not expected
- echo "*** push past the hard block limit (expect EDQUOT)" | tee -a $seq.full
+ echo "*** push past the hard block limit (expect EDQUOT)" | tee -a $seqres.full
_file_as_id $SCRATCH_MNT/softie $id $type 1024 540
- echo "ls -l $SCRATCH_MNT" >>$seq.full
- ls -l $SCRATCH_MNT >>$seq.full
+ echo "ls -l $SCRATCH_MNT" >>$seqres.full
+ ls -l $SCRATCH_MNT >>$seqres.full
_qmount
xfs_quota -D $tmp.projects -P $tmp.projid -x \
-c "repquota -birnN -$type" $SCRATCH_DEV |
diff --git a/tests/xfs/052 b/tests/xfs/052
index 01d5469..2abd78d 100755
--- a/tests/xfs/052
+++ b/tests/xfs/052
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -49,7 +50,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fs xfs
_supported_os IRIX Linux
-rm -f $seq.full
+rm -f $seqres.full
_require_scratch
_require_xfs_quota
@@ -59,8 +60,8 @@ _require_nobody
_qmount_option uquota
_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
-cat $tmp.mkfs >>$seq.full
-chmod a+w $seq.full # arbitrary users will write here
+cat $tmp.mkfs >>$seqres.full
+chmod a+w $seqres.full # arbitrary users will write here
# keep the blocksize from mkfs ($dbsize)
. $tmp.mkfs
@@ -94,7 +95,7 @@ xfs_quota -x \
# cross check blks, softblks, hardblks <-> quota, xfs_db
xfs_quota -c "quota -$type -birnN $id" $SCRATCH_DEV |
- tr -d '\n' | tr -s '[:space:]' | tee -a $seq.full |
+ tr -d '\n' | tr -s '[:space:]' | tee -a $seqres.full |
perl -ne 'if (m[^\s*'$SCRATCH_DEV'\s+(\d+)\s+(\d+)\s+(\d+)]) {
print "used_blocks=", $1, "\n";
print "soft_blocks=", $2, "\n";
@@ -102,14 +103,14 @@ xfs_quota -c "quota -$type -birnN $id" $SCRATCH_DEV |
$next = 0;
}' | LC_COLLATE=POSIX sort >$tmp.quota
-echo ===quota output >> $seq.full
-cat $tmp.quota >> $seq.full
+echo ===quota output >> $seqres.full
+cat $tmp.quota >> $seqres.full
[ ! -s $tmp.quota ] && echo "warning: quota output file is empty"
umount $SCRATCH_MNT
# note - does (insitu) conversion from fs blocks to 1K blocks
-xfs_db -rc "dquot -$type $id" -c p $SCRATCH_DEV | tee -a $seq.full | perl -ne '
+xfs_db -rc "dquot -$type $id" -c p $SCRATCH_DEV | tee -a $seqres.full | perl -ne '
if (/^diskdq.bcount = (\d+)$/) {
print "used_blocks=", $1 * '$dbsize' / 1024, "\n";
}
@@ -120,8 +121,8 @@ xfs_db -rc "dquot -$type $id" -c p $SCRATCH_DEV | tee -a $seq.full | perl -ne '
print "soft_blocks=", $1 * '$dbsize' / 1024, "\n";
}' | LC_COLLATE=POSIX sort >$tmp.xfs_db
-echo ===xfs_db output >> $seq.full
-cat $tmp.xfs_db >> $seq.full
+echo ===xfs_db output >> $seqres.full
+cat $tmp.xfs_db >> $seqres.full
[ ! -s $tmp.xfs_db ] && echo "warning: xfs_db output file is empty"
echo Comparing out of xfs_quota and xfs_db
diff --git a/tests/xfs/054 b/tests/xfs/054
index 1ce6180..97590e8 100755
--- a/tests/xfs/054
+++ b/tests/xfs/054
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -46,8 +47,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fs xfs
_supported_os Linux IRIX
-cp /dev/null $seq.full
-chmod ugo+rwx $seq.full
+cp /dev/null $seqres.full
+chmod ugo+rwx $seqres.full
_require_scratch
_require_xfs_quota
@@ -98,7 +99,7 @@ _exercise()
umount $SCRATCH_MNT 2>/dev/null
}
-_scratch_mkfs_xfs >> $seq.full 2>&1 || _fail "mkfs failed!"
+_scratch_mkfs_xfs >> $seqres.full 2>&1 || _fail "mkfs failed!"
_qmount_option "uquota,gquota"
_qmount
diff --git a/tests/xfs/055 b/tests/xfs/055
index 965b43a..1804727 100755
--- a/tests/xfs/055
+++ b/tests/xfs/055
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/056 b/tests/xfs/056
index be65bfb..8ab61f9 100755
--- a/tests/xfs/056
+++ b/tests/xfs/056
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/057 b/tests/xfs/057
index faa4776..fd856d7 100755
--- a/tests/xfs/057
+++ b/tests/xfs/057
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/058 b/tests/xfs/058
index dfce43b..c800286 100755
--- a/tests/xfs/058
+++ b/tests/xfs/058
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/059 b/tests/xfs/059
index a2a07c9..c26fa4d 100755
--- a/tests/xfs/059
+++ b/tests/xfs/059
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/060 b/tests/xfs/060
index f0d9870..6adce78 100755
--- a/tests/xfs/060
+++ b/tests/xfs/060
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/061 b/tests/xfs/061
index fa98085..e5a8413 100755
--- a/tests/xfs/061
+++ b/tests/xfs/061
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/063 b/tests/xfs/063
index cdaf524..a2ee188 100755
--- a/tests/xfs/063
+++ b/tests/xfs/063
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/064 b/tests/xfs/064
index c7e727c..9ba542e 100755
--- a/tests/xfs/064
+++ b/tests/xfs/064
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -66,14 +67,14 @@ while [ $i -le 9 ]; do
_stable_fs
sleep 2
- echo "********* level $i ***********" >>$seq.full
- date >>$seq.full
+ echo "********* level $i ***********" >>$seqres.full
+ date >>$seqres.full
find $SCRATCH_MNT -exec $here/src/lstat64 {} \; | sed 's/(00.*)//' >$tmp.dates.$i
if [ $i -gt 0 ]; then
let level_1=$i-1
- diff -c $tmp.dates.$level_1 $tmp.dates.$i >>$seq.full
+ diff -c $tmp.dates.$level_1 $tmp.dates.$i >>$seqres.full
else
- cat $tmp.dates.$i >>$seq.full
+ cat $tmp.dates.$i >>$seqres.full
fi
_do_dump_file -f $tmp.df.level$i -l $i
diff --git a/tests/xfs/065 b/tests/xfs/065
index 12f2ac9..ef1d10f 100755
--- a/tests/xfs/065
+++ b/tests/xfs/065
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/066 b/tests/xfs/066
index 7a68f79..8709a2b 100755
--- a/tests/xfs/066
+++ b/tests/xfs/066
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/067 b/tests/xfs/067
index baaed77..87b3cc9 100755
--- a/tests/xfs/067
+++ b/tests/xfs/067
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -46,14 +47,14 @@ _require_scratch
# set up fs for 1K inodes
isize=0
-_scratch_mkfs_xfs | _filter_mkfs >$seq.full 2>$tmp.mkfs
+_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs
[ $? -eq 0 ] && source $tmp.mkfs
if [ "$isize" -lt 1024 ]; then
- _scratch_mkfs_xfs -i size=1024 >>$here/$seq.full \
+ _scratch_mkfs_xfs -i size=1024 >>$here/$seqres.full \
|| _notrun "Cannot mkfs for this test using MKFS_OPTIONS specified"
fi
-_scratch_mount >>$here/$seq.full || _fail "mount failed"
-xfs_info $SCRATCH_MNT >>$here/$seq.full
+_scratch_mount >>$here/$seqres.full || _fail "mount failed"
+xfs_info $SCRATCH_MNT >>$here/$seqres.full
cd $SCRATCH_MNT
echo ""
diff --git a/tests/xfs/071 b/tests/xfs/071
index c135d1a..b22dd6d 100755
--- a/tests/xfs/071
+++ b/tests/xfs/071
@@ -22,8 +22,9 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
-rm -f $seq.full
+rm -f $seqres.full
here=`pwd`
tmp=/tmp/$$
@@ -81,19 +82,19 @@ write_block()
[ `$direct` ] && flags=-d
echo "Writing $bytes bytes, offset is $words (direct=$direct)" | _filter_io
- echo "Writing $bytes bytes at $location $words (direct=$direct)" >>$seq.full
+ echo "Writing $bytes bytes at $location $words (direct=$direct)" >>$seqres.full
$XFS_IO_PROG -c "pwrite $offset 512" $flags $SCRATCH_MNT/$seq \
- 2>&1 | _filter_off $offset | tee -a $seq.full | _filter_pwrite
- xfs_bmap -v $SCRATCH_MNT/$seq >>$seq.full
+ 2>&1 | _filter_off $offset | tee -a $seqres.full | _filter_pwrite
+ xfs_bmap -v $SCRATCH_MNT/$seq >>$seqres.full
echo "Reading $bytes bytes (direct=$direct)" | _filter_io
- echo "Reading $bytes bytes at $location (direct=$direct)" >>$seq.full
+ echo "Reading $bytes bytes at $location (direct=$direct)" >>$seqres.full
$XFS_IO_PROG -c "pread $offset $bytes" $flags $SCRATCH_MNT/$seq \
- 2>&1 | _filter_off $offset | tee -a $seq.full | _filter_pread
+ 2>&1 | _filter_off $offset | tee -a $seqres.full | _filter_pread
- $XFS_IO_PROG -c "pread -v $offset $bytes" $flags $SCRATCH_MNT/$seq >>$seq.full 2>&1
+ $XFS_IO_PROG -c "pread -v $offset $bytes" $flags $SCRATCH_MNT/$seq >>$seqres.full 2>&1
- echo | tee -a $seq.full
+ echo | tee -a $seqres.full
}
# real QA test starts here
diff --git a/tests/xfs/072 b/tests/xfs/072
index 930a983..d5bec3c 100755
--- a/tests/xfs/072
+++ b/tests/xfs/072
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
_cleanup()
@@ -49,7 +50,7 @@ _supported_os IRIX Linux
_require_scratch
-rm -f $seq.full
+rm -f $seqres.full
umount $SCRATCH_DEV >/dev/null 2>&1
_scratch_mkfs_xfs >/dev/null || _fail "mkfs failed"
diff --git a/tests/xfs/073 b/tests/xfs/073
index d19c8f5..336cb89 100755
--- a/tests/xfs/073
+++ b/tests/xfs/073
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/078 b/tests/xfs/078
index 901723e..df4fc6f 100755
--- a/tests/xfs/078
+++ b/tests/xfs/078
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/080 b/tests/xfs/080
index 3243fe1..fb5b6a6 100755
--- a/tests/xfs/080
+++ b/tests/xfs/080
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/081 b/tests/xfs/081
index f0ee819..44018bc 100755
--- a/tests/xfs/081
+++ b/tests/xfs/081
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -50,7 +51,7 @@ _cleanup()
trap "_cleanup; exit \$status" 0 1 2 3 15
# prelim
-rm -f $seq.full $tmp.*
+rm -f $seqres.full $tmp.*
_require_scratch
_require_xfs_quota
_require_v2log
diff --git a/tests/xfs/082 b/tests/xfs/082
index e21a793..652f362 100755
--- a/tests/xfs/082
+++ b/tests/xfs/082
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -48,7 +49,7 @@ _supported_fs xfs
_supported_os IRIX Linux
# prelim
-rm -f $seq.full $tmp.*
+rm -f $seqres.full $tmp.*
_require_scratch
_require_v2log
diff --git a/tests/xfs/084 b/tests/xfs/084
index ba5743a..46aa837 100755
--- a/tests/xfs/084
+++ b/tests/xfs/084
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/085 b/tests/xfs/085
index 44123ad..a02c42d 100755
--- a/tests/xfs/085
+++ b/tests/xfs/085
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -42,24 +43,24 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
_supported_fs xfs
_supported_os IRIX Linux
-rm -f $seq.full
+rm -f $seqres.full
rm -f $tmp.log
_require_scratch
echo "mkfs"
-_scratch_mkfs_xfs >>$seq.full 2>&1 \
+_scratch_mkfs_xfs >>$seqres.full 2>&1 \
|| _fail "mkfs scratch failed"
echo "mount"
-_scratch_mount >>$seq.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed: $MOUNT_OPTIONS"
echo "touch files"
touch $SCRATCH_MNT/{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}
echo "godown"
-src/godown -v -f $SCRATCH_MNT >> $seq.full
+src/godown -v -f $SCRATCH_MNT >> $seqres.full
echo "unmount"
umount $SCRATCH_MNT
@@ -75,7 +76,7 @@ if false; then
fi
echo "mount with replay"
-_scratch_mount $mnt >>$seq.full 2>&1 \
+_scratch_mount $mnt >>$seqres.full 2>&1 \
|| _fail "mount failed: $mnt $MOUNT_OPTIONS"
echo "ls SCRATCH_MNT"
diff --git a/tests/xfs/086 b/tests/xfs/086
index b59ad0a..2e2d4cf 100755
--- a/tests/xfs/086
+++ b/tests/xfs/086
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -41,7 +42,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
_supported_fs xfs
_supported_os IRIX Linux
-rm -f $seq.full $tmp.*
+rm -f $seqres.full $tmp.*
_require_scratch
_require_v2log
@@ -83,7 +84,7 @@ for s in sync nosync ; do
# mkfs the FS
_echofull "mkfs"
- _scratch_mkfs_xfs >>$seq.full 2>&1
+ _scratch_mkfs_xfs >>$seqres.full 2>&1
if [ $? -ne 0 ] ; then
_echofull "mkfs failed: $MKFS_OPTIONS"
continue
@@ -91,7 +92,7 @@ for s in sync nosync ; do
# mount the FS
_echofull "mount"
- if ! _scratch_mount >>$seq.full 2>&1; then
+ if ! _scratch_mount >>$seqres.full 2>&1; then
_echofull "mount failed: $MOUNT_OPTIONS"
continue
fi
@@ -116,17 +117,17 @@ for s in sync nosync ; do
ls $SCRATCH_MNT
_echofull "godown"
- src/godown -v -f $SCRATCH_MNT >> $seq.full
+ src/godown -v -f $SCRATCH_MNT >> $seqres.full
_echofull "unmount"
- umount $SCRATCH_DEV >>$seq.full 2>&1 \
+ umount $SCRATCH_DEV >>$seqres.full 2>&1 \
|| _fail "umount failed"
_echofull "logprint after going down..."
_print_logstate
_echofull "mount with replay"
- _scratch_mount >>$seq.full 2>&1 \
+ _scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed: $MOUNT_OPTIONS"
# check on what FS looks like after log recovery
diff --git a/tests/xfs/087 b/tests/xfs/087
index 30e117b..3e51fcb 100755
--- a/tests/xfs/087
+++ b/tests/xfs/087
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -45,7 +46,7 @@ _do_meta()
param="-p 4 -z -f rmdir=10 -f link=10 -f creat=10 -f mkdir=10 \
-f rename=30 -f stat=30 -f unlink=30 -f truncate=20"
_echofull "calling fsstress $param -m8 -n $count"
- if ! $FSSTRESS_PROG $param $FSSTRESS_AVOID -m 8 -n $count -d $out >>$seq.full 2>&1
+ if ! $FSSTRESS_PROG $param $FSSTRESS_AVOID -m 8 -n $count -d $out >>$seqres.full 2>&1
then
_echofull "fsstress failed"
fi
@@ -55,7 +56,7 @@ _do_meta()
_supported_fs xfs
_supported_os IRIX Linux
-rm -f $seq.full $tmp.*
+rm -f $seqres.full $tmp.*
_require_scratch
_require_v2log
_require_xfs_quota
@@ -90,7 +91,7 @@ do
# mkfs the FS
_echofull "mkfs"
- _scratch_mkfs_xfs >>$seq.full 2>&1
+ _scratch_mkfs_xfs >>$seqres.full 2>&1
if [ $? -ne 0 ] ; then
_echofull "mkfs failed: $MKFS_OPTIONS"
continue
@@ -98,7 +99,7 @@ do
# mount the FS
_echofull "mount"
- if ! _scratch_mount -o uquota >>$seq.full 2>&1; then
+ if ! _scratch_mount -o uquota >>$seqres.full 2>&1; then
_echofull "mount failed: $MOUNT_OPTIONS"
continue
fi
@@ -111,20 +112,20 @@ do
ls -RF $SCRATCH_MNT >$tmp.ls1
_echofull "godown"
- src/godown -v -f $SCRATCH_MNT >> $seq.full
+ src/godown -v -f $SCRATCH_MNT >> $seqres.full
_echofull "unmount"
- umount $SCRATCH_DEV >>$seq.full 2>&1 \
+ umount $SCRATCH_DEV >>$seqres.full 2>&1 \
|| _fail "umount failed"
_echofull "logprint after going down..."
_print_logstate
_full "logprint headers"
- _scratch_xfs_logprint -n >>$seq.full 2>&1
+ _scratch_xfs_logprint -n >>$seqres.full 2>&1
_echofull "mount with replay"
- _scratch_mount -o uquota >>$seq.full 2>&1 \
+ _scratch_mount -o uquota >>$seqres.full 2>&1 \
|| _fail "mount failed: $MOUNT_OPTIONS"
# check on what FS looks like after log recovery
diff --git a/tests/xfs/090 b/tests/xfs/090
index 8ce50c0..8477329 100755
--- a/tests/xfs/090
+++ b/tests/xfs/090
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/092 b/tests/xfs/092
index 2f849f3..e65fe27 100755
--- a/tests/xfs/092
+++ b/tests/xfs/092
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/094 b/tests/xfs/094
index 4f4cf34..6aa2d74 100755
--- a/tests/xfs/094
+++ b/tests/xfs/094
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/095 b/tests/xfs/095
index 9de4476..9a74d5f 100755
--- a/tests/xfs/095
+++ b/tests/xfs/095
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/096 b/tests/xfs/096
index ecadd73..0fef425 100755
--- a/tests/xfs/096
+++ b/tests/xfs/096
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -63,7 +64,7 @@ _cleanup()
#
_mkfs_filter()
{
- tee -a $seq.full | \
+ tee -a $seqres.full | \
sed \
-e 's/extsz=[0-9][0-9]*[ ]*/extsz=N, /' \
-e 's/blocks=[0-9][0-9]*/blocks=N/' \
@@ -88,7 +89,7 @@ _mkfs_filter()
}
# real QA test starts here
-rm -f $seq.full
+rm -f $seqres.full
# Modify as appropriate.
_supported_fs xfs
diff --git a/tests/xfs/103 b/tests/xfs/103
index 9750153..753b14d 100755
--- a/tests/xfs/103
+++ b/tests/xfs/103
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/104 b/tests/xfs/104
index 4e61837..0968daa 100755
--- a/tests/xfs/104
+++ b/tests/xfs/104
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -37,7 +38,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
_create_scratch()
{
echo "*** mkfs"
- _scratch_mkfs_xfs $@ | tee -a $seq.full | _filter_mkfs 2>$tmp.mkfs
+ _scratch_mkfs_xfs $@ | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs
. $tmp.mkfs
echo "*** mount"
@@ -68,7 +69,7 @@ _stress_scratch()
# real QA test starts here
_supported_fs xfs
_require_scratch
-_scratch_mkfs_xfs | tee -a $seq.full | _filter_mkfs 2>$tmp.mkfs
+_scratch_mkfs_xfs | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs
. $tmp.mkfs # extract blocksize and data size for scratch device
endsize=`expr 550 \* 1048576` # stop after growing this big
@@ -93,19 +94,19 @@ _fill_scratch $fillsize
#
while [ $size -le $endsize ]; do
echo "*** stressing a ${size} byte filesystem"
- echo "*** stressing a ${sizeb} block filesystem" >> $seq.full
+ echo "*** stressing a ${sizeb} block filesystem" >> $seqres.full
_stress_scratch
sleep 1
size=`expr $size + $incsize`
sizeb=`expr $size / $dbsize` # in data blocks
echo "*** growing to a ${size} byte filesystem"
- echo "*** growing to a ${sizeb} block filesystem" >> $seq.full
+ echo "*** growing to a ${sizeb} block filesystem" >> $seqres.full
xfs_growfs -D ${sizeb} $SCRATCH_MNT \
- | tee -a $seq.full | _filter_mkfs 2>$tmp.growfs
+ | tee -a $seqres.full | _filter_mkfs 2>$tmp.growfs
. $tmp.growfs
[ `expr $size % $modsize` -eq 0 ] && wait # every 4th iteration
- echo AGCOUNT=$agcount | tee -a $seq.full
- echo && echo >> $seq.full
+ echo AGCOUNT=$agcount | tee -a $seqres.full
+ echo && echo >> $seqres.full
done
wait # stop for any remaining stress processes
diff --git a/tests/xfs/106 b/tests/xfs/106
index 613b12c..667115d 100755
--- a/tests/xfs/106
+++ b/tests/xfs/106
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -44,7 +45,7 @@ _require_xfs_quota
# real QA test starts here
_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
-cat $tmp.mkfs >$seq.full
+cat $tmp.mkfs >$seqres.full
. $tmp.mkfs
# setup a default run
@@ -86,7 +87,7 @@ s/Inode: \#\d+ \(\d+ blocks, \d+ extents\)/Inode: #[INO] (X blocks, Y extents)/;
test_quot()
{
echo "checking quot command (type=$type)" # not deterministic on blks
- xfs_quota -x -c "quot -n -$type" $SCRATCH_MNT >>$seq.full 2>&1
+ xfs_quota -x -c "quot -n -$type" $SCRATCH_MNT >>$seqres.full 2>&1
}
test_report()
diff --git a/tests/xfs/107 b/tests/xfs/107
index e887384..7124dc2 100755
--- a/tests/xfs/107
+++ b/tests/xfs/107
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -56,7 +57,7 @@ _require_xfs_quota
# real QA test starts here
_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
-cat $tmp.mkfs >$seq.full
+cat $tmp.mkfs >$seqres.full
. $tmp.mkfs
# setup a default run
@@ -72,7 +73,7 @@ _require_prjquota $SCRATCH_DEV
echo "### create projects file"
rm -f $tmp.projects
target=$SCRATCH_MNT/project
-echo "6:$target" | tee -a $seq.full > $tmp.projects
+echo "6:$target" | tee -a $seqres.full > $tmp.projects
echo "### populate filesystem"
mkdir $target || exit
diff --git a/tests/xfs/108 b/tests/xfs/108
index 6b656e6..809659d 100755
--- a/tests/xfs/108
+++ b/tests/xfs/108
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -57,15 +58,15 @@ test_files()
test_accounting()
{
echo "### some controlled buffered, direct and mmapd IO (type=$type)"
- echo "--- initiating parallel IO..." >>$seq.full
+ echo "--- initiating parallel IO..." >>$seqres.full
$XFS_IO_PROG -c 'pwrite -b 1m 0 16m' -c 'fsync' \
- $SCRATCH_MNT/buffer >>$seq.full 2>&1 &
+ $SCRATCH_MNT/buffer >>$seqres.full 2>&1 &
$XFS_IO_PROG -c 'pwrite -b 1m 0 16m' -d \
- $SCRATCH_MNT/direct >>$seq.full 2>&1 &
+ $SCRATCH_MNT/direct >>$seqres.full 2>&1 &
$XFS_IO_PROG -c 't 16m' -c 'mm -rw 0 16m' -c 'mw 0 16m' -c 'ms -s' \
- $SCRATCH_MNT/mmap >>$seq.full 2>&1 &
+ $SCRATCH_MNT/mmap >>$seqres.full 2>&1 &
wait
- echo "--- completed parallel IO ($type)" >>$seq.full
+ echo "--- completed parallel IO ($type)" >>$seqres.full
for file in $SCRATCH_MNT/{buffer,direct,mmap}; do
$here/src/lstat64 $file | head -3 | _filter_scratch
@@ -80,10 +81,10 @@ _qmount
_require_prjquota $SCRATCH_DEV
# real QA test starts here
-rm -f $tmp.projects $seq.full
+rm -f $tmp.projects $seqres.full
umount $SCRATCH_DEV 2>/dev/null
_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
-cat $tmp.mkfs >>$seq.full
+cat $tmp.mkfs >>$seqres.full
_scratch_mount
uid=1
diff --git a/tests/xfs/109 b/tests/xfs/109
index 56364f4..2e36d0f 100755
--- a/tests/xfs/109
+++ b/tests/xfs/109
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -102,7 +103,7 @@ fi
umount $SCRATCH_DEV
_scratch_mkfs_xfs -dsize=160m,agcount=4 $faststart | _filter_mkfs 2>$tmp.mkfs
-cat $tmp.mkfs >>$seq.full
+cat $tmp.mkfs >>$seqres.full
_scratch_mount
populate
diff --git a/tests/xfs/110 b/tests/xfs/110
index 8749afa..a2790c8 100755
--- a/tests/xfs/110
+++ b/tests/xfs/110
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/111 b/tests/xfs/111
index 8f4c142..af7cd65 100755
--- a/tests/xfs/111
+++ b/tests/xfs/111
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/114 b/tests/xfs/114
index fa64093..5228eca 100755
--- a/tests/xfs/114
+++ b/tests/xfs/114
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -79,8 +80,8 @@ _test_create()
p=dir2/dir3/dir4/file4
touch $p
- #_print_names $p >>$here/$seq.full
- _print_names $p | tee -a $here/$seq.full
+ #_print_names $p >>$here/$seqres.full
+ _print_names $p | tee -a $here/$seqres.full
_check_paths $SCRATCH_MNT/$p
}
@@ -130,13 +131,13 @@ _test_hardlink()
ln $p $x
done
- _print_names $p >>$here/$seq.full
+ _print_names $p >>$here/$seqres.full
echo ""
echo "print out names and check after created hardlinks"
echo ""
for x in $paths; do
- _print_names $x | tee -a $here/$seq.full
+ _print_names $x | tee -a $here/$seqres.full
_check_paths $SCRATCH_MNT/$x
done
@@ -160,7 +161,7 @@ _test_hardlink()
echo ""
for x in $paths; do
if [ -e $x ]; then
- _print_names $x | tee -a $here/$seq.full
+ _print_names $x | tee -a $here/$seqres.full
_check_paths $SCRATCH_MNT/$x
fi
done
@@ -229,7 +230,7 @@ _test_rename()
_filter_num()
{
- tee -a $here/$seq.full |\
+ tee -a $here/$seqres.full |\
sed -e 's/[0-9][0-9]* inodes/I inodes/g' \
-e 's/[0-9][0-9]* paths/P paths/g' \
-e 's/seed = [0-9][0-9]*/seed = S/'
@@ -254,7 +255,7 @@ _test_fsstress()
if ! $FSSTRESS_PROG $args | _filter_num
then
echo " fsstress $args returned $?"
- cat $tmp.out | tee -a $here/$seq.full
+ cat $tmp.out | tee -a $here/$seqres.full
status=1
fi
@@ -283,8 +284,8 @@ _test_dirstress()
if ! $here/src/dirstress $args >$tmp.out 2>&1 | _filter_num
then
echo " dirstress failed"
- echo "*** dirstress $args" | tee -a $here/$seq.full
- cat $tmp.out >>$here/$seq.full
+ echo "*** dirstress $args" | tee -a $here/$seqres.full
+ cat $tmp.out >>$here/$seqres.full
status=1
exit
fi
@@ -294,8 +295,8 @@ _test_dirstress()
if ! $here/src/dirstress $args >$tmp.out 2>&1 | _filter_num
then
echo " dirstress failed"
- echo "*** dirstress $args" | tee -a $here/$seq.full
- cat $tmp.out >>$here/$seq.full
+ echo "*** dirstress $args" | tee -a $here/$seqres.full
+ cat $tmp.out >>$here/$seqres.full
status=1
exit
fi
@@ -315,16 +316,16 @@ _require_scratch
_require_attrs
_need_to_be_root
-rm -f $here/$seq.full
+rm -f $here/$seqres.full
echo "mkfs"
-_scratch_mkfs_xfs >>$here/$seq.full 2>&1 \
+_scratch_mkfs_xfs >>$here/$seqres.full 2>&1 \
|| _fail "mkfs scratch failed"
-_scratch_mkfs_xfs -i parent=1 >>$here/$seq.full 2>&1 \
+_scratch_mkfs_xfs -i parent=1 >>$here/$seqres.full 2>&1 \
|| _notrun "parent inodes not supported"
echo "mount"
-_scratch_mount >>$here/$seq.full 2>&1 \
+_scratch_mount >>$here/$seqres.full 2>&1 \
|| _fail "mount failed: $MOUNT_OPTIONS"
# real QA test starts here
diff --git a/tests/xfs/115 b/tests/xfs/115
index ebcc995..aa281d6 100755
--- a/tests/xfs/115
+++ b/tests/xfs/115
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -101,16 +102,16 @@ _supported_os IRIX
_require_scratch
_require_attrs
-rm -f $here/$seq.full
+rm -f $here/$seqres.full
echo "mkfs"
-_scratch_mkfs_xfs >>$here/$seq.full 2>&1 \
+_scratch_mkfs_xfs >>$here/$seqres.full 2>&1 \
|| _fail "mkfs scratch failed"
-_scratch_mkfs_xfs -i paths=1 >>$here/$seq.full 2>&1 \
+_scratch_mkfs_xfs -i paths=1 >>$here/$seqres.full 2>&1 \
|| _notrun "i_paths not supported"
echo "mount"
-_scratch_mount >>$here/$seq.full 2>&1 \
+_scratch_mount >>$here/$seqres.full 2>&1 \
|| _fail "mount failed: $MOUNT_OPTIONS"
# real QA test starts here
@@ -251,7 +252,7 @@ _do_test()
xfs_repair_ipaths -n $SCRATCH_MNT
}
-_do_test 2>&1 | tee $seq.full | _filter_inodes
+_do_test 2>&1 | tee $seqres.full | _filter_inodes
# success, all done
status=0
diff --git a/tests/xfs/116 b/tests/xfs/116
index 2c3ab92..4554d20 100755
--- a/tests/xfs/116
+++ b/tests/xfs/116
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/118 b/tests/xfs/118
index d140a8b..e4ce711 100755
--- a/tests/xfs/118
+++ b/tests/xfs/118
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -72,7 +73,7 @@ _chowning_file()
echo "mkfs on scratch"
-_scratch_mkfs_xfs >$seq.full
+_scratch_mkfs_xfs >$seqres.full
echo "mount with quotas"
export MOUNT_OPTIONS="-o uquota"
diff --git a/tests/xfs/119 b/tests/xfs/119
index 85af211..066ddbd 100755
--- a/tests/xfs/119
+++ b/tests/xfs/119
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/121 b/tests/xfs/121
index a590bb0..f6dc83a 100755
--- a/tests/xfs/121
+++ b/tests/xfs/121
@@ -27,6 +27,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -43,17 +44,17 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
_supported_fs xfs
_supported_os IRIX Linux
-rm -f $seq.full
+rm -f $seqres.full
rm -f $tmp.log
_require_scratch
echo "mkfs"
-_scratch_mkfs_xfs >>$seq.full 2>&1 \
+_scratch_mkfs_xfs >>$seqres.full 2>&1 \
|| _fail "mkfs scratch failed"
echo "mount"
-_scratch_mount >>$seq.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed: $MOUNT_OPTIONS"
# num_files must be greater than 64 (XFS_AGI_UNLINKED_BUCKETS)
@@ -68,7 +69,7 @@ src/multi_open_unlink -f $SCRATCH_MNT/test_file -n $num_files -s $delay &
sleep 3
echo "godown"
-src/godown -v -f $SCRATCH_MNT >> $seq.full
+src/godown -v -f $SCRATCH_MNT >> $seqres.full
# time for multi_open_unlink to exit out after its delay
# so we have no references and can unmount
@@ -81,11 +82,11 @@ echo "logprint after going down..."
_print_logstate
echo "mount with replay"
-_scratch_mount $mnt >>$seq.full 2>&1 \
+_scratch_mount $mnt >>$seqres.full 2>&1 \
|| _fail "mount failed: $mnt $MOUNT_OPTIONS"
echo "godown"
-src/godown -v -f $SCRATCH_MNT >> $seq.full
+src/godown -v -f $SCRATCH_MNT >> $seqres.full
echo "unmount"
umount $SCRATCH_MNT
@@ -94,7 +95,7 @@ echo "logprint after going down..."
_print_logstate
echo "logprint to check for CLEAR_AGI_BUCKET..."
-if _scratch_xfs_logprint -t | tee -a $seq.full | grep CLEAR; then
+if _scratch_xfs_logprint -t | tee -a $seqres.full | grep CLEAR; then
echo 'CLEAR_AGI_BUCKET transactions found!!'
echo 'Are you running with an old xfs kernel - where the bug still exists?'
else
@@ -102,7 +103,7 @@ else
fi
# clean up dirty log with log recovery on mount
-_scratch_mount >> $seq.full 2>&1 \
+_scratch_mount >> $seqres.full 2>&1 \
|| _fail "mount failed"
# should now be peaches
diff --git a/tests/xfs/122 b/tests/xfs/122
index 1c4f3a4..2a81728 100755
--- a/tests/xfs/122
+++ b/tests/xfs/122
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -176,7 +177,7 @@ echo 'int main(int argc, char *argv[]) {' >>$cprog
#
cat /usr/include/xfs/xfs*.h | indent |\
_attribute_filter |\
-tee $seq.full |\
+tee $seqres.full |\
egrep '} *xfs_.*_t' |\
egrep -v -f $tmp.ignore |\
awk '{sub(/[;,]/,"",$2); print "printf(\"sizeof(", $2, ") = %d\\n\", sizeof(", $2, "));"}' \
@@ -198,8 +199,8 @@ awk '
echo 'return 0; }' >>$cprog
# create and run program
-cc -o $oprog $cprog >> $seq.full 2>&1 || \
- _notrun "Could not compile test program (see end of $seq.full)"
+cc -o $oprog $cprog >> $seqres.full 2>&1 || \
+ _notrun "Could not compile test program (see end of $seqres.full)"
$oprog | _type_size_filter | _type_name_filter > $progout
#
diff --git a/tests/xfs/134 b/tests/xfs/134
index 2117b4a..f38fc6e 100755
--- a/tests/xfs/134
+++ b/tests/xfs/134
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -60,8 +61,8 @@ cat >$tmp.projid <<EOF
test:1
EOF
-cp /dev/null $seq.full
-chmod a+rwx $seq.full # arbitrary users will write here
+cp /dev/null $seqres.full
+chmod a+rwx $seqres.full # arbitrary users will write here
_require_scratch
_scratch_mkfs_xfs >/dev/null 2>&1
diff --git a/tests/xfs/136 b/tests/xfs/136
index 6479c8c..ec3f71a 100755
--- a/tests/xfs/136
+++ b/tests/xfs/136
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/137 b/tests/xfs/137
index 0f65d08..5c0fc51 100755
--- a/tests/xfs/137
+++ b/tests/xfs/137
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/138 b/tests/xfs/138
index f8af8dd..a0aeb82 100755
--- a/tests/xfs/138
+++ b/tests/xfs/138
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/139 b/tests/xfs/139
index 7d2e409..9de1fca 100755
--- a/tests/xfs/139
+++ b/tests/xfs/139
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/140 b/tests/xfs/140
index a8cbd09..8564b28 100755
--- a/tests/xfs/140
+++ b/tests/xfs/140
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/142 b/tests/xfs/142
index 526167d..e09ae3f 100755
--- a/tests/xfs/142
+++ b/tests/xfs/142
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/143 b/tests/xfs/143
index 63281f9..686be64 100755
--- a/tests/xfs/143
+++ b/tests/xfs/143
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/144 b/tests/xfs/144
index 52123cc..cf5eca7 100755
--- a/tests/xfs/144
+++ b/tests/xfs/144
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/145 b/tests/xfs/145
index 54b8198..2a4b2f6 100755
--- a/tests/xfs/145
+++ b/tests/xfs/145
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/146 b/tests/xfs/146
index bb4975c..2091db1 100755
--- a/tests/xfs/146
+++ b/tests/xfs/146
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/147 b/tests/xfs/147
index e366dc7..c65dde9 100755
--- a/tests/xfs/147
+++ b/tests/xfs/147
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/148 b/tests/xfs/148
index abc516a..49892ab 100755
--- a/tests/xfs/148
+++ b/tests/xfs/148
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/149 b/tests/xfs/149
index b1793b7..d345f4a 100755
--- a/tests/xfs/149
+++ b/tests/xfs/149
@@ -24,13 +24,14 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
status=1 # failure is the default!
trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
-rm -f $seq.full
+rm -f $seqres.full
# get standard environment, filters and checks
. ./common.rc
@@ -44,15 +45,15 @@ export XFS_REPAIR_PROG=$XFS_PARALLEL_REPAIR_PROG
_check_repair()
{
- echo "Repairing, round 0" >> $seq.full
- _scratch_xfs_repair 2>&1 | _filter_repair | tee -a $seq.full >$tmp.0
+ echo "Repairing, round 0" >> $seqres.full
+ _scratch_xfs_repair 2>&1 | _filter_repair | tee -a $seqres.full >$tmp.0
for i in 1 2 3 4
do
- echo "Repairing, iteration $i" | tee -a $seq.full
+ echo "Repairing, iteration $i" | tee -a $seqres.full
_scratch_xfs_repair 2>&1 | _filter_repair >$tmp.$i
- diff $tmp.0 $tmp.$i >> $seq.full
+ diff $tmp.0 $tmp.$i >> $seqres.full
if [ $? -ne 0 ]; then
- echo "ERROR: repair round $i differs to round 0 (see $seq.full)" | tee -a $seq.full
+ echo "ERROR: repair round $i differs to round 0 (see $seqres.full)" | tee -a $seqres.full
break
fi
# echo all interesting stuff...
diff --git a/tests/xfs/150 b/tests/xfs/150
index b6a04c5..529b6b4 100755
--- a/tests/xfs/150
+++ b/tests/xfs/150
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/151 b/tests/xfs/151
index 4bfaff3..9de8ab4 100755
--- a/tests/xfs/151
+++ b/tests/xfs/151
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -55,7 +56,7 @@ _check_sids()
| perl -ne "if (/^sids.*[\"|\s]($i)[\"|\s].*/) {print \$1} ;"`
if [ -z "$CHECKED_SID" ] ; then
echo "ERROR: SID(s) not created"
- ${DMAPI_QASUITE1_DIR}../simple/dm_getall_sessions >>$seq.full
+ ${DMAPI_QASUITE1_DIR}../simple/dm_getall_sessions >>$seqres.full
return
fi
done
diff --git a/tests/xfs/152 b/tests/xfs/152
index 2317291..4b9d471 100755
--- a/tests/xfs/152
+++ b/tests/xfs/152
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/153 b/tests/xfs/153
index 81be175..86df036 100755
--- a/tests/xfs/153
+++ b/tests/xfs/153
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/154 b/tests/xfs/154
index 62e79c2..528ec9c 100755
--- a/tests/xfs/154
+++ b/tests/xfs/154
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/155 b/tests/xfs/155
index 949bd98..1c4ea6c 100755
--- a/tests/xfs/155
+++ b/tests/xfs/155
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/156 b/tests/xfs/156
index 549cac8..0a73b6b 100755
--- a/tests/xfs/156
+++ b/tests/xfs/156
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -48,8 +49,8 @@ _require_scratch
_scratch_mkfs_xfs >/dev/null 2>&1
_dmapi_scratch_mount
-${DMAPI_QASUITE1_DIR}cmd/get_dirattrs $SCRATCH_MNT > $seq.full
-[ $? -ne 0 ] && echo "get_dirattrs failed - see $seq.full"
+${DMAPI_QASUITE1_DIR}cmd/get_dirattrs $SCRATCH_MNT > $seqres.full
+[ $? -ne 0 ] && echo "get_dirattrs failed - see $seqres.full"
status=0
exit
diff --git a/tests/xfs/157 b/tests/xfs/157
index 9ae3c40..91819ef 100755
--- a/tests/xfs/157
+++ b/tests/xfs/157
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/158 b/tests/xfs/158
index e740654..ef8d4d1 100755
--- a/tests/xfs/158
+++ b/tests/xfs/158
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/159 b/tests/xfs/159
index bfc225d..8f80482 100755
--- a/tests/xfs/159
+++ b/tests/xfs/159
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/160 b/tests/xfs/160
index 3900299..2323697 100755
--- a/tests/xfs/160
+++ b/tests/xfs/160
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/161 b/tests/xfs/161
index c419380..45210c7 100755
--- a/tests/xfs/161
+++ b/tests/xfs/161
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/162 b/tests/xfs/162
index acd70e0..67aec9a 100755
--- a/tests/xfs/162
+++ b/tests/xfs/162
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/163 b/tests/xfs/163
index d4eef64..434f100 100755
--- a/tests/xfs/163
+++ b/tests/xfs/163
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/164 b/tests/xfs/164
index 1ef4aaf..8af0b0d 100755
--- a/tests/xfs/164
+++ b/tests/xfs/164
@@ -29,6 +29,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -44,7 +45,7 @@ _cleanup()
_filter_io()
{
- tee -a $seq.full | sed 's/ops;.*/ops/'
+ tee -a $seqres.full | sed 's/ops;.*/ops/'
}
#
@@ -55,7 +56,7 @@ _filter_bmap()
{
awk '$3 ~ /hole/ { print $1, $2, $3; next }
$7 ~ /10000/ { print $1, $2, "unwritten"; next }
- {print $1, $2}' >> $seq.full
+ {print $1, $2}' >> $seqres.full
}
diff --git a/tests/xfs/165 b/tests/xfs/165
index 3b321b9..72376f3 100755
--- a/tests/xfs/165
+++ b/tests/xfs/165
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -41,7 +42,7 @@ _cleanup()
_filter_io()
{
- tee -a $seq.full | _filter_xfs_io
+ tee -a $seqres.full | _filter_xfs_io
}
#
@@ -52,7 +53,7 @@ _filter_io()
_filter_bmap()
{
awk '$3 ~ /hole/ { print $1, $2, $3; next }
- {print $1, $2}' >> $seq.full
+ {print $1, $2}' >> $seqres.full
}
# get standard environment, filters and checks
@@ -68,7 +69,7 @@ _supported_os IRIX Linux
# io tests
testfile=$TEST_DIR/file.$seq
rm -f $testfile
-rm -f $seq.full
+rm -f $seqres.full
len=4
end=`expr 10 \* $len`
diff --git a/tests/xfs/166 b/tests/xfs/166
index 527686f..3170fa6 100755
--- a/tests/xfs/166
+++ b/tests/xfs/166
@@ -23,13 +23,14 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
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
-rm -f $seq.full
+rm -f $seqres.full
_cleanup()
{
@@ -91,7 +92,7 @@ FILE_SIZE=1048576
rm -f $TEST_FILE
$TEST_PROG $FILE_SIZE $TEST_FILE
-xfs_bmap -vp $TEST_FILE >> $seq.full
+xfs_bmap -vp $TEST_FILE >> $seqres.full
xfs_bmap -vp $TEST_FILE | _filter_blocks
status=0
diff --git a/tests/xfs/167 b/tests/xfs/167
index c2e15e8..84bbe09 100755
--- a/tests/xfs/167
+++ b/tests/xfs/167
@@ -23,11 +23,12 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
-rm -f $seq.full
+rm -f $seqres.full
status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -43,7 +44,7 @@ workout()
procs=100
nops=15000
$FSSTRESS_PROG -d $SCRATCH_MNT -p $procs -n $nops $FSSTRESS_AVOID \
- >>$seq.full &
+ >>$seqres.full &
sleep 2
}
diff --git a/tests/xfs/168 b/tests/xfs/168
index 8980f9b..67f1e19 100755
--- a/tests/xfs/168
+++ b/tests/xfs/168
@@ -24,11 +24,12 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
-rm -f $seq.full
+rm -f $seqres.full
status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -106,7 +107,7 @@ wait
# dmapi destroy events are asyncronous, don't rely on fixed ordering of events
# in print_event output, use sort.
echo "# here comes the dmapi print_event filtered and sorted output"
-cat $tmp.print_event_out | tee -a $here/$seq.full | _filter_dmapi_print_event | LC_COLLATE=POSIX sort
+cat $tmp.print_event_out | tee -a $here/$seqres.full | _filter_dmapi_print_event | LC_COLLATE=POSIX sort
rm $tmp.print_event_out
status=0
diff --git a/tests/xfs/170 b/tests/xfs/170
index b725d3a..f470946 100755
--- a/tests/xfs/170
+++ b/tests/xfs/170
@@ -25,11 +25,12 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
-rm -f $seq.full
+rm -f $seqres.full
status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/xfs/171 b/tests/xfs/171
index 4f77a41..af7a216 100755
--- a/tests/xfs/171
+++ b/tests/xfs/171
@@ -24,11 +24,12 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
-rm -f $seq.full
+rm -f $seqres.full
status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/xfs/172 b/tests/xfs/172
index b6b496c..50eda81 100755
--- a/tests/xfs/172
+++ b/tests/xfs/172
@@ -24,11 +24,12 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
-rm -f $seq.full
+rm -f $seqres.full
status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/xfs/173 b/tests/xfs/173
index 7146d2f..6761a8a 100755
--- a/tests/xfs/173
+++ b/tests/xfs/173
@@ -24,11 +24,12 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
-rm -f $seq.full
+rm -f $seqres.full
status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/xfs/174 b/tests/xfs/174
index 7745a6a..ffb6754 100755
--- a/tests/xfs/174
+++ b/tests/xfs/174
@@ -24,11 +24,12 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
-rm -f $seq.full
+rm -f $seqres.full
status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/xfs/175 b/tests/xfs/175
index 4fc3ffb..4753f21 100755
--- a/tests/xfs/175
+++ b/tests/xfs/175
@@ -26,11 +26,12 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
-rm -f $seq.full
+rm -f $seqres.full
status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/xfs/176 b/tests/xfs/176
index 93083c4..3fe9f04 100755
--- a/tests/xfs/176
+++ b/tests/xfs/176
@@ -23,11 +23,12 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
-rm -f $seq.full
+rm -f $seqres.full
status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/xfs/177 b/tests/xfs/177
index ec8aca7..49ca282 100755
--- a/tests/xfs/177
+++ b/tests/xfs/177
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/178 b/tests/xfs/178
index 8856656..084aeb9 100755
--- a/tests/xfs/178
+++ b/tests/xfs/178
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/179 b/tests/xfs/179
index f3facca..451d7cc 100755
--- a/tests/xfs/179
+++ b/tests/xfs/179
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/180 b/tests/xfs/180
index 0f82306..15e0221 100755
--- a/tests/xfs/180
+++ b/tests/xfs/180
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/181 b/tests/xfs/181
index fb65100..35e808f 100755
--- a/tests/xfs/181
+++ b/tests/xfs/181
@@ -27,6 +27,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
_cleanup()
@@ -50,17 +51,17 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fs xfs
_supported_os IRIX Linux
-rm -f $seq.full
+rm -f $seqres.full
rm -f $tmp.log
_require_scratch
echo "mkfs"
-_scratch_mkfs_xfs >>$seq.full 2>&1 \
+_scratch_mkfs_xfs >>$seqres.full 2>&1 \
|| _fail "mkfs scratch failed"
echo "mount"
-_scratch_mount >>$seq.full 2>&1 \
+_scratch_mount >>$seqres.full 2>&1 \
|| _fail "mount failed: $MOUNT_OPTIONS"
# num_files must be greater than 64 (XFS_AGI_UNLINKED_BUCKETS)
@@ -81,7 +82,7 @@ pid=$!
sleep 10
echo "godown"
-src/godown -v -f $SCRATCH_MNT >> $seq.full
+src/godown -v -f $SCRATCH_MNT >> $seqres.full
# kill the multi_open_unlink
kill $pid 2>/dev/null
@@ -95,11 +96,11 @@ echo "logprint after going down..."
_print_logstate
echo "mount with replay"
-_scratch_mount $mnt >>$seq.full 2>&1 \
+_scratch_mount $mnt >>$seqres.full 2>&1 \
|| _fail "mount failed: $mnt $MOUNT_OPTIONS"
echo "godown"
-src/godown -v -f $SCRATCH_MNT >> $seq.full
+src/godown -v -f $SCRATCH_MNT >> $seqres.full
echo "unmount"
umount $SCRATCH_MNT
@@ -108,7 +109,7 @@ echo "logprint after going down..."
_print_logstate
echo "logprint to check for CLEAR_AGI_BUCKET..."
-if _scratch_xfs_logprint -t | tee -a $seq.full | grep CLEAR; then
+if _scratch_xfs_logprint -t | tee -a $seqres.full | grep CLEAR; then
echo 'CLEAR_AGI_BUCKET transactions found!!'
echo 'Are you running with an old xfs kernel - where the bug still exists?'
else
@@ -116,7 +117,7 @@ else
fi
# clean up dirty log with log recovery on mount
-_scratch_mount >> $seq.full 2>&1 \
+_scratch_mount >> $seqres.full 2>&1 \
|| _fail "mount failed"
# should now be peaches
diff --git a/tests/xfs/182 b/tests/xfs/182
index 33e8010..7495eb1 100755
--- a/tests/xfs/182
+++ b/tests/xfs/182
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/183 b/tests/xfs/183
index 4624ab4..5a7587f 100755
--- a/tests/xfs/183
+++ b/tests/xfs/183
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/185 b/tests/xfs/185
index 928eb24..f00858b 100755
--- a/tests/xfs/185
+++ b/tests/xfs/185
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/186 b/tests/xfs/186
index 2c66026..46cd087 100755
--- a/tests/xfs/186
+++ b/tests/xfs/186
@@ -34,6 +34,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -77,7 +78,7 @@ _rmv_eas()
_filter_inode()
{
- tee -a $here/$seq.full | \
+ tee -a $here/$seqres.full | \
sed -e "s/core.forkoff/forkoff/g" | \
egrep '^u.sfdir2|^a.sfattr|forkoff' | \
egrep -v 'inumber|parent'
@@ -85,7 +86,7 @@ _filter_inode()
_filter_version()
{
- tee -a $here/$seq.full | tr ',' '\n' | grep ATTR
+ tee -a $here/$seqres.full | tr ',' '\n' | grep ATTR
}
_print_inode()
@@ -148,7 +149,7 @@ _supported_os Linux
_require_scratch
_require_attrs
-rm -f $seq.full
+rm -f $seqres.full
_scratch_mkfs -i attr=2,size=512 -l lazy-count=1 >/dev/null 2>&1
diff --git a/tests/xfs/187 b/tests/xfs/187
index bff0caa..c414017 100755
--- a/tests/xfs/187
+++ b/tests/xfs/187
@@ -28,6 +28,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -43,7 +44,7 @@ _cleanup()
_filter_version()
{
- tee -a $seq.full | tr ',' '\n' | egrep 'ATTR|MORE|LAZY'
+ tee -a $seqres.full | tr ',' '\n' | egrep 'ATTR|MORE|LAZY'
}
# get standard environment, filters and checks
@@ -58,7 +59,7 @@ _supported_os Linux
_require_scratch
_require_attrs
-rm -f $seq.full
+rm -f $seqres.full
# lazysb and attr2 are in features2 and will require morebitsbit on
# So test with lazysb and without it to see if the morebitsbit is
diff --git a/tests/xfs/188 b/tests/xfs/188
index 4ebbfc1..a8fe431 100755
--- a/tests/xfs/188
+++ b/tests/xfs/188
@@ -30,6 +30,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -57,7 +58,7 @@ if [ $XFSPROGS_VERSION -lt 21000 ]; then
fi
_require_scratch
-rm -f $seq.full
+rm -f $seqres.full
_scratch_mkfs -n version=ci >/dev/null 2>&1
_scratch_mount
diff --git a/tests/xfs/189 b/tests/xfs/189
index a5a5682..24cc29e 100755
--- a/tests/xfs/189
+++ b/tests/xfs/189
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -220,5 +221,5 @@ _test_remount_barrier
# success, all done
echo "*** done"
-rm -f $seq.full
+rm -f $seqres.full
status=0
diff --git a/tests/xfs/190 b/tests/xfs/190
index 5bb4743..c760ee6 100755
--- a/tests/xfs/190
+++ b/tests/xfs/190
@@ -35,12 +35,13 @@ filesize=10
filename=test-190
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
status=0 # success is the default!
-rm -f $seq.full
+rm -f $seqres.full
# get standard environment, filters and checks
. ./common.rc
@@ -55,20 +56,20 @@ _scratch_mkfs_xfs >/dev/null 2>&1
_scratch_mount
fsblocksize=`xfs_info $SCRATCH_MNT|sed 's/=/ /g'|awk '/^data / { print $3 }'`
-dd if=/dev/zero of=$SCRATCH_MNT/$filename bs=1024k count=10 >> $seq.full 2>&1
+dd if=/dev/zero of=$SCRATCH_MNT/$filename bs=1024k count=10 >> $seqres.full 2>&1
# run DMAPI test using verbose output
echo Punching holes in file
-echo Punching holes in file >> $seq.full
+echo Punching holes in file >> $seqres.full
for i in $holes ; do
- echo xfs_io -c "unresvsp `echo $i |$SED_PROG 's/:/ /g'`" $SCRATCH_MNT/$filename >> $seq.full
+ echo xfs_io -c "unresvsp `echo $i |$SED_PROG 's/:/ /g'`" $SCRATCH_MNT/$filename >> $seqres.full
xfs_io -c "unresvsp `echo $i |$SED_PROG 's/:/ /g'`" $SCRATCH_MNT/$filename ;
done
echo Verifying holes are in the correct spots:
xfs_bmap=`xfs_bmap $SCRATCH_MNT/$filename`
-xfs_bmap $SCRATCH_MNT/$filename >> $seq.full
+xfs_bmap $SCRATCH_MNT/$filename >> $seqres.full
for i in $holes ; do
holeStart=$[`echo $i|$SED_PROG 's/:/ /g'|awk '{print $1}'`];
holeEnd=$[`echo $i|$SED_PROG 's/:/ /g'|awk '{print $2}'`];
@@ -83,7 +84,7 @@ for i in $holes ; do
#xfs_bmap prints holes in the following format
# 1: [8..15]: hole
bmap="\[$[$holeStart/512]..$[($holeEnd/512) -1]\]";
- echo $bmap >> $seq.full
+ echo $bmap >> $seqres.full
if [ $holeEnd == $holeStart ] ; then
continue #there is no hole
fi
diff --git a/tests/xfs/191 b/tests/xfs/191
index 3120dcb..d3b227c 100755
--- a/tests/xfs/191
+++ b/tests/xfs/191
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -41,7 +42,7 @@ _supported_fs xfs
_supported_os Linux
_require_scratch
-_scratch_mkfs_xfs -i nfs4acl 1>$tmp.mkfs 2>$seq.full
+_scratch_mkfs_xfs -i nfs4acl 1>$tmp.mkfs 2>$seqres.full
if [ $? -ne 0 ]
then
_notrun "no mkfs support for NFS v4 ACLs"
@@ -53,7 +54,7 @@ then
_notrun "no kernel mount support for NFS v4 ACLs"
fi
-set_prog_path nfs4acl >>$seq.full
+set_prog_path nfs4acl >>$seqres.full
if [ $? -ne 0 ]
then
_notrun "no nfs4acl utility found"
diff --git a/tests/xfs/194 b/tests/xfs/194
index 595da25..4609a17 100755
--- a/tests/xfs/194
+++ b/tests/xfs/194
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -44,7 +45,7 @@ _supported_fs xfs
_supported_os IRIX Linux
# real QA test starts here
-rm -f $seq.full
+rm -f $seqres.full
# For this test we use block size = 1/8 page size
pgsize=`$here/src/feature -s`
@@ -63,7 +64,7 @@ blksize=`expr $pgsize / 8`
_filter_bmap()
{
- tee -a $seq.full | \
+ tee -a $seqres.full | \
sed "s#$SCRATCH_MNT#SCRATCH_MNT#g" | \
awk \
'$3 ~ /hole/ { print $1 "\t" $3 "\t" ($4 * 512) / blksize; next }
@@ -75,7 +76,7 @@ _filter_bmap()
# Filter out offsets, which vary by blocksize
_filter_od()
{
- tee -a $seq.full | \
+ tee -a $seqres.full | \
sed -e "s/^[0-9A-Fa-f ]\{7,8\}//"
}
@@ -118,12 +119,12 @@ xfs_io \
-c "pwrite -S 0x11 -b `expr $pgsize / 2` 0 `expr $pgsize / 2`" \
-c "truncate `expr $blksize / 2`" \
-c "truncate $pgsize" \
--t -f $SCRATCH_MNT/testfile1 >> $seq.full
+-t -f $SCRATCH_MNT/testfile1 >> $seqres.full
# directio read of entire file
xfs_io \
-c "pread 0 $pgsize" \
--d $SCRATCH_MNT/testfile1 >> $seq.full
+-d $SCRATCH_MNT/testfile1 >> $seqres.full
xfs_bmap -v $SCRATCH_MNT/testfile1 | _filter_bmap
od -x $SCRATCH_MNT/testfile1 | _filter_od
@@ -137,12 +138,12 @@ xfs_io \
-c "truncate `expr $blksize / 2`" \
-c "truncate $pgsize" \
-c "pwrite -S 0x22 -b $blksize `expr $blksize \* 4` $blksize" \
--t -f $SCRATCH_MNT/testfile2 >> $seq.full
+-t -f $SCRATCH_MNT/testfile2 >> $seqres.full
# directio read of entire file
xfs_io \
-c "pread 0 $pgsize" \
--d $SCRATCH_MNT/testfile2 >> $seq.full
+-d $SCRATCH_MNT/testfile2 >> $seqres.full
xfs_bmap -v $SCRATCH_MNT/testfile2 | _filter_bmap
od -x $SCRATCH_MNT/testfile2 | _filter_od
@@ -187,7 +188,7 @@ xfs_io \
-c "truncate `expr $blksize / 2`" \
-c "truncate `expr $blksize + 1`" \
-c "pwrite -S 0x22 -b $blksize `expr $pgsize / 2` $blksize" \
--t -d -f $SCRATCH_MNT/testfile3 >> $seq.full
+-t -d -f $SCRATCH_MNT/testfile3 >> $seqres.full
xfs_bmap -v $SCRATCH_MNT/testfile3 | _filter_bmap
od -x $SCRATCH_MNT/testfile3 | _filter_od
@@ -207,7 +208,7 @@ xfs_io \
-c "truncate `expr $blksize + 1`" \
-c "pwrite -S 0x22 -b $blksize `expr $pgsize / 2` $blksize" \
-c "pwrite -S 0x33 -b 512 `expr $blksize \* 2` 512" \
--t -d -f $SCRATCH_MNT/testfile4 >> $seq.full
+-t -d -f $SCRATCH_MNT/testfile4 >> $seqres.full
xfs_bmap -v $SCRATCH_MNT/testfile4 | _filter_bmap
od -x $SCRATCH_MNT/testfile4 | _filter_od
diff --git a/tests/xfs/195 b/tests/xfs/195
index cd64db1..e0755f4 100755
--- a/tests/xfs/195
+++ b/tests/xfs/195
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -82,5 +83,5 @@ _do_dump
# success, all done
echo "*** done"
-rm -f $seq.full
+rm -f $seqres.full
status=0
diff --git a/tests/xfs/196 b/tests/xfs/196
index 321fe47..20b20b2 100755
--- a/tests/xfs/196
+++ b/tests/xfs/196
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -93,5 +94,5 @@ done
# success, all done
echo "*** done"
-rm -f $seq.full
+rm -f $seqres.full
status=0
diff --git a/tests/xfs/197 b/tests/xfs/197
index 8c2ebd2..b17ea37 100755
--- a/tests/xfs/197
+++ b/tests/xfs/197
@@ -28,6 +28,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -61,5 +62,5 @@ src/t_dir_offset $TEST_DIR/ttt
# success, all done
echo "*** done"
-rm -f $seq.full
+rm -f $seqres.full
status=0
diff --git a/tests/xfs/199 b/tests/xfs/199
index 127f307..fbca7c6 100755
--- a/tests/xfs/199
+++ b/tests/xfs/199
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -86,5 +87,5 @@ xfs_db -x $SCRATCH_DEV -c 'sb' -c 'print features2'
# success, all done
echo "*** done"
-rm -f $seq.full
+rm -f $seqres.full
status=0
diff --git a/tests/xfs/200 b/tests/xfs/200
index 34139cc..a70fcfe 100755
--- a/tests/xfs/200
+++ b/tests/xfs/200
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -121,5 +122,5 @@ _scratch_mount -o ro 2>&1 | _filter_scratch
# success, all done
echo "*** done"
-rm -f $seq.full
+rm -f $seqres.full
status=0
diff --git a/tests/xfs/201 b/tests/xfs/201
index e868d99..3f5b1fb 100755
--- a/tests/xfs/201
+++ b/tests/xfs/201
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -94,5 +95,5 @@ sync
# success, all done
echo "*** done"
-rm -f $seq.full
+rm -f $seqres.full
status=0
diff --git a/tests/xfs/202 b/tests/xfs/202
index 27f9e67..b0591d3 100755
--- a/tests/xfs/202
+++ b/tests/xfs/202
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -56,5 +57,5 @@ _scratch_xfs_repair -o force_geometry 2>&1 | _filter_repair
# success, all done
echo "*** done"
-rm -f $seq.full
+rm -f $seqres.full
status=0
diff --git a/tests/xfs/203 b/tests/xfs/203
index ed89600..98ee792 100755
--- a/tests/xfs/203
+++ b/tests/xfs/203
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -61,7 +62,7 @@ _cleanup()
}
trap "_cleanup; exit \$status" 0 1 2 3 15
-rm -f $seq.full
+rm -f $seqres.full
# get standard environment, filters and checks
. ./common.rc
diff --git a/tests/xfs/205 b/tests/xfs/205
index 7c953db..8b973c2 100755
--- a/tests/xfs/205
+++ b/tests/xfs/205
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -38,14 +39,14 @@ _supported_os Linux
_require_scratch
-rm -f $seq.full
+rm -f $seqres.full
-_scratch_mkfs_xfs -d size=16m -b size=512 >> $seq.full 2>&1
+_scratch_mkfs_xfs -d size=16m -b size=512 >> $seqres.full 2>&1
_scratch_mount
# fix the reserve block pool to a known size so that the enospc calculations
# work out correctly.
-_scratch_resvblks 1024 >> $seq.full 2>&1
+_scratch_resvblks 1024 >> $seqres.full 2>&1
# on a 16MB filesystem, there's 32768x512byte blocks. used is:
# - 4944 in the log,
diff --git a/tests/xfs/206 b/tests/xfs/206
index 1c25305..7f822cc 100755
--- a/tests/xfs/206
+++ b/tests/xfs/206
@@ -28,6 +28,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -58,7 +59,7 @@ if [ "$bitsperlong" -ne 64 ]; then
_notrun "This test is only valid on 64 bit machines"
fi
-rm -f $seq.full
+rm -f $seqres.full
tmpfile=$TEST_DIR/fsfile.$$
tmpdir=$TEST_DIR/tmpdir.$$
diff --git a/tests/xfs/216 b/tests/xfs/216
index a997d5a..486bd9d 100755
--- a/tests/xfs/216
+++ b/tests/xfs/216
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/217 b/tests/xfs/217
index b33c2e7..25d3a15 100755
--- a/tests/xfs/217
+++ b/tests/xfs/217
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/220 b/tests/xfs/220
index 061b395..a696aa0 100755
--- a/tests/xfs/220
+++ b/tests/xfs/220
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/222 b/tests/xfs/222
index 133f221..bb22756 100755
--- a/tests/xfs/222
+++ b/tests/xfs/222
@@ -26,6 +26,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -49,7 +50,7 @@ _supported_os Linux
[ "$XFS_FSR_PROG" = "" ] && _notrun "xfs_fsr not found"
-xfs_fsr -d -v $TEST_MNT > $seq.full 2>&1
+xfs_fsr -d -v $TEST_MNT > $seqres.full 2>&1
echo "--- silence is golden ---"
status=0 ; exit
diff --git a/tests/xfs/227 b/tests/xfs/227
index 8403724..650c72e 100755
--- a/tests/xfs/227
+++ b/tests/xfs/227
@@ -28,6 +28,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -50,7 +51,7 @@ _supported_fs xfs
_supported_os Linux
_require_scratch
-rm -f $seq.full
+rm -f $seqres.full
[ "$XFS_FSR_PROG" = "" ] && _notrun "xfs_fsr not found"
@@ -152,10 +153,10 @@ create_target_attr_last()
create_attrs $nattrs $target
}
-rm -f $seq.full
+rm -f $seqres.full
# use a small filesystem so we can control freespace easily
-_scratch_mkfs_sized $((50 * 1024 * 1024)) >> $seq.full 2>&1
+_scratch_mkfs_sized $((50 * 1024 * 1024)) >> $seqres.full 2>&1
_scratch_mount
fragment_freespace
@@ -187,20 +188,20 @@ _scratch_mount
targ=$SCRATCH_MNT/fsr_test_file.$$
for n in `seq 4 1 12`; do
- echo "*** n == $n ***" >> $seq.full
+ echo "*** n == $n ***" >> $seqres.full
for i in `seq 5 1 15`; do
for j in `seq 5 1 20`; do
- create_target_attr_first $i $j $targ.$i.$j >> $seq.full 2>&1
+ create_target_attr_first $i $j $targ.$i.$j >> $seqres.full 2>&1
done
- xfs_bmap -vp $targ.$i.* >> $seq.full 2>&1
- FSRXFSTEST=true xfs_fsr -d -v -C $n $targ.$i.* >> $seq.full 2>&1
- xfs_bmap -vp $targ.$i.* >> $seq.full 2>&1
+ xfs_bmap -vp $targ.$i.* >> $seqres.full 2>&1
+ FSRXFSTEST=true xfs_fsr -d -v -C $n $targ.$i.* >> $seqres.full 2>&1
+ xfs_bmap -vp $targ.$i.* >> $seqres.full 2>&1
for j in `seq 5 1 20`; do
- create_target_attr_last $i $j $targ.$i.$j >> $seq.full 2>&1
+ create_target_attr_last $i $j $targ.$i.$j >> $seqres.full 2>&1
done
- xfs_bmap -vp $targ.$i.* >> $seq.full 2>&1
- FSRXFSTEST=true xfs_fsr -d -v -C $n $targ.$i.* >> $seq.full 2>&1
- xfs_bmap -vp $targ.$i.* >> $seq.full 2>&1
+ xfs_bmap -vp $targ.$i.* >> $seqres.full 2>&1
+ FSRXFSTEST=true xfs_fsr -d -v -C $n $targ.$i.* >> $seqres.full 2>&1
+ xfs_bmap -vp $targ.$i.* >> $seqres.full 2>&1
done
done
diff --git a/tests/xfs/229 b/tests/xfs/229
index 52be5c3..eef6a2d 100755
--- a/tests/xfs/229
+++ b/tests/xfs/229
@@ -29,6 +29,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/238 b/tests/xfs/238
index e1a8749..00dd620 100755
--- a/tests/xfs/238
+++ b/tests/xfs/238
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/242 b/tests/xfs/242
index eb5f9df..6476d5a 100755
--- a/tests/xfs/242
+++ b/tests/xfs/242
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/244 b/tests/xfs/244
index c96d4eb..566caaa 100755
--- a/tests/xfs/244
+++ b/tests/xfs/244
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -51,7 +52,7 @@ _require_projid32bit
export MOUNT_OPTIONS="-opquota"
# make fs with no projid32bit
-_scratch_mkfs_xfs -i projid32bit=0 >> $seq.full || _fail "mkfs failed"
+_scratch_mkfs_xfs -i projid32bit=0 >> $seqres.full || _fail "mkfs failed"
_qmount
# make sure project quota is supported
_require_prjquota ${SCRATCH_DEV}
@@ -68,7 +69,7 @@ mkdir $dir
touch $dir/below16bit
# below 16bit value
$XFS_QUOTA_PROG -x -c "project -s -p $dir/below16bit 3422" $SCRATCH_DEV \
- >> $seq.full
+ >> $seqres.full
projid=$($XFS_IO_PROG -r -c "lsproj" $dir/below16bit)
if [ "projid = 3422" != "$projid" ]; then
echo "FAIL: projid32bit disabled: returned projid value ($projid)"
@@ -79,7 +80,7 @@ fi
# 32bit value, should fail
touch $dir/over16bit
if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over16bit 108545" $SCRATCH_DEV \
- >> $seq.full 2>&1; then
+ >> $seqres.full 2>&1; then
echo "FAIL: projid32bit disabled: setting 32bit projid succeeded"
echo " while it should fail"
status=1
@@ -87,7 +88,7 @@ fi
# over 32bit value, should fail
touch $dir/over32bit
-if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over32bit 5344967296" $SCRATCH_DEV >> $seq.full 2>&1; then
+if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over32bit 5344967296" $SCRATCH_DEV >> $seqres.full 2>&1; then
echo "FAIL: projid32bit disabled: setting over 32bit projid succeeded"
echo " while it should fail"
status=1
@@ -95,14 +96,14 @@ fi
# Do testing on filesystem with projid32bit feature enabled
umount $SCRATCH_DEV 2>/dev/null
-_scratch_mkfs_xfs -i projid32bit=1 >> $seq.full || _fail "mkfs failed"
+_scratch_mkfs_xfs -i projid32bit=1 >> $seqres.full || _fail "mkfs failed"
_qmount
mkdir $dir
touch $dir/below16bit
# below 16bit value, should succeed
$XFS_QUOTA_PROG -x -c "project -s -p $dir/below16bit 3422" $SCRATCH_DEV \
- >> $seq.full
+ >> $seqres.full
projid=$($XFS_IO_PROG -r -c "lsproj" $dir/below16bit)
if [ "projid = 3422" != "$projid" ]; then
echo "FAIL: projid32bit enabled: returned projid value ($projid)"
@@ -113,7 +114,7 @@ fi
# 32bit value, should succeed
touch $dir/over16bit
if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over16bit 108545" $SCRATCH_DEV \
- >> $seq.full 2>&1; then
+ >> $seqres.full 2>&1; then
projid=$($XFS_IO_PROG -r -c "lsproj" $dir/over16bit)
if [ "projid = 108545" != "$projid" ]; then
echo "FAIL: projid32bit enabled: returned projid value ($projid)"
@@ -129,7 +130,7 @@ fi
# over 32bit value, should fail
touch $dir/over32bit
if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over32bit 5344967296" $SCRATCH_DEV \
- >> $seq.full 2>&1; then
+ >> $seqres.full 2>&1; then
echo "FAIL: projid32bit enabled: setting over 32bit projid succeeded"
echo " while it should fail"
status=1
diff --git a/tests/xfs/250 b/tests/xfs/250
index 2dd12e8..a6edc2d 100755
--- a/tests/xfs/250
+++ b/tests/xfs/250
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/252 b/tests/xfs/252
index 9f0424d..be3bfcf 100755
--- a/tests/xfs/252
+++ b/tests/xfs/252
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/253 b/tests/xfs/253
index b63b7f6..b73cf6d 100755
--- a/tests/xfs/253
+++ b/tests/xfs/253
@@ -33,6 +33,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/259 b/tests/xfs/259
index 91503a0..6a29230 100755
--- a/tests/xfs/259
+++ b/tests/xfs/259
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
status=1 # failure is the default!
diff --git a/tests/xfs/261 b/tests/xfs/261
index 8903ec8..7c575aa 100755
--- a/tests/xfs/261
+++ b/tests/xfs/261
@@ -26,6 +26,7 @@
#
seq=$(basename $0)
+seqres=$RESULT_DIR/$seq
echo "QA output created by ${seq}"
here=$(pwd)
diff --git a/tests/xfs/262 b/tests/xfs/262
index 5a060f1..2ed7123 100755
--- a/tests/xfs/262
+++ b/tests/xfs/262
@@ -27,6 +27,7 @@
#
seq=$(basename $0)
+seqres=$RESULT_DIR/$seq
echo "QA output created by ${seq}"
here=$(pwd)
diff --git a/tests/xfs/266 b/tests/xfs/266
index 89c590f..3efbb75 100755
--- a/tests/xfs/266
+++ b/tests/xfs/266
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/267 b/tests/xfs/267
index c52d810..05360a9 100755
--- a/tests/xfs/267
+++ b/tests/xfs/267
@@ -22,6 +22,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/268 b/tests/xfs/268
index 36391a3..c0c45f2 100755
--- a/tests/xfs/268
+++ b/tests/xfs/268
@@ -24,6 +24,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/278 b/tests/xfs/278
index 559e174..6439eb4 100755
--- a/tests/xfs/278
+++ b/tests/xfs/278
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -60,22 +61,22 @@ _scratch_unmount
echo "Silence is goodness..."
# Corrupt DIR
-xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].inumber.i4 0" $SCRATCH_DEV >> $seq.full
-xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].name 0" $SCRATCH_DEV >> $seq.full
-xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].offset 0" $SCRATCH_DEV >> $seq.full
-xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].namelen 0" $SCRATCH_DEV >> $seq.full
-xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" $SCRATCH_DEV >> $seq.full
-xfs_db -x -c "inode $DIR_INO" -c "write core.nlinkv2 0" $SCRATCH_DEV >> $seq.full
+xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].inumber.i4 0" $SCRATCH_DEV >> $seqres.full
+xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].name 0" $SCRATCH_DEV >> $seqres.full
+xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].offset 0" $SCRATCH_DEV >> $seqres.full
+xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].namelen 0" $SCRATCH_DEV >> $seqres.full
+xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" $SCRATCH_DEV >> $seqres.full
+xfs_db -x -c "inode $DIR_INO" -c "write core.nlinkv2 0" $SCRATCH_DEV >> $seqres.full
# Corrupt SUBDIR
-xfs_db -x -c "inode $SUBDIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" $SCRATCH_DEV >> $seq.full
-xfs_db -x -c "inode $SUBDIR_INO" -c "write core.nlinkv2 0" $SCRATCH_DEV >> $seq.full
+xfs_db -x -c "inode $SUBDIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" $SCRATCH_DEV >> $seqres.full
+xfs_db -x -c "inode $SUBDIR_INO" -c "write core.nlinkv2 0" $SCRATCH_DEV >> $seqres.full
-echo "===== BEGIN of xfs_repair =====" >> $seq.full
-echo "" >>$seq.full
+echo "===== BEGIN of xfs_repair =====" >> $seqres.full
+echo "" >>$seqres.full
-xfs_repair $SCRATCH_DEV >> $seq.full 2>&1
-echo "===== END of xfs_repair =====" >> $seq.full
+xfs_repair $SCRATCH_DEV >> $seqres.full 2>&1
+echo "===== END of xfs_repair =====" >> $seqres.full
#if _check_scratch_fs; then
# status=0
diff --git a/tests/xfs/279 b/tests/xfs/279
index 8ee3328..e96c823 100755
--- a/tests/xfs/279
+++ b/tests/xfs/279
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -48,7 +49,7 @@ _supported_os Linux
_require_scsi_debug
-rm -f $seq.full
+rm -f $seqres.full
# Remove xfs signature so -f isn't needed to re-mkfs
_wipe_device()
@@ -67,7 +68,7 @@ _check_mkfs()
return
fi
echo "Passed."
- cat $tmp.mkfs.full | _filter_mkfs >> $seq.full 2>$tmp.mkfs
+ cat $tmp.mkfs.full | _filter_mkfs >> $seqres.full 2>$tmp.mkfs
. $tmp.mkfs
echo "Got sector size: $sectsz"
device=`echo $@ | awk '{print $NF}'`
@@ -83,7 +84,7 @@ SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 128`
_check_mkfs $SCSI_DEBUG_DEV
# blocksize smaller than physical sectorsize should revert to logical sectorsize
_check_mkfs -b size=2048 -f $SCSI_DEBUG_DEV
-) | tee -a $seq.full
+) | tee -a $seqres.full
_put_scsi_debug_dev
# === 4k physical 512b logical unaligned
@@ -99,7 +100,7 @@ _check_mkfs -f $SCSI_DEBUG_DEV
_check_mkfs -s size=4096 $SCSI_DEBUG_DEV
# with 4k sector specified should fall back to logical sector size with force
_check_mkfs -s size=4096 -f $SCSI_DEBUG_DEV
-) | tee -a $seq.full
+) | tee -a $seqres.full
_put_scsi_debug_dev
# === hard 4k physical / 4k logical
@@ -111,7 +112,7 @@ SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 4096 0 128`
_check_mkfs -b size=2048 $SCSI_DEBUG_DEV
# sector size smaller than physical sector size should fail
_check_mkfs -s size=512 $SCSI_DEBUG_DEV
-) | tee -a $seq.full
+) | tee -a $seqres.full
_put_scsi_debug_dev
status=0
diff --git a/tests/xfs/281 b/tests/xfs/281
index 2af3533..7aae2a5 100755
--- a/tests/xfs/281
+++ b/tests/xfs/281
@@ -23,6 +23,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
diff --git a/tests/xfs/282 b/tests/xfs/282
index 4938408..0680b9c 100755
--- a/tests/xfs/282
+++ b/tests/xfs/282
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -45,13 +46,13 @@ _require_legacy_v2_format
_create_dumpdir_fill
# ensure file/dir timestamps precede dump timestamp
sleep 2
-src/bstat $SCRATCH_MNT >>$here/$seq.full
+src/bstat $SCRATCH_MNT >>$here/$seqres.full
echo "*** Level 0 dump, format 2"
_do_dump_file -f $tmp.l0 -K
_append_dumpdir_fill
-src/bstat $SCRATCH_MNT >>$here/$seq.full
+src/bstat $SCRATCH_MNT >>$here/$seqres.full
echo "*** Level 1 dump, current format"
_do_dump_file -l 1 -f $tmp.l1
diff --git a/tests/xfs/283 b/tests/xfs/283
index d1ce8ad..75ee26e 100755
--- a/tests/xfs/283
+++ b/tests/xfs/283
@@ -25,6 +25,7 @@
#
seq=`basename $0`
+seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
here=`pwd`
@@ -45,13 +46,13 @@ _require_legacy_v2_format
_create_dumpdir_fill
# ensure file/dir timestamps precede dump timestamp
sleep 2
-src/bstat $SCRATCH_MNT >>$here/$seq.full
+src/bstat $SCRATCH_MNT >>$here/$seqres.full
echo "*** Level 0 dump, current format"
_do_dump_file -f $tmp.l0
_append_dumpdir_fill
-src/bstat $SCRATCH_MNT >>$here/$seq.full
+src/bstat $SCRATCH_MNT >>$here/$seqres.full
echo "*** Level 1 dump, format 2"
_do_dump_file -l 1 -f $tmp.l1 -K
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 18/18] xfstests: fix _link_out_file callers
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (16 preceding siblings ...)
2012-07-26 9:28 ` [PATCH 17/18] xfstests: convert tests to use new " Dave Chinner
@ 2012-07-26 9:28 ` Dave Chinner
2012-08-14 21:39 ` [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
2012-08-20 21:27 ` Mark Tinguely
19 siblings, 0 replies; 49+ messages in thread
From: Dave Chinner @ 2012-07-26 9:28 UTC (permalink / raw)
To: xfs
From: Dave Chinner <dchinner@redhat.com>
Currently the callers pass $seq, rather than the full path to the
test. As a result, it creates the link in the top level directory
and it points nowhere. Fix it to create the link in the correct
place.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
common.rc | 26 +++++++++++++-------------
tests/generic/088 | 3 ++-
tests/xfs/018 | 9 +++++----
tests/xfs/022 | 3 ++-
tests/xfs/023 | 3 ++-
tests/xfs/030 | 3 ++-
tests/xfs/031 | 3 ++-
tests/xfs/033 | 3 ++-
tests/xfs/035 | 3 ++-
tests/xfs/036 | 3 ++-
tests/xfs/039 | 3 ++-
tests/xfs/043 | 3 ++-
tests/xfs/055 | 3 ++-
tests/xfs/082 | 9 +++++----
tests/xfs/146 | 3 ++-
15 files changed, 47 insertions(+), 33 deletions(-)
diff --git a/common.rc b/common.rc
index b53734b..7c0d3a8 100644
--- a/common.rc
+++ b/common.rc
@@ -1720,19 +1720,19 @@ _cleanup_testdir()
_link_out_file()
{
- if [ -z "$1" ]; then
- echo Error must pass \$seq.
- exit
- fi
- rm -f $1
- if [ "`uname`" == "IRIX64" ] || [ "`uname`" == "IRIX" ]; then
- ln -s $1.irix $1
- elif [ "`uname`" == "Linux" ]; then
- ln -s $1.linux $1
- else
- echo Error test $seq does not run on the operating system: `uname`
- exit
- fi
+ if [ -z "$1" -o -z "$2" ]; then
+ echo Error must pass src and dst.
+ exit
+ fi
+ rm -f $1
+ if [ "`uname`" == "IRIX64" ] || [ "`uname`" == "IRIX" ]; then
+ ln -s $1.irix $2
+ elif [ "`uname`" == "Linux" ]; then
+ ln -s $1.linux $2
+ else
+ echo Error test $seq does not run on the operating system: `uname`
+ exit
+ fi
}
_die()
diff --git a/tests/generic/088 b/tests/generic/088
index 1386322..1158b46 100755
--- a/tests/generic/088
+++ b/tests/generic/088
@@ -23,6 +23,7 @@
#-----------------------------------------------------------------------
#
+seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -42,7 +43,7 @@ _filter()
}
# link correct .out file
-_link_out_file $seq.out
+_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs generic
diff --git a/tests/xfs/018 b/tests/xfs/018
index ed99f20..7f22b54 100755
--- a/tests/xfs/018
+++ b/tests/xfs/018
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
+seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -53,7 +54,7 @@ _require_scratch
_require_v2log
# link correct .out file
-_link_out_file $seq.op
+_link_out_file $seq.op $seqfull.op
echo "*** init FS"
@@ -88,13 +89,13 @@ do
_check_log
_print_operation
- _cmp_op_output $seq.op $filtered
+ _cmp_op_output $seqfull.op $filtered
_print_transaction_inode $start_blk
- _cmp_output $seq.trans_inode $filtered
+ _cmp_output $seqfull.trans_inode $filtered
_print_transaction_buf $start_blk
- _cmp_output $seq.trans_buf $filtered
+ _cmp_output $seqfull.trans_buf $filtered
done
# got thru it all so we may have success
diff --git a/tests/xfs/022 b/tests/xfs/022
index 0251936..39f4b02 100755
--- a/tests/xfs/022
+++ b/tests/xfs/022
@@ -25,6 +25,7 @@
#-----------------------------------------------------------------------
#
+seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -38,7 +39,7 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# link correct .out file
-_link_out_file $seq.out
+_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs xfs
diff --git a/tests/xfs/023 b/tests/xfs/023
index 7bb77da..b133055 100755
--- a/tests/xfs/023
+++ b/tests/xfs/023
@@ -23,6 +23,7 @@
#-----------------------------------------------------------------------
#
+seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -37,7 +38,7 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# link correct .out file
-_link_out_file $seq.out
+_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs xfs
diff --git a/tests/xfs/030 b/tests/xfs/030
index f9c1dfb..b189128 100755
--- a/tests/xfs/030
+++ b/tests/xfs/030
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
+seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -45,7 +46,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.repair
# link correct .out file
-_link_out_file $seq.out
+_link_out_file $seq.out $seqfull.out
# nuke the superblock, AGI, AGF, AGFL; then try repair the damage
#
diff --git a/tests/xfs/031 b/tests/xfs/031
index 3dec089..c089021 100755
--- a/tests/xfs/031
+++ b/tests/xfs/031
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
+seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -38,7 +39,7 @@ rm -f $seqres.full
. ./common.filter
# link correct .out file
-_link_out_file $seq.out
+_link_out_file $seq.out $seqfull.out
_check_repair()
{
diff --git a/tests/xfs/033 b/tests/xfs/033
index 1540a1c..e95cae4 100755
--- a/tests/xfs/033
+++ b/tests/xfs/033
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
+seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -45,7 +46,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.repair
# link correct .out file
-_link_out_file $seq.out
+_link_out_file $seq.out $seqfull.out
# nuke the root, rt bitmap, and rt summary inodes
#
diff --git a/tests/xfs/035 b/tests/xfs/035
index cd743f6..de9b9df 100755
--- a/tests/xfs/035
+++ b/tests/xfs/035
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
+seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -36,7 +37,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# link correct .out file
-_link_out_file $seq.out
+_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs xfs
diff --git a/tests/xfs/036 b/tests/xfs/036
index 5a7ee01..1578e8e 100755
--- a/tests/xfs/036
+++ b/tests/xfs/036
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
+seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -36,7 +37,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# link correct .out file
-_link_out_file $seq.out
+_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs xfs
diff --git a/tests/xfs/039 b/tests/xfs/039
index 21574d6..ebab798 100755
--- a/tests/xfs/039
+++ b/tests/xfs/039
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
+seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -36,7 +37,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# link correct .out file
-_link_out_file $seq.out
+_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs xfs
diff --git a/tests/xfs/043 b/tests/xfs/043
index 75c2d38..9c56ac1 100755
--- a/tests/xfs/043
+++ b/tests/xfs/043
@@ -24,6 +24,7 @@
#-----------------------------------------------------------------------
#
+seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -38,7 +39,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# link correct .out file
-_link_out_file $seq.out
+_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs xfs
diff --git a/tests/xfs/055 b/tests/xfs/055
index 1804727..4c04b0a 100755
--- a/tests/xfs/055
+++ b/tests/xfs/055
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
+seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -36,7 +37,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# link correct .out file
-_link_out_file $seq.out
+_link_out_file $seq.out $seqfull.out
# real QA test starts here
_supported_fs xfs
diff --git a/tests/xfs/082 b/tests/xfs/082
index 652f362..9ab1611 100755
--- a/tests/xfs/082
+++ b/tests/xfs/082
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
+seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -54,7 +55,7 @@ _require_scratch
_require_v2log
# link correct .out file
-_link_out_file $seq.op
+_link_out_file $seq.op $seqfull.op
echo "*** init FS"
umount $SCRATCH_DEV >/dev/null 2>&1
@@ -118,14 +119,14 @@ for s in sync nosync ; do
:
else
_print_operation
- _cmp_op_output $seq.op $filtered
+ _cmp_op_output $seqfull.op $filtered
fi
_print_transaction_inode $start
- _cmp_output $seq.trans_inode $filtered
+ _cmp_output $seqfull.trans_inode $filtered
_print_transaction_buf $start
- _cmp_output $seq.trans_buf $filtered
+ _cmp_output $seqfull.trans_buf $filtered
done
done
diff --git a/tests/xfs/146 b/tests/xfs/146
index 2091db1..e79d59e 100755
--- a/tests/xfs/146
+++ b/tests/xfs/146
@@ -22,6 +22,7 @@
#-----------------------------------------------------------------------
#
+seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -52,7 +53,7 @@ _supported_fs xfs
_supported_os Linux IRIX
# link correct .out file
-_link_out_file $seq.out
+_link_out_file $seq.out $seqfull.out
_require_scratch
_scratch_mkfs_xfs >/dev/null 2>&1
--
1.7.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (17 preceding siblings ...)
2012-07-26 9:28 ` [PATCH 18/18] xfstests: fix _link_out_file callers Dave Chinner
@ 2012-08-14 21:39 ` Dave Chinner
2012-08-15 17:23 ` Mark Tinguely
2012-08-20 21:27 ` Mark Tinguely
19 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-08-14 21:39 UTC (permalink / raw)
To: xfs
Ping?
On Thu, Jul 26, 2012 at 07:27:54PM +1000, Dave Chinner wrote:
> Alt-Subject: Games with Sed, Grep and Awk.
>
> This series is based on top of the large filesystem test series.
>
> This moves all the tests into a ./tests subdirectory, and sorts them into
> classes of related tests. Those are:
>
> tests/generic: valid for all filesystems
> tests/shared: valid for a limited number of filesystems
> tests/xfs: xfs specific tests
> tests/btrfs btrfs specific tests
> tests/ext4 ext4 specific tests
> tests/udf udf specific tests
>
> Each directory has it's own group file to determine what groups the
> tests are associated with. Tests are run in exactly the same was as
> before, but when trying to run individual tests you need to specify
> the class as well. e.g. the old way:
>
> # ./check 001
>
> The new way:
>
> # ./check generic/001
>
> The output also indicates what class the test came from:
>
> $ sudo ./check -g auto
> FSTYP -- xfs (debug)
> PLATFORM -- Linux/x86_64 test-1 3.5.0-rc5-dgc+
> MKFS_OPTIONS -- -f -bsize=4096 /dev/vdb
> MOUNT_OPTIONS -- /dev/vdb /mnt/scratch
>
> generic/001 3s
> generic/002 0s
> generic/005 1s
> generic/006 10s
> generic/007 2s
> generic/010 [not run] dbtest was not built for this platform
> generic/011 15s
> generic/013 43s
> generic/014 2s
> generic/015 0s
> generic/020 3s
> generic/053 0s
> ....
>
> [I'd post more example output, but a lightning strike took out power
> a little while ago and so all the output in my scrollback buffers
> went bye-bye...]
>
> The test classes that are run are generic, shared and $FSTYP, hence
> avoiding most "notrun, wrong filesystem" cases.
>
> Further, the test result/status files (e.g. 001.full) are also moved
> out of the top level directory into a new results directory. This
> defaults to ./results ($RESULT_BASE) and duplicates the heirarchy of
> the tests/ directory. It is created on demand. Each test is passed
> $RESULT_DIR which points to the directory it should dump it's output
> files in. i.e. "echo foo > $RESULT_DIR/$seq.full".
>
> There's a bunch of cleanup at the start of the series, removing
> stuff that I don't think has been used for years. e.g. i didn't even
> know the remake script existed, but it's usefulness is minimal are
> we rarely, if ever, regenerate every single .out file in the test
> suite. Hence stuff is removed to make it easy to convert the
> important stuff to use the new structure....
>
> Feel free to debate things like the renaming of variables - I just
> used sed scripts to do most of the conversion and most of them are
> in the commit messages so I can easily re-run them to do global
> search/replace if you've got better ideas for naming stuff ($seqres
> is pretty 'orrible)....
>
> Overall, this series shows the direction I want to take xfstests in.
> The next steps are:
>
> - remove remaining limitations on test naming (i.e. must be
> numbered) so that we can have descriptive names
> - move all of the output into the results directory and
> enable it to be hosted externally so it can be archived
> and data mined easily
> - move all the common* files to a subdirectory
> - allow running of test classes, not just groups
> - re-introduce the expunged file functionailty (which I
> didn't know existed) because I can see how useful that is
> for running regular QA with a current xfstests on an older
> distro (e.g. RHEL5) to avoid running tests that are known
> to fail or test features that aren't in old kernels...
>
> I sent the patches in git format for all the renames - you don't
> need to see a patchset that is this size:
>
> 1280 files changed, 102397 insertions(+), 104307 deletions(-)
>
> When turning on rename detection makes it this size:
>
> 686 files changed, 1722 insertions(+), 3632 deletions(-)
>
> Which is much more manageable to review....
>
> I'm certain there are problems still in there - I haven't done a lot
> of weird command line testing and really only just enough testing to
> make sure a typical auto group test run mostly passes.....
>
> Comments, additional ideas, new functionality, modifications, etc
> are all welcome.
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
>
>
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2012-08-14 21:39 ` [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
@ 2012-08-15 17:23 ` Mark Tinguely
0 siblings, 0 replies; 49+ messages in thread
From: Mark Tinguely @ 2012-08-15 17:23 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs
On 08/14/12 16:39, Dave Chinner wrote:
> Ping?
>
> On Thu, Jul 26, 2012 at 07:27:54PM +1000, Dave Chinner wrote:
>> Alt-Subject: Games with Sed, Grep and Awk.
>>
>> This series is based on top of the large filesystem test series.
>>
>> This moves all the tests into a ./tests subdirectory, and sorts them into
>> classes of related tests. Those are:
>>
>> tests/generic: valid for all filesystems
>> tests/shared: valid for a limited number of filesystems
>> tests/xfs: xfs specific tests
>> tests/btrfs btrfs specific tests
>> tests/ext4 ext4 specific tests
>> tests/udf udf specific tests
>>
>> Each directory has it's own group file to determine what groups the
>> tests are associated with. Tests are run in exactly the same was as
>> before, but when trying to run individual tests you need to specify
>> the class as well. e.g. the old way:
>>
>> # ./check 001
>>
>> The new way:
>>
>> # ./check generic/001
I applied the series and started a closer look. I like what you have done.
As far as RFC, the only concern that I have heard so far is the desire
to see benchmarking in the test suite.
--Mark.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
` (18 preceding siblings ...)
2012-08-14 21:39 ` [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
@ 2012-08-20 21:27 ` Mark Tinguely
2012-08-20 22:43 ` Dave Chinner
19 siblings, 1 reply; 49+ messages in thread
From: Mark Tinguely @ 2012-08-20 21:27 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs
On 07/26/12 04:27, Dave Chinner wrote:
> Alt-Subject: Games with Sed, Grep and Awk.
>
> This series is based on top of the large filesystem test series.
>
> This moves all the tests into a ./tests subdirectory, and sorts them into
> classes of related tests. Those are:
>
> tests/generic: valid for all filesystems
> tests/shared: valid for a limited number of filesystems
> tests/xfs: xfs specific tests
> tests/btrfs btrfs specific tests
> tests/ext4 ext4 specific tests
> tests/udf udf specific tests
The SGI XFS group talked about your proposed changes to xfstests and the
response is very positive.
The couple concerns are:
1) There is a consensus in the group that the benchmark framework
should remain until there is a common benchmark available.
Could the benchmark infrastructure be placed into its own directory
until a new common benchmark framework has been adopted?
2) Could there be a single result directory rather than mirroring the
test hierarchy? A single directory can eventually become uniquely
identified and also be easier to upload to a result depository.
Lastly, there are a couple minor link issues:
1) In tests xfs/071, xfs/096 and generic/097 the links are missing the
$RESULT_DIR and the links are being made on the top directory. For
example in generic/097:
- rm -rf $seq.out
+ rm -rf $RESULT_DIR/$seq.out
if [ "$FSTYP" == "xfs" ]; then
- ln -s $seq.out.xfs $seq.out
+ ln -s $RESULT_DIR/$seq.out.xfs $RESULT_DIR/$seq.out
else
- ln -s -$seq.out.udf $seq.out
+ ln -s $RESULT_DIR/$seq.out.udf $RESULT_DIR/$seq.out
fi
2) In patch 18, the old link needs to be removed in _link_out_file()
routine to prevent "File exists" errors on subsequent runs of the
scripts.
_link_out_file()
{
- if [ -z "$1" ]; then
- echo Error must pass \$seq.
- exit
- fi
- rm -f $1
- if [ "`uname`" == "IRIX64" ] || [ "`uname`" == "IRIX" ]; then
- ln -s $1.irix $1
- elif [ "`uname`" == "Linux" ]; then
- ln -s $1.linux $1
- else
- echo Error test $seq does not run on the operating system: `uname`
- exit
- fi
+ if [ -z "$1" -o -z "$2" ]; then
+ echo Error must pass src and dst.
+ exit
+ fi
+ rm -f $1
^^^ should that be $2?
Thank-you,
--Mark.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2012-08-20 21:27 ` Mark Tinguely
@ 2012-08-20 22:43 ` Dave Chinner
2012-08-21 16:33 ` Ben Myers
0 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-08-20 22:43 UTC (permalink / raw)
To: Mark Tinguely; +Cc: xfs
On Mon, Aug 20, 2012 at 04:27:25PM -0500, Mark Tinguely wrote:
> On 07/26/12 04:27, Dave Chinner wrote:
> >Alt-Subject: Games with Sed, Grep and Awk.
> >
> >This series is based on top of the large filesystem test series.
> >
> >This moves all the tests into a ./tests subdirectory, and sorts them into
> >classes of related tests. Those are:
> >
> > tests/generic: valid for all filesystems
> > tests/shared: valid for a limited number of filesystems
> > tests/xfs: xfs specific tests
> > tests/btrfs btrfs specific tests
> > tests/ext4 ext4 specific tests
> > tests/udf udf specific tests
>
> The SGI XFS group talked about your proposed changes to xfstests and
> the response is very positive.
>
> The couple concerns are:
>
> 1) There is a consensus in the group that the benchmark framework
> should remain until there is a common benchmark available.
>
> Could the benchmark infrastructure be placed into its own directory
> until a new common benchmark framework has been adopted?
Keeping it just complicates things. The benchmark infrastructure
is bitrotted and was largely just a hack tacked on to the side of
the regression test suite.
For it to be useful in an automated test environment, it would need
to be re-implemented from scratch with reliable recording of results
and the ability to determine if a result is unusual or not. None of
this exists - it's just a framework to run a couple of benchmarks
and dump some output to stdout using the xfstests machine config
files....
I have tried integrating other benchmarks into xfstests a while back
(e.g. compile bench, fsmark, etc) and using the results for some
kind of meaningful performance regression test. I rapidly came to
the conclusion that the infrastructure was not up to scratch and
that my simple handwritten standalone test scripts to iterate
through benchmarks and capture results was much easier to use and
modify than to jump through the weird bench infrastructure hoops.
So, no, I don't think it's worth keeping at all.
> 2) Could there be a single result directory rather than mirroring the
> test hierarchy? A single directory can eventually become uniquely
> identified and also be easier to upload to a result depository.
One of the features requested for splitting up the test
directories is to allow duplicate test names in different test
directories. You can't have a single result directory if you allow
duplicate test names....
> Lastly, there are a couple minor link issues:
>
> 1) In tests xfs/071, xfs/096 and generic/097 the links are missing the
> $RESULT_DIR and the links are being made on the top directory. For
> example in generic/097:
>
> - rm -rf $seq.out
> + rm -rf $RESULT_DIR/$seq.out
> if [ "$FSTYP" == "xfs" ]; then
> - ln -s $seq.out.xfs $seq.out
> + ln -s $RESULT_DIR/$seq.out.xfs $RESULT_DIR/$seq.out
> else
> - ln -s -$seq.out.udf $seq.out
> + ln -s $RESULT_DIR/$seq.out.udf $RESULT_DIR/$seq.out
> fi
Yeah, I missed them because they don't use _link_out_file() and sed
is only as smart as it's user....
> 2) In patch 18, the old link needs to be removed in _link_out_file()
> routine to prevent "File exists" errors on subsequent runs of the
> scripts.
Sure. I fixed this about 5 minutes after I posted the series.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2012-08-20 22:43 ` Dave Chinner
@ 2012-08-21 16:33 ` Ben Myers
2012-08-21 22:09 ` Dave Chinner
0 siblings, 1 reply; 49+ messages in thread
From: Ben Myers @ 2012-08-21 16:33 UTC (permalink / raw)
To: Dave Chinner; +Cc: Mark Tinguely, xfs
Hey Dave,
On Tue, Aug 21, 2012 at 08:43:06AM +1000, Dave Chinner wrote:
> On Mon, Aug 20, 2012 at 04:27:25PM -0500, Mark Tinguely wrote:
> > On 07/26/12 04:27, Dave Chinner wrote:
> > >Alt-Subject: Games with Sed, Grep and Awk.
> > >
> > >This series is based on top of the large filesystem test series.
> > >
> > >This moves all the tests into a ./tests subdirectory, and sorts them into
> > >classes of related tests. Those are:
> > >
> > > tests/generic: valid for all filesystems
> > > tests/shared: valid for a limited number of filesystems
> > > tests/xfs: xfs specific tests
> > > tests/btrfs btrfs specific tests
> > > tests/ext4 ext4 specific tests
> > > tests/udf udf specific tests
> >
> > The SGI XFS group talked about your proposed changes to xfstests and
> > the response is very positive.
> >
> > The couple concerns are:
> >
> > 1) There is a consensus in the group that the benchmark framework
> > should remain until there is a common benchmark available.
> >
> > Could the benchmark infrastructure be placed into its own directory
> > until a new common benchmark framework has been adopted?
>
> Keeping it just complicates things. The benchmark infrastructure
> is bitrotted and was largely just a hack tacked on to the side of
> the regression test suite.
>
> For it to be useful in an automated test environment, it would need
> to be re-implemented from scratch with reliable recording of results
> and the ability to determine if a result is unusual or not. None of
> this exists - it's just a framework to run a couple of benchmarks
> and dump some output to stdout using the xfstests machine config
> files....
>
> I have tried integrating other benchmarks into xfstests a while back
> (e.g. compile bench, fsmark, etc) and using the results for some
> kind of meaningful performance regression test. I rapidly came to
> the conclusion that the infrastructure was not up to scratch and
> that my simple handwritten standalone test scripts to iterate
> through benchmarks and capture results was much easier to use and
> modify than to jump through the weird bench infrastructure hoops.
>
> So, no, I don't think it's worth keeping at all.
You've already made it clear that you feel the current bench implementation is
not worth keeping. Once a suitable replacement for the bench infrastructure
has been implemented we can remove the old one. Until then we prefer to keep
what we have in the tree.
> > 2) Could there be a single result directory rather than mirroring the
> > test hierarchy? A single directory can eventually become uniquely
> > identified and also be easier to upload to a result depository.
>
> One of the features requested for splitting up the test
> directories is to allow duplicate test names in different test
> directories. You can't have a single result directory if you allow
> duplicate test names....
Being able to have duplicate test names in different directories makes perfect
sense.
An additional idea that we kicked around is to (optionally) do a
results/<timestamp-hostname> style results directory on a per-run basis. This
would enable us to keep all of the results history and maybe upload the results
to a central location.
Great patch set. I've verified that we're good with removing the hangcheck and
tests remaining bits. The only sticking point is bench which we'd like to
keep. Looks great.
Thanks,
Ben
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2012-08-21 16:33 ` Ben Myers
@ 2012-08-21 22:09 ` Dave Chinner
2012-08-22 19:16 ` Ben Myers
0 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-08-21 22:09 UTC (permalink / raw)
To: Ben Myers; +Cc: Mark Tinguely, xfs
On Tue, Aug 21, 2012 at 11:33:37AM -0500, Ben Myers wrote:
> Hey Dave,
>
> On Tue, Aug 21, 2012 at 08:43:06AM +1000, Dave Chinner wrote:
> > On Mon, Aug 20, 2012 at 04:27:25PM -0500, Mark Tinguely wrote:
> > > On 07/26/12 04:27, Dave Chinner wrote:
> > > >Alt-Subject: Games with Sed, Grep and Awk.
> > > >
> > > >This series is based on top of the large filesystem test series.
> > > >
> > > >This moves all the tests into a ./tests subdirectory, and sorts them into
> > > >classes of related tests. Those are:
> > > >
> > > > tests/generic: valid for all filesystems
> > > > tests/shared: valid for a limited number of filesystems
> > > > tests/xfs: xfs specific tests
> > > > tests/btrfs btrfs specific tests
> > > > tests/ext4 ext4 specific tests
> > > > tests/udf udf specific tests
> > >
> > > The SGI XFS group talked about your proposed changes to xfstests and
> > > the response is very positive.
> > >
> > > The couple concerns are:
> > >
> > > 1) There is a consensus in the group that the benchmark framework
> > > should remain until there is a common benchmark available.
> > >
> > > Could the benchmark infrastructure be placed into its own directory
> > > until a new common benchmark framework has been adopted?
> >
> > Keeping it just complicates things. The benchmark infrastructure
> > is bitrotted and was largely just a hack tacked on to the side of
> > the regression test suite.
> >
> > For it to be useful in an automated test environment, it would need
> > to be re-implemented from scratch with reliable recording of results
> > and the ability to determine if a result is unusual or not. None of
> > this exists - it's just a framework to run a couple of benchmarks
> > and dump some output to stdout using the xfstests machine config
> > files....
> >
> > I have tried integrating other benchmarks into xfstests a while back
> > (e.g. compile bench, fsmark, etc) and using the results for some
> > kind of meaningful performance regression test. I rapidly came to
> > the conclusion that the infrastructure was not up to scratch and
> > that my simple handwritten standalone test scripts to iterate
> > through benchmarks and capture results was much easier to use and
> > modify than to jump through the weird bench infrastructure hoops.
> >
> > So, no, I don't think it's worth keeping at all.
>
> You've already made it clear that you feel the current bench implementation is
> not worth keeping. Once a suitable replacement for the bench infrastructure
> has been implemented we can remove the old one. Until then we prefer to keep
> what we have in the tree.
That's not how the process works - if it's cruft that no-one is
using that gets in the way of progress, it goes. It's still in the
revision history so it's not like it is lost forever. If you have an
actual reason for keeping it other than "there isn't a replacement",
then tells us what that reason is.
i.e. are you trying to tell us that SGI uses it internally without
actually saying so? If so, why not just say that straight up? If
not, then why is removing an unused hack a problem?
As it is, I've been removing hacky functionality and then
re-implementing it in a sane manner after everything has been moved
about if it is still useful (e.g. expunged tests). The bench stuff
is no different - I just don't see it as a useful addition to
xfstests, so I haven't readded it.
Hence, if you really want to keep the bench functionality as viable,
long term supported fucntionality, then send me patches that
re-implement it cleanly on top of the patchset I posted. There's
nothing stopping you from helping with this re-org of xfstests by
contributing patches to provide the functionality you'd like to
have....
> > > 2) Could there be a single result directory rather than mirroring the
> > > test hierarchy? A single directory can eventually become uniquely
> > > identified and also be easier to upload to a result depository.
> >
> > One of the features requested for splitting up the test
> > directories is to allow duplicate test names in different test
> > directories. You can't have a single result directory if you allow
> > duplicate test names....
>
> Being able to have duplicate test names in different directories makes perfect
> sense.
>
> An additional idea that we kicked around is to (optionally) do a
> results/<timestamp-hostname> style results directory on a per-run basis. This
> would enable us to keep all of the results history and maybe upload the results
> to a central location.
That's the reason the results directory can be supplied as an
environment variable - so an external controlling script (like an
automated QA harness) can direct the results to somewhere that it
controls and archives. External results directories don't completely
work in the patchset I posted - I have more patches that get
closer to supporting that goal....
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2012-08-21 22:09 ` Dave Chinner
@ 2012-08-22 19:16 ` Ben Myers
2012-08-22 23:42 ` Dave Chinner
0 siblings, 1 reply; 49+ messages in thread
From: Ben Myers @ 2012-08-22 19:16 UTC (permalink / raw)
To: Dave Chinner; +Cc: Mark Tinguely, xfs
Dave,
On Wed, Aug 22, 2012 at 08:09:26AM +1000, Dave Chinner wrote:
> On Tue, Aug 21, 2012 at 11:33:37AM -0500, Ben Myers wrote:
> > On Tue, Aug 21, 2012 at 08:43:06AM +1000, Dave Chinner wrote:
> > > On Mon, Aug 20, 2012 at 04:27:25PM -0500, Mark Tinguely wrote:
> > > > On 07/26/12 04:27, Dave Chinner wrote:
> > > > >Alt-Subject: Games with Sed, Grep and Awk.
> > > > >
> > > > >This series is based on top of the large filesystem test series.
> > > > >
> > > > >This moves all the tests into a ./tests subdirectory, and sorts them into
> > > > >classes of related tests. Those are:
> > > > >
> > > > > tests/generic: valid for all filesystems
> > > > > tests/shared: valid for a limited number of filesystems
> > > > > tests/xfs: xfs specific tests
> > > > > tests/btrfs btrfs specific tests
> > > > > tests/ext4 ext4 specific tests
> > > > > tests/udf udf specific tests
> > > >
> > > > The SGI XFS group talked about your proposed changes to xfstests and
> > > > the response is very positive.
> > > >
> > > > The couple concerns are:
> > > >
> > > > 1) There is a consensus in the group that the benchmark framework
> > > > should remain until there is a common benchmark available.
> > > >
> > > > Could the benchmark infrastructure be placed into its own directory
> > > > until a new common benchmark framework has been adopted?
> > >
> > > Keeping it just complicates things. The benchmark infrastructure
> > > is bitrotted and was largely just a hack tacked on to the side of
> > > the regression test suite.
> > >
> > > For it to be useful in an automated test environment, it would need
> > > to be re-implemented from scratch with reliable recording of results
> > > and the ability to determine if a result is unusual or not. None of
> > > this exists - it's just a framework to run a couple of benchmarks
> > > and dump some output to stdout using the xfstests machine config
> > > files....
> > >
> > > I have tried integrating other benchmarks into xfstests a while back
> > > (e.g. compile bench, fsmark, etc) and using the results for some
> > > kind of meaningful performance regression test. I rapidly came to
> > > the conclusion that the infrastructure was not up to scratch and
> > > that my simple handwritten standalone test scripts to iterate
> > > through benchmarks and capture results was much easier to use and
> > > modify than to jump through the weird bench infrastructure hoops.
> > >
> > > So, no, I don't think it's worth keeping at all.
> >
> > You've already made it clear that you feel the current bench implementation is
> > not worth keeping. Once a suitable replacement for the bench infrastructure
> > has been implemented we can remove the old one. Until then we prefer to keep
> > what we have in the tree.
>
> That's not how the process works
That is exactly how the process works. You posted an RFC and Mark and the XFS
team at SGI walked through your patch set. Mark subsequently posted the
commentary in reply to your RFC. Cruft or not, the removal of a feature goes
through the same review process as everything else. In this case, SGI would
like to keep the benchmark capability in xfstests in order have a better chance
of catching performance regressions.
> - if it's cruft that no-one is
> using that gets in the way of progress, it goes. It's still in the
> revision history so it's not like it is lost forever. If you have an
> actual reason for keeping it other than "there isn't a replacement",
> then tells us what that reason is.
>
> i.e. are you trying to tell us that SGI uses it internally without
> actually saying so? If so, why not just say that straight up? If
> not, then why is removing an unused hack a problem?
>
> As it is, I've been removing hacky functionality and then
> re-implementing it in a sane manner after everything has been moved
> about if it is still useful (e.g. expunged tests). The bench stuff
> is no different - I just don't see it as a useful addition to
> xfstests, so I haven't readded it.
>
> Hence, if you really want to keep the bench functionality as viable,
> long term supported fucntionality, then send me patches that
> re-implement it cleanly on top of the patchset I posted. There's
> nothing stopping you from helping with this re-org of xfstests by
> contributing patches to provide the functionality you'd like to
> have....
Your point is well taken here. SGI would like to keep the bench functionality
and we're prepared to spend time on keeping it viable. Phil White has agreed
to take point on that effort. The current thinking is to move the benchmark
code out of the way into a subdirectory first, and then set about improving (or
replacing) it.
> > > > 2) Could there be a single result directory rather than mirroring the
> > > > test hierarchy? A single directory can eventually become uniquely
> > > > identified and also be easier to upload to a result depository.
> > >
> > > One of the features requested for splitting up the test
> > > directories is to allow duplicate test names in different test
> > > directories. You can't have a single result directory if you allow
> > > duplicate test names....
> >
> > Being able to have duplicate test names in different directories makes perfect
> > sense.
> >
> > An additional idea that we kicked around is to (optionally) do a
> > results/<timestamp-hostname> style results directory on a per-run basis. This
> > would enable us to keep all of the results history and maybe upload the results
> > to a central location.
>
> That's the reason the results directory can be supplied as an
> environment variable - so an external controlling script (like an
> automated QA harness) can direct the results to somewhere that it
> controls and archives. External results directories don't completely
> work in the patchset I posted - I have more patches that get
> closer to supporting that goal....
Nice. A repo of results history is an excellent goal.
-Ben
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2012-08-22 19:16 ` Ben Myers
@ 2012-08-22 23:42 ` Dave Chinner
2012-08-23 17:00 ` Ben Myers
0 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-08-22 23:42 UTC (permalink / raw)
To: Ben Myers; +Cc: Mark Tinguely, xfs
On Wed, Aug 22, 2012 at 02:16:42PM -0500, Ben Myers wrote:
> Dave,
>
> On Wed, Aug 22, 2012 at 08:09:26AM +1000, Dave Chinner wrote:
> > On Tue, Aug 21, 2012 at 11:33:37AM -0500, Ben Myers wrote:
> > > On Tue, Aug 21, 2012 at 08:43:06AM +1000, Dave Chinner wrote:
> > > > On Mon, Aug 20, 2012 at 04:27:25PM -0500, Mark Tinguely wrote:
> > > > > On 07/26/12 04:27, Dave Chinner wrote:
> > > > > >Alt-Subject: Games with Sed, Grep and Awk.
> > > > > >
> > > > > >This series is based on top of the large filesystem test series.
> > > > > >
> > > > > >This moves all the tests into a ./tests subdirectory, and sorts them into
> > > > > >classes of related tests. Those are:
> > > > > >
> > > > > > tests/generic: valid for all filesystems
> > > > > > tests/shared: valid for a limited number of filesystems
> > > > > > tests/xfs: xfs specific tests
> > > > > > tests/btrfs btrfs specific tests
> > > > > > tests/ext4 ext4 specific tests
> > > > > > tests/udf udf specific tests
> > > > >
> > > > > The SGI XFS group talked about your proposed changes to xfstests and
> > > > > the response is very positive.
> > > > >
> > > > > The couple concerns are:
> > > > >
> > > > > 1) There is a consensus in the group that the benchmark framework
> > > > > should remain until there is a common benchmark available.
> > > > >
> > > > > Could the benchmark infrastructure be placed into its own directory
> > > > > until a new common benchmark framework has been adopted?
> > > >
> > > > Keeping it just complicates things. The benchmark infrastructure
> > > > is bitrotted and was largely just a hack tacked on to the side of
> > > > the regression test suite.
> > > >
> > > > For it to be useful in an automated test environment, it would need
> > > > to be re-implemented from scratch with reliable recording of results
> > > > and the ability to determine if a result is unusual or not. None of
> > > > this exists - it's just a framework to run a couple of benchmarks
> > > > and dump some output to stdout using the xfstests machine config
> > > > files....
> > > >
> > > > I have tried integrating other benchmarks into xfstests a while back
> > > > (e.g. compile bench, fsmark, etc) and using the results for some
> > > > kind of meaningful performance regression test. I rapidly came to
> > > > the conclusion that the infrastructure was not up to scratch and
> > > > that my simple handwritten standalone test scripts to iterate
> > > > through benchmarks and capture results was much easier to use and
> > > > modify than to jump through the weird bench infrastructure hoops.
> > > >
> > > > So, no, I don't think it's worth keeping at all.
> > >
> > > You've already made it clear that you feel the current bench implementation is
> > > not worth keeping. Once a suitable replacement for the bench infrastructure
> > > has been implemented we can remove the old one. Until then we prefer to keep
> > > what we have in the tree.
> >
> > That's not how the process works
>
> That is exactly how the process works. You posted an RFC and Mark and the XFS
> team at SGI walked through your patch set. Mark subsequently posted the
> commentary in reply to your RFC. Cruft or not, the removal of a feature goes
> through the same review process as everything else.
Sure, but you need to justify your arguments for keeping something
with evidence and logic - handwaving about wanting something is, and
always has been, insufficient justification. That's the part of the
process I'm talking about - that statements of need require
evidence, especially when you agreed to the removal at LSF in San
Fransisco a few months ago. My arguments at the time were:
a) nobody is actually using it,
b) it has effectively been unmaintained since 2003
c) it has no regression analysis or detection capability
d) it shares *very little* of xfstests
e) it gets in the way of cleaning up xfstests
f) there are far better workload generators that are being
actively maintained.
And AFAIA, nothing has changed in the past few months.
> In this case, SGI would
> like to keep the benchmark capability in xfstests in order have a better chance
> of catching performance regressions.
....
> > i.e. are you trying to tell us that SGI uses it internally without
> > actually saying so? If so, why not just say that straight up? If
> > not, then why is removing an unused hack a problem?
You haven't answered the most important question I've asked (i.e.
provided any evidence that bench is valuable as it stands).
You've skirted around answering this question, so I'm left to read
between the lines and hearing this:
a) We think that we might use bench in the future,
b) but we don't really know if bench is useful or not,
c) and we don't really know what something useful might look
like, either,
d) so just move it out of the way into a subdir for now
It's all just indecisive handwaving with a (IMO) silly conclusion
because you have no clear plan what you want to do for performance
regression testing, except for the thought that "bench might be
useful".
The thing is - all I've done is:
d) so just move it out of the way
It's in a git repository - deleted files are not lost! They are
simply moved into revision history where they can still be accessed
at will. i.e. the file(s), all their contents and history are still
preserved, you just need to run a git command to get them back.
IMO, that's a far better solution that moving bitrotted code to
another directory and just leaving it in an even more bitrotted (and
now broken) state for people to trip over.
> > As it is, I've been removing hacky functionality and then
> > re-implementing it in a sane manner after everything has been moved
> > about if it is still useful (e.g. expunged tests). The bench stuff
> > is no different - I just don't see it as a useful addition to
> > xfstests, so I haven't readded it.
> >
> > Hence, if you really want to keep the bench functionality as viable,
> > long term supported fucntionality, then send me patches that
> > re-implement it cleanly on top of the patchset I posted. There's
> > nothing stopping you from helping with this re-org of xfstests by
> > contributing patches to provide the functionality you'd like to
> > have....
>
> Your point is well taken here. SGI would like to keep the bench functionality
> and we're prepared to spend time on keeping it viable. Phil White has agreed
> to take point on that effort. The current thinking is to move the benchmark
> code out of the way into a subdirectory first, and then set about improving (or
> replacing) it.
OK, so moving it to revision history will be just fine until patches
are written some time in the future to make it work again in a
subdirectory.
But before anything major gets done with bench, there needs to be a
coherent development plan produced. What is it that you intend to do
with bench? You made no mention of this at LSF, so I'm completely in
the dark here about your intentions. If you are going to develop
bench into a performance regression suite, then we first need a
discussion (and document) cwonstating what it is and isn't going to
do, how regressions are going to be detected, how the results are
going to be stored for trend analysis and presentation, etc.
For example, the first feature on my list for any new performance
regression test suite is PCP integration. If you can't monitor the
system behaviour effectively during performance tests, then they are
effectively useless for analysing the root cause of regressions. A
lot of what I do is performance related, and modifcations live and
die by what such monitoring shows of the system behaviour.
Therefore, any new performance regression suite needs to generate
PCP archives of system and XFS level behaviour....
Then, once we have an idea of what is going to be done, the white
elephant can then be addressed: is xfstests the right place for this
functionality?
FWIW, this is the sort of reporting that a performance regression
test suite should produce:
http://lists.linux.hp.com/~enw/ext4/3.2/
Indeed, why start with bench when you can start with something far
more advanced....
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2012-08-22 23:42 ` Dave Chinner
@ 2012-08-23 17:00 ` Ben Myers
2012-08-24 4:07 ` Dave Chinner
2013-02-25 15:50 ` Eric Sandeen
0 siblings, 2 replies; 49+ messages in thread
From: Ben Myers @ 2012-08-23 17:00 UTC (permalink / raw)
To: Dave Chinner; +Cc: Mark Tinguely, xfs
Dave,
On Thu, Aug 23, 2012 at 09:42:19AM +1000, Dave Chinner wrote:
> On Wed, Aug 22, 2012 at 02:16:42PM -0500, Ben Myers wrote:
> > On Wed, Aug 22, 2012 at 08:09:26AM +1000, Dave Chinner wrote:
> > > On Tue, Aug 21, 2012 at 11:33:37AM -0500, Ben Myers wrote:
> > > > On Tue, Aug 21, 2012 at 08:43:06AM +1000, Dave Chinner wrote:
> > > > > On Mon, Aug 20, 2012 at 04:27:25PM -0500, Mark Tinguely wrote:
> > > > > > On 07/26/12 04:27, Dave Chinner wrote:
> > > > > > >Alt-Subject: Games with Sed, Grep and Awk.
> > > > > > >
> > > > > > >This series is based on top of the large filesystem test series.
> > > > > > >
> > > > > > >This moves all the tests into a ./tests subdirectory, and sorts them into
> > > > > > >classes of related tests. Those are:
> > > > > > >
> > > > > > > tests/generic: valid for all filesystems
> > > > > > > tests/shared: valid for a limited number of filesystems
> > > > > > > tests/xfs: xfs specific tests
> > > > > > > tests/btrfs btrfs specific tests
> > > > > > > tests/ext4 ext4 specific tests
> > > > > > > tests/udf udf specific tests
> > > > > >
> > > > > > The SGI XFS group talked about your proposed changes to xfstests and
> > > > > > the response is very positive.
> > > > > >
> > > > > > The couple concerns are:
> > > > > >
> > > > > > 1) There is a consensus in the group that the benchmark framework
> > > > > > should remain until there is a common benchmark available.
> > > > > >
> > > > > > Could the benchmark infrastructure be placed into its own directory
> > > > > > until a new common benchmark framework has been adopted?
> > > > >
> > > > > Keeping it just complicates things. The benchmark infrastructure
> > > > > is bitrotted and was largely just a hack tacked on to the side of
> > > > > the regression test suite.
> > > > >
> > > > > For it to be useful in an automated test environment, it would need
> > > > > to be re-implemented from scratch with reliable recording of results
> > > > > and the ability to determine if a result is unusual or not. None of
> > > > > this exists - it's just a framework to run a couple of benchmarks
> > > > > and dump some output to stdout using the xfstests machine config
> > > > > files....
> > > > >
> > > > > I have tried integrating other benchmarks into xfstests a while back
> > > > > (e.g. compile bench, fsmark, etc) and using the results for some
> > > > > kind of meaningful performance regression test. I rapidly came to
> > > > > the conclusion that the infrastructure was not up to scratch and
> > > > > that my simple handwritten standalone test scripts to iterate
> > > > > through benchmarks and capture results was much easier to use and
> > > > > modify than to jump through the weird bench infrastructure hoops.
> > > > >
> > > > > So, no, I don't think it's worth keeping at all.
> > > >
> > > > You've already made it clear that you feel the current bench implementation is
> > > > not worth keeping. Once a suitable replacement for the bench infrastructure
> > > > has been implemented we can remove the old one. Until then we prefer to keep
> > > > what we have in the tree.
> > >
> > > That's not how the process works
> >
> > That is exactly how the process works. You posted an RFC and Mark and the XFS
> > team at SGI walked through your patch set. Mark subsequently posted the
> > commentary in reply to your RFC. Cruft or not, the removal of a feature goes
> > through the same review process as everything else.
>
> Sure, but you need to justify your arguments for keeping something
> with evidence and logic - handwaving about wanting something is, and
> always has been, insufficient justification. That's the part of the
> process I'm talking about - that statements of need require
> evidence, especially when you agreed to the removal at LSF in San
> Fransisco a few months ago. My arguments at the time were:
>
> a) nobody is actually using it,
> b) it has effectively been unmaintained since 2003
> c) it has no regression analysis or detection capability
> d) it shares *very little* of xfstests
> e) it gets in the way of cleaning up xfstests
> f) there are far better workload generators that are being
> actively maintained.
>
> And AFAIA, nothing has changed in the past few months.
"In this case, SGI would like to keep the benchmark capability in xfstests in
order have a better chance of catching performance regressions." There has
been a been performance regression in the past few months (and there will be
more in the future), we have had performance regressions internally too, and
this has brought the value of having benchmarks in xfstests into sharp focus.
> > In this case, SGI would
> > like to keep the benchmark capability in xfstests in order have a better chance
> > of catching performance regressions.
> ....
> > > i.e. are you trying to tell us that SGI uses it internally without
> > > actually saying so? If so, why not just say that straight up? If
> > > not, then why is removing an unused hack a problem?
>
> You haven't answered the most important question I've asked (i.e.
> provided any evidence that bench is valuable as it stands).
> You've skirted around answering this question, so I'm left to read
> between the lines and hearing this:
>
> a) We think that we might use bench in the future,
> b) but we don't really know if bench is useful or not,
> c) and we don't really know what something useful might look
> like, either,
> d) so just move it out of the way into a subdir for now
>
> It's all just indecisive handwaving with a (IMO) silly conclusion
> because you have no clear plan what you want to do for performance
> regression testing, except for the thought that "bench might be
> useful".
>
> The thing is - all I've done is:
>
> d) so just move it out of the way
>
> It's in a git repository - deleted files are not lost! They are
> simply moved into revision history where they can still be accessed
> at will. i.e. the file(s), all their contents and history are still
> preserved, you just need to run a git command to get them back.
>
> IMO, that's a far better solution that moving bitrotted code to
> another directory and just leaving it in an even more bitrotted (and
> now broken) state for people to trip over.
>
> > > As it is, I've been removing hacky functionality and then
> > > re-implementing it in a sane manner after everything has been moved
> > > about if it is still useful (e.g. expunged tests). The bench stuff
> > > is no different - I just don't see it as a useful addition to
> > > xfstests, so I haven't readded it.
> > >
> > > Hence, if you really want to keep the bench functionality as viable,
> > > long term supported fucntionality, then send me patches that
> > > re-implement it cleanly on top of the patchset I posted. There's
> > > nothing stopping you from helping with this re-org of xfstests by
> > > contributing patches to provide the functionality you'd like to
> > > have....
> >
> > Your point is well taken here. SGI would like to keep the bench functionality
> > and we're prepared to spend time on keeping it viable. Phil White has agreed
> > to take point on that effort. The current thinking is to move the benchmark
> > code out of the way into a subdirectory first, and then set about improving (or
> > replacing) it.
>
> OK, so moving it to revision history will be just fine until patches
> are written some time in the future to make it work again in a
> subdirectory.
>
> But before anything major gets done with bench, there needs to be a
> coherent development plan produced.
Doesn't removing bench fall in to the category 'major'? Did you develop a
coherent development plan on how to replace it with something better?
Great, lets do that then!
> What is it that you intend to do
> with bench? You made no mention of this at LSF, so I'm completely in
> the dark here about your intentions. If you are going to develop
> bench into a performance regression suite, then we first need a
> discussion (and document) cwonstating what it is and isn't going to
> do, how regressions are going to be detected, how the results are
> going to be stored for trend analysis and presentation, etc.
>
> For example, the first feature on my list for any new performance
> regression test suite is PCP integration. If you can't monitor the
> system behaviour effectively during performance tests, then they are
> effectively useless for analysing the root cause of regressions. A
> lot of what I do is performance related, and modifcations live and
> die by what such monitoring shows of the system behaviour.
> Therefore, any new performance regression suite needs to generate
> PCP archives of system and XFS level behaviour....
PCP is awesome. ;)
> Then, once we have an idea of what is going to be done, the white
> elephant can then be addressed: is xfstests the right place for this
> functionality?
I think it is the perfect place. xfstests already has a wide following with
linux filesystems folks, so if we get bench cleaned up everyone will have
access to the same suite automatically. I'd really like the focus to stay on
improving xfstests as opposed to some other suite, and I prefer not to be doing
SGI internal-only test suites for benchmarking and testing where possible.
> FWIW, this is the sort of reporting that a performance regression
> test suite should produce:
>
> http://lists.linux.hp.com/~enw/ext4/3.2/
Yeah, that's really nice. Do you happen to know what tool created it?
> Indeed, why start with bench when you can start with something far
> more advanced....
I understand that bench is bitrotted, but it still has some value even today.
Phil has agreed to take this on as a project so the bitrot will be addressed.
You have good points about needing a better plan in this area. But we should
come up with a plan before taking the major step of removing benchmarking from
xfstests entirely. That's not handwaving, it's good sense. ;)
Lets stay focused on improving xfstests...
Regards,
Ben
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2012-08-23 17:00 ` Ben Myers
@ 2012-08-24 4:07 ` Dave Chinner
2012-08-28 17:43 ` Ben Myers
2013-02-25 15:50 ` Eric Sandeen
1 sibling, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-08-24 4:07 UTC (permalink / raw)
To: Ben Myers; +Cc: Mark Tinguely, xfs
On Thu, Aug 23, 2012 at 12:00:25PM -0500, Ben Myers wrote:
> On Thu, Aug 23, 2012 at 09:42:19AM +1000, Dave Chinner wrote:
> > On Wed, Aug 22, 2012 at 02:16:42PM -0500, Ben Myers wrote:
> > > On Wed, Aug 22, 2012 at 08:09:26AM +1000, Dave Chinner wrote:
> > > > > > For it to be useful in an automated test environment, it would need
> > > > > > to be re-implemented from scratch with reliable recording of results
> > > > > > and the ability to determine if a result is unusual or not. None of
> > > > > > this exists - it's just a framework to run a couple of benchmarks
> > > > > > and dump some output to stdout using the xfstests machine config
> > > > > > files....
> > > > > >
> > > > > > I have tried integrating other benchmarks into xfstests a while back
> > > > > > (e.g. compile bench, fsmark, etc) and using the results for some
> > > > > > kind of meaningful performance regression test. I rapidly came to
> > > > > > the conclusion that the infrastructure was not up to scratch and
> > > > > > that my simple handwritten standalone test scripts to iterate
> > > > > > through benchmarks and capture results was much easier to use and
> > > > > > modify than to jump through the weird bench infrastructure hoops.
> > > > > >
> > > > > > So, no, I don't think it's worth keeping at all.
> > > > >
> > > > > You've already made it clear that you feel the current bench implementation is
> > > > > not worth keeping. Once a suitable replacement for the bench infrastructure
> > > > > has been implemented we can remove the old one. Until then we prefer to keep
> > > > > what we have in the tree.
> > > >
> > > > That's not how the process works
> > >
> > > That is exactly how the process works. You posted an RFC and Mark and the XFS
> > > team at SGI walked through your patch set. Mark subsequently posted the
> > > commentary in reply to your RFC. Cruft or not, the removal of a feature goes
> > > through the same review process as everything else.
> >
> > Sure, but you need to justify your arguments for keeping something
> > with evidence and logic - handwaving about wanting something is, and
> > always has been, insufficient justification. That's the part of the
> > process I'm talking about - that statements of need require
> > evidence, especially when you agreed to the removal at LSF in San
> > Fransisco a few months ago. My arguments at the time were:
> >
> > a) nobody is actually using it,
> > b) it has effectively been unmaintained since 2003
> > c) it has no regression analysis or detection capability
> > d) it shares *very little* of xfstests
> > e) it gets in the way of cleaning up xfstests
> > f) there are far better workload generators that are being
> > actively maintained.
> >
> > And AFAIA, nothing has changed in the past few months.
>
> "In this case, SGI would like to keep the benchmark capability in xfstests in
> order have a better chance of catching performance regressions." There has
> been a been performance regression in the past few months (and there will be
> more in the future), we have had performance regressions internally too, and
> this has brought the value of having benchmarks in xfstests into sharp focus.
I heard you the first time - it didn't answer the first questions I
asked, Repeating it doesn't answer the second set of questions,
either, which could be answered with "yes" or "no". That is: are you
using bench *right now* for perforamnce regression testing?
The information I'm after is whether removing it breaks your current
test environment. Given you are suggesting moving it out of the way
rather than removal, I think the answer is "no" but I'd like a yes
or no confirming that.
> > OK, so moving it to revision history will be just fine until patches
> > are written some time in the future to make it work again in a
> > subdirectory.
> >
> > But before anything major gets done with bench, there needs to be a
> > coherent development plan produced.
>
> Doesn't removing bench fall in to the category 'major'?
Not really, because it's all of 5 minutes work in a larger project.
But for the sake of argument, let's say that it is and so I need to
communicate and develop a plan....
> Did you develop a
> coherent development plan on how to replace it with something better?
Yes, I communicated and developed a plan, and got agreement on it,
too. The plan was to remove it as there are other benchmark/test
suites better suited to performance regression testing than
xfstests. We discussed this and a consensus was reached on this at
LSF. Everything in the patchset is in my notes from the LSF
discussion....
> > Then, once we have an idea of what is going to be done, the white
> > elephant can then be addressed: is xfstests the right place for this
> > functionality?
>
> I think it is the perfect place. xfstests already has a wide following with
> linux filesystems folks, so if we get bench cleaned up everyone will have
> access to the same suite automatically. I'd really like the focus to stay on
> improving xfstests as opposed to some other suite, and I prefer not to be doing
> SGI internal-only test suites for benchmarking and testing where possible.
There's no reason why a new performance regression suite would have
to be SGI internal. If you want it to be part of xfstests so the
work is put into a public GPL project, then I think your motivation
for using/keeping bench is all wrong....
Anyway, let's leave it there. Gather requirements (e.g. put out a
request for discussion on linux-fsdevel), research existing tools
that can do the job, develop a plan, then we can discuss how best ot
proceed.
> > FWIW, this is the sort of reporting that a performance regression
> > test suite should produce:
> >
> > http://lists.linux.hp.com/~enw/ext4/3.2/
>
> Yeah, that's really nice. Do you happen to know what tool created it?
IIRC, a relatively simple set of scripts around the outside of ffsb,
lockstat, oprofile and gnuplot. You should probably ask Eric if he
can share them...
>
> > Indeed, why start with bench when you can start with something far
> > more advanced....
>
> I understand that bench is bitrotted, but it still has some value even today.
> Phil has agreed to take this on as a project so the bitrot will be addressed.
> You have good points about needing a better plan in this area. But we should
> come up with a plan before taking the major step of removing benchmarking from
> xfstests entirely. That's not handwaving, it's good sense. ;)
>
> Lets stay focused on improving xfstests...
Yep, I'm trying to do that by removing peripheral, non-core
functionality. ;)
Really, it makes no difference to me whether I remove bench or move
it to a sub-directory in a broken state. If you are really that set
on it being useful, I'll move it to another directory (say
"broken-bench-do-not-sit-down-here" :) and leave it in a
busted state. If it hasn't been fixed 6 months later, I'll post
patches to remove it again....
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2012-08-24 4:07 ` Dave Chinner
@ 2012-08-28 17:43 ` Ben Myers
2012-08-28 18:02 ` Christoph Hellwig
0 siblings, 1 reply; 49+ messages in thread
From: Ben Myers @ 2012-08-28 17:43 UTC (permalink / raw)
To: Dave Chinner; +Cc: Mark Tinguely, xfs
Hi Dave,
On Fri, Aug 24, 2012 at 02:07:24PM +1000, Dave Chinner wrote:
> On Thu, Aug 23, 2012 at 12:00:25PM -0500, Ben Myers wrote:
> > On Thu, Aug 23, 2012 at 09:42:19AM +1000, Dave Chinner wrote:
> > > On Wed, Aug 22, 2012 at 02:16:42PM -0500, Ben Myers wrote:
> > > > On Wed, Aug 22, 2012 at 08:09:26AM +1000, Dave Chinner wrote:
> > > > > > > For it to be useful in an automated test environment, it would need
> > > > > > > to be re-implemented from scratch with reliable recording of results
> > > > > > > and the ability to determine if a result is unusual or not. None of
> > > > > > > this exists - it's just a framework to run a couple of benchmarks
> > > > > > > and dump some output to stdout using the xfstests machine config
> > > > > > > files....
> > > > > > >
> > > > > > > I have tried integrating other benchmarks into xfstests a while back
> > > > > > > (e.g. compile bench, fsmark, etc) and using the results for some
> > > > > > > kind of meaningful performance regression test. I rapidly came to
> > > > > > > the conclusion that the infrastructure was not up to scratch and
> > > > > > > that my simple handwritten standalone test scripts to iterate
> > > > > > > through benchmarks and capture results was much easier to use and
> > > > > > > modify than to jump through the weird bench infrastructure hoops.
> > > > > > >
> > > > > > > So, no, I don't think it's worth keeping at all.
> > > > > >
> > > > > > You've already made it clear that you feel the current bench implementation is
> > > > > > not worth keeping. Once a suitable replacement for the bench infrastructure
> > > > > > has been implemented we can remove the old one. Until then we prefer to keep
> > > > > > what we have in the tree.
> > > > >
> > > > > That's not how the process works
> > > >
> > > > That is exactly how the process works. You posted an RFC and Mark and the XFS
> > > > team at SGI walked through your patch set. Mark subsequently posted the
> > > > commentary in reply to your RFC. Cruft or not, the removal of a feature goes
> > > > through the same review process as everything else.
> > >
> > > Sure, but you need to justify your arguments for keeping something
> > > with evidence and logic - handwaving about wanting something is, and
> > > always has been, insufficient justification. That's the part of the
> > > process I'm talking about - that statements of need require
> > > evidence, especially when you agreed to the removal at LSF in San
> > > Fransisco a few months ago. My arguments at the time were:
> > >
> > > a) nobody is actually using it,
> > > b) it has effectively been unmaintained since 2003
> > > c) it has no regression analysis or detection capability
> > > d) it shares *very little* of xfstests
> > > e) it gets in the way of cleaning up xfstests
> > > f) there are far better workload generators that are being
> > > actively maintained.
> > >
> > > And AFAIA, nothing has changed in the past few months.
> >
> > "In this case, SGI would like to keep the benchmark capability in xfstests in
> > order have a better chance of catching performance regressions." There has
> > been a been performance regression in the past few months (and there will be
> > more in the future), we have had performance regressions internally too, and
> > this has brought the value of having benchmarks in xfstests into sharp focus.
>
> I heard you the first time - it didn't answer the first questions I
> asked, Repeating it doesn't answer the second set of questions,
> either, which could be answered with "yes" or "no". That is: are you
> using bench *right now* for perforamnce regression testing?
No. Most of the folks who are doing perf regression testing are rolling their
own... Iozone is most used AFAICT.
> The information I'm after is whether removing it breaks your current
> test environment. Given you are suggesting moving it out of the way
> rather than removal, I think the answer is "no" but I'd like a yes
> or no confirming that.
Removing bench won't break our test environment.
> > > OK, so moving it to revision history will be just fine until patches
> > > are written some time in the future to make it work again in a
> > > subdirectory.
> > >
> > > But before anything major gets done with bench, there needs to be a
> > > coherent development plan produced.
> >
> > Doesn't removing bench fall in to the category 'major'?
>
> Not really, because it's all of 5 minutes work in a larger project.
> But for the sake of argument, let's say that it is and so I need to
> communicate and develop a plan....
>
> > Did you develop a
> > coherent development plan on how to replace it with something better?
>
> Yes, I communicated and developed a plan, and got agreement on it,
> too. The plan was to remove it as there are other benchmark/test
> suites better suited to performance regression testing than
> xfstests. We discussed this and a consensus was reached on this at
> LSF. Everything in the patchset is in my notes from the LSF
> discussion....
Well then I'm sorry to flip flop on you like that. In light of the trouble
we've been having with performance regressions I feel we should take another
look at having benchmarks in xfstests. We could use something that is
sufficiently handy that benchmarks are likely to be run on a regular basis
(say, on the weekend) because you got setup of the benchmarks for free when you
set up xfstests.
> > > Then, once we have an idea of what is going to be done, the white
> > > elephant can then be addressed: is xfstests the right place for this
> > > functionality?
> >
> > I think it is the perfect place. xfstests already has a wide following with
> > linux filesystems folks, so if we get bench cleaned up everyone will have
> > access to the same suite automatically. I'd really like the focus to stay on
> > improving xfstests as opposed to some other suite, and I prefer not to be doing
> > SGI internal-only test suites for benchmarking and testing where possible.
>
> There's no reason why a new performance regression suite would have
> to be SGI internal. If you want it to be part of xfstests so the
> work is put into a public GPL project, then I think your motivation
> for using/keeping bench is all wrong....
>
> Anyway, let's leave it there. Gather requirements (e.g. put out a
> request for discussion on linux-fsdevel), research existing tools
> that can do the job, develop a plan, then we can discuss how best ot
> proceed.
Yeah, lets leave it there for a little while.
> > > FWIW, this is the sort of reporting that a performance regression
> > > test suite should produce:
> > >
> > > http://lists.linux.hp.com/~enw/ext4/3.2/
> >
> > Yeah, that's really nice. Do you happen to know what tool created it?
>
> IIRC, a relatively simple set of scripts around the outside of ffsb,
> lockstat, oprofile and gnuplot. You should probably ask Eric if he
> can share them...
I don't know Eric. Can you make an introduction?
> > > Indeed, why start with bench when you can start with something far
> > > more advanced....
> >
> > I understand that bench is bitrotted, but it still has some value even today.
> > Phil has agreed to take this on as a project so the bitrot will be addressed.
> > You have good points about needing a better plan in this area. But we should
> > come up with a plan before taking the major step of removing benchmarking from
> > xfstests entirely. That's not handwaving, it's good sense. ;)
> >
> > Lets stay focused on improving xfstests...
>
> Yep, I'm trying to do that by removing peripheral, non-core
> functionality. ;)
>
> Really, it makes no difference to me whether I remove bench or move
> it to a sub-directory in a broken state. If you are really that set
> on it being useful, I'll move it to another directory (say
> "broken-bench-do-not-sit-down-here" :) and leave it in a
> busted state. If it hasn't been fixed 6 months later, I'll post
> patches to remove it again....
I got the impression that Christoph is doing a review of this patch set as
well. If you wait for Christoph's review before moving bench it will give Phil
a little time to come up with a plan for discussion.
Thanks,
Ben
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2012-08-28 17:43 ` Ben Myers
@ 2012-08-28 18:02 ` Christoph Hellwig
0 siblings, 0 replies; 49+ messages in thread
From: Christoph Hellwig @ 2012-08-28 18:02 UTC (permalink / raw)
To: Ben Myers; +Cc: Mark Tinguely, xfs
On Tue, Aug 28, 2012 at 12:43:04PM -0500, Ben Myers wrote:
> I got the impression that Christoph is doing a review of this patch set as
> well. If you wait for Christoph's review before moving bench it will give Phil
> a little time to come up with a plan for discussion.
I'll try to get to it quickly. I shared Dave's opinion on the current
bench code, but I also agree that if SGI has it in use right now we
can't remove it. I'm still not quite clear if you guys use it right now
or just maybe plan to use it real soon. If it's the latter I'd be in
favour of removing it, if not we must keep it.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 01/18] xfstests: remove remake script
2012-07-26 9:27 ` [PATCH 01/18] xfstests: remove remake script Dave Chinner
@ 2012-08-28 19:50 ` Christoph Hellwig
0 siblings, 0 replies; 49+ messages in thread
From: Christoph Hellwig @ 2012-08-28 19:50 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 03/18] xfstests: kill useless test owner fields
2012-07-26 9:27 ` [PATCH 03/18] xfstests: kill useless test owner fields Dave Chinner
@ 2012-08-28 19:51 ` Christoph Hellwig
0 siblings, 0 replies; 49+ messages in thread
From: Christoph Hellwig @ 2012-08-28 19:51 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs
On Thu, Jul 26, 2012 at 07:27:57PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Back many years ago, the owner field was used to email the test
> owner when auto-qa failed that test. It is not needed anymore - if
> you want to know who wrote the test, look it up in git....
>
> Script used was:
>
> $ sed -i -e "/^# creator/d" -e "/^owner/d" [0-2][0-9][0-9]
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 04/18] xfstests: remove stale machine configs
2012-07-26 9:27 ` [PATCH 04/18] xfstests: remove stale machine configs Dave Chinner
@ 2012-08-28 19:51 ` Christoph Hellwig
0 siblings, 0 replies; 49+ messages in thread
From: Christoph Hellwig @ 2012-08-28 19:51 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs
On Thu, Jul 26, 2012 at 07:27:58PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Left over from the days of ASG, all stale. Remove them, leaving just
> an simple example that defines all the variables that can be
> configured. Also, add a localhost defined config set up for simple
> KVM based guest test configs using virtio for their block devices to
> simplify test setup in such scenarios..
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 05/18] xfstests: fold common into check
2012-07-26 9:27 ` [PATCH 05/18] xfstests: fold common into check Dave Chinner
@ 2012-08-28 19:52 ` Christoph Hellwig
0 siblings, 0 replies; 49+ messages in thread
From: Christoph Hellwig @ 2012-08-28 19:52 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs
On Thu, Jul 26, 2012 at 07:27:59PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> There is only one user of the common file now - check. Fold the two
> into one file as the split of functionality is not necessary
> anymore.
Looks good (assuming the bench removal which this probably depends on
goes in)
Reviewed-by: Christoph Hellwig <hch@lst.de>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 06/18] xfstests: clean up and simply check CLI option parsing
2012-07-26 9:28 ` [PATCH 06/18] xfstests: clean up and simply check CLI option parsing Dave Chinner
@ 2012-08-28 19:52 ` Christoph Hellwig
0 siblings, 0 replies; 49+ messages in thread
From: Christoph Hellwig @ 2012-08-28 19:52 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs
On Thu, Jul 26, 2012 at 07:28:00PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> The option parise in a messy loop of option parsing and actions on
> secondary arguments. Turn it into something much neater and esay to
> understand rather than a mess of temporary variables and tortured
> logic...
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 07/18] xfstests: kill hangcheck stuff from check
2012-07-26 9:28 ` [PATCH 07/18] xfstests: kill hangcheck stuff from check Dave Chinner
@ 2012-08-28 19:53 ` Christoph Hellwig
0 siblings, 0 replies; 49+ messages in thread
From: Christoph Hellwig @ 2012-08-28 19:53 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs
On Thu, Jul 26, 2012 at 07:28:01PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> This is an old script from the auto-qa days back at SGI. It no
> longer is in use or, AFAIK, ever been used for xfstests. If anyone
> needs it, they can pull it back out of git, so lets remove it to
> simplify check.
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 08/18] xfstests: remove test expunge file support
2012-07-26 9:28 ` [PATCH 08/18] xfstests: remove test expunge file support Dave Chinner
@ 2012-08-28 19:54 ` Christoph Hellwig
0 siblings, 0 replies; 49+ messages in thread
From: Christoph Hellwig @ 2012-08-28 19:54 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs
Hmm, this actually is a useful feature I didn't know about. I'm fine
with removing it for now if it makes your life easier, but I'd really
love to have it back and documented.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 09/18] xfstests: remove undocumented TESTS_REMAINING_LOG
2012-07-26 9:28 ` [PATCH 09/18] xfstests: remove undocumented TESTS_REMAINING_LOG Dave Chinner
@ 2012-08-28 19:54 ` Christoph Hellwig
0 siblings, 0 replies; 49+ messages in thread
From: Christoph Hellwig @ 2012-08-28 19:54 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 17/18] xfstests: convert tests to use new results directory
2012-07-26 9:28 ` [PATCH 17/18] xfstests: convert tests to use new " Dave Chinner
@ 2012-09-05 12:00 ` Boris Ranto
2012-09-05 23:04 ` Dave Chinner
0 siblings, 1 reply; 49+ messages in thread
From: Boris Ranto @ 2012-09-05 12:00 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs
On Thu, 2012-07-26 at 19:28 +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Essentially the change is simply this. Converting:
>
> ... >> $seq.????
>
> to:
>
> .... >> $RESULT_DIR/$seq.????
>
> so that output files are directed to the defined output directory.
>
> sed to the rescue:
>
> $ sed -i -e '/^seq=.*$/a seqres=$RESULT_DIR/$seq' -e 's/seq.full/seqres.full/' tests/*/*
>
> will do most of the work automatically.
>
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---
> new | 3 ++-
> tests/btrfs/254 | 1 +
> tests/btrfs/264 | 1 +
> tests/btrfs/265 | 1 +
> tests/btrfs/276 | 31 ++++++++++++++++---------------
> tests/btrfs/284 | 1 +
> tests/ext4/271 | 3 ++-
> tests/generic/001 | 9 +++++----
> tests/generic/002 | 1 +
> tests/generic/005 | 1 +
> tests/generic/006 | 1 +
> tests/generic/007 | 1 +
> tests/generic/010 | 5 +++--
> tests/generic/011 | 7 ++++---
> tests/generic/013 | 21 +++++++++++----------
> tests/generic/014 | 1 +
> tests/generic/015 | 9 +++++----
> tests/generic/020 | 9 +++++----
> tests/generic/053 | 1 +
> tests/generic/062 | 15 ++++++++-------
> tests/generic/069 | 13 +++++++------
> tests/generic/070 | 3 ++-
> tests/generic/074 | 11 ++++++-----
> tests/generic/075 | 7 ++++---
> tests/generic/076 | 13 +++++++------
> tests/generic/077 | 21 +++++++++++----------
> tests/generic/079 | 1 +
> tests/generic/083 | 15 ++++++++-------
> tests/generic/088 | 3 ++-
> tests/generic/089 | 7 ++++---
> tests/generic/091 | 9 +++++----
> tests/generic/093 | 3 ++-
> tests/generic/097 | 3 ++-
> tests/generic/099 | 3 ++-
> tests/generic/100 | 11 ++++++-----
> tests/generic/105 | 11 ++++++-----
> tests/generic/112 | 7 ++++---
> tests/generic/113 | 1 +
> tests/generic/117 | 15 ++++++++-------
> tests/generic/120 | 1 +
> tests/generic/123 | 1 +
> tests/generic/124 | 1 +
> tests/generic/125 | 1 +
> tests/generic/126 | 1 +
> tests/generic/127 | 1 +
> tests/generic/128 | 1 +
> tests/generic/129 | 1 +
> tests/generic/130 | 1 +
> tests/generic/131 | 1 +
> tests/generic/132 | 1 +
> tests/generic/133 | 1 +
> tests/generic/135 | 1 +
> tests/generic/141 | 1 +
> tests/generic/169 | 15 ++++++++-------
> tests/generic/184 | 1 +
> tests/generic/192 | 9 +++++----
> tests/generic/193 | 3 ++-
> tests/generic/198 | 3 ++-
> tests/generic/204 | 5 +++--
> tests/generic/207 | 1 +
> tests/generic/208 | 1 +
> tests/generic/209 | 1 +
> tests/generic/210 | 1 +
> tests/generic/211 | 1 +
> tests/generic/212 | 1 +
> tests/generic/213 | 3 ++-
> tests/generic/214 | 3 ++-
> tests/generic/215 | 3 ++-
> tests/generic/219 | 15 ++++++++-------
> tests/generic/221 | 1 +
> tests/generic/223 | 13 +++++++------
> tests/generic/224 | 7 ++++---
> tests/generic/225 | 3 ++-
> tests/generic/226 | 9 +++++----
> tests/generic/228 | 3 ++-
> tests/generic/230 | 41 +++++++++++++++++++++--------------------
> tests/generic/231 | 9 +++++----
> tests/generic/232 | 11 ++++++-----
> tests/generic/233 | 11 ++++++-----
> tests/generic/234 | 7 ++++---
> tests/generic/235 | 13 +++++++------
> tests/generic/236 | 1 +
> tests/generic/237 | 3 ++-
> tests/generic/239 | 1 +
> tests/generic/240 | 3 ++-
> tests/generic/241 | 5 +++--
> tests/generic/245 | 1 +
> tests/generic/246 | 1 +
> tests/generic/247 | 1 +
> tests/generic/248 | 1 +
> tests/generic/249 | 7 ++++---
> tests/generic/251 | 1 +
> tests/generic/255 | 1 +
> tests/generic/256 | 1 +
> tests/generic/257 | 3 ++-
> tests/generic/258 | 1 +
> tests/generic/260 | 1 +
> tests/generic/263 | 9 +++++----
> tests/generic/269 | 7 ++++---
> tests/generic/270 | 7 ++++---
> tests/generic/273 | 7 ++++---
> tests/generic/274 | 41 +++++++++++++++++++++--------------------
> tests/generic/275 | 5 +++--
> tests/generic/277 | 1 +
> tests/generic/280 | 3 ++-
> tests/shared/051 | 3 ++-
> tests/shared/068 | 29 +++++++++++++++--------------
> tests/shared/218 | 15 ++++++++-------
> tests/shared/243 | 23 ++++++++++++-----------
> tests/shared/272 | 11 ++++++-----
> tests/udf/098 | 3 ++-
> tests/udf/101 | 1 +
> tests/udf/102 | 1 +
> tests/xfs/003 | 1 +
> tests/xfs/004 | 17 +++++++++--------
> tests/xfs/008 | 1 +
> tests/xfs/009 | 1 +
> tests/xfs/012 | 1 +
> tests/xfs/016 | 35 ++++++++++++++++++-----------------
> tests/xfs/017 | 31 ++++++++++++++++---------------
> tests/xfs/018 | 3 ++-
> tests/xfs/019 | 3 ++-
> tests/xfs/021 | 5 +++--
> tests/xfs/022 | 1 +
> tests/xfs/023 | 1 +
> tests/xfs/024 | 5 +++--
> tests/xfs/025 | 1 +
> tests/xfs/026 | 1 +
> tests/xfs/027 | 1 +
> tests/xfs/028 | 3 ++-
> tests/xfs/029 | 1 +
> tests/xfs/030 | 1 +
> tests/xfs/031 | 13 +++++++------
> tests/xfs/032 | 15 ++++++++-------
> tests/xfs/033 | 1 +
> tests/xfs/034 | 13 +++++++------
> tests/xfs/035 | 1 +
> tests/xfs/036 | 1 +
> tests/xfs/037 | 1 +
> tests/xfs/038 | 1 +
> tests/xfs/039 | 1 +
> tests/xfs/040 | 7 ++++---
> tests/xfs/041 | 5 +++--
> tests/xfs/042 | 7 ++++---
> tests/xfs/043 | 1 +
> tests/xfs/044 | 1 +
> tests/xfs/045 | 1 +
> tests/xfs/046 | 1 +
> tests/xfs/047 | 3 ++-
> tests/xfs/048 | 1 +
> tests/xfs/049 | 53 +++++++++++++++++++++++++++--------------------------
> tests/xfs/050 | 31 ++++++++++++++++---------------
> tests/xfs/052 | 19 ++++++++++---------
> tests/xfs/054 | 7 ++++---
> tests/xfs/055 | 1 +
> tests/xfs/056 | 1 +
> tests/xfs/057 | 1 +
> tests/xfs/058 | 1 +
> tests/xfs/059 | 1 +
> tests/xfs/060 | 1 +
> tests/xfs/061 | 1 +
> tests/xfs/063 | 1 +
> tests/xfs/064 | 9 +++++----
> tests/xfs/065 | 1 +
> tests/xfs/066 | 1 +
> tests/xfs/067 | 9 +++++----
> tests/xfs/071 | 17 +++++++++--------
> tests/xfs/072 | 3 ++-
> tests/xfs/073 | 1 +
> tests/xfs/078 | 1 +
> tests/xfs/080 | 1 +
> tests/xfs/081 | 3 ++-
> tests/xfs/082 | 3 ++-
> tests/xfs/084 | 1 +
> tests/xfs/085 | 11 ++++++-----
> tests/xfs/086 | 13 +++++++------
> tests/xfs/087 | 17 +++++++++--------
> tests/xfs/090 | 1 +
> tests/xfs/092 | 1 +
> tests/xfs/094 | 1 +
> tests/xfs/095 | 1 +
> tests/xfs/096 | 5 +++--
> tests/xfs/103 | 1 +
> tests/xfs/104 | 15 ++++++++-------
> tests/xfs/106 | 5 +++--
> tests/xfs/107 | 5 +++--
> tests/xfs/108 | 15 ++++++++-------
> tests/xfs/109 | 3 ++-
> tests/xfs/110 | 1 +
> tests/xfs/111 | 1 +
> tests/xfs/114 | 31 ++++++++++++++++---------------
> tests/xfs/115 | 11 ++++++-----
> tests/xfs/116 | 1 +
> tests/xfs/118 | 3 ++-
> tests/xfs/119 | 1 +
> tests/xfs/121 | 17 +++++++++--------
> tests/xfs/122 | 7 ++++---
> tests/xfs/134 | 5 +++--
> tests/xfs/136 | 1 +
> tests/xfs/137 | 1 +
> tests/xfs/138 | 1 +
> tests/xfs/139 | 1 +
> tests/xfs/140 | 1 +
> tests/xfs/142 | 1 +
> tests/xfs/143 | 1 +
> tests/xfs/144 | 1 +
> tests/xfs/145 | 1 +
> tests/xfs/146 | 1 +
> tests/xfs/147 | 1 +
> tests/xfs/148 | 1 +
> tests/xfs/149 | 13 +++++++------
> tests/xfs/150 | 1 +
> tests/xfs/151 | 3 ++-
> tests/xfs/152 | 1 +
> tests/xfs/153 | 1 +
> tests/xfs/154 | 1 +
> tests/xfs/155 | 1 +
> tests/xfs/156 | 5 +++--
> tests/xfs/157 | 1 +
> tests/xfs/158 | 1 +
> tests/xfs/159 | 1 +
> tests/xfs/160 | 1 +
> tests/xfs/161 | 1 +
> tests/xfs/162 | 1 +
> tests/xfs/163 | 1 +
> tests/xfs/164 | 5 +++--
> tests/xfs/165 | 7 ++++---
> tests/xfs/166 | 5 +++--
> tests/xfs/167 | 5 +++--
> tests/xfs/168 | 5 +++--
> tests/xfs/170 | 3 ++-
> tests/xfs/171 | 3 ++-
> tests/xfs/172 | 3 ++-
> tests/xfs/173 | 3 ++-
> tests/xfs/174 | 3 ++-
> tests/xfs/175 | 3 ++-
> tests/xfs/176 | 3 ++-
> tests/xfs/177 | 1 +
> tests/xfs/178 | 1 +
> tests/xfs/179 | 1 +
> tests/xfs/180 | 1 +
> tests/xfs/181 | 17 +++++++++--------
> tests/xfs/182 | 1 +
> tests/xfs/183 | 1 +
> tests/xfs/185 | 1 +
> tests/xfs/186 | 7 ++++---
> tests/xfs/187 | 5 +++--
> tests/xfs/188 | 3 ++-
> tests/xfs/189 | 3 ++-
> tests/xfs/190 | 13 +++++++------
> tests/xfs/191 | 5 +++--
> tests/xfs/194 | 19 ++++++++++---------
> tests/xfs/195 | 3 ++-
> tests/xfs/196 | 3 ++-
> tests/xfs/197 | 3 ++-
> tests/xfs/199 | 3 ++-
> tests/xfs/200 | 3 ++-
> tests/xfs/201 | 3 ++-
> tests/xfs/202 | 3 ++-
> tests/xfs/203 | 3 ++-
> tests/xfs/205 | 7 ++++---
> tests/xfs/206 | 3 ++-
> tests/xfs/216 | 1 +
> tests/xfs/217 | 1 +
> tests/xfs/220 | 1 +
> tests/xfs/222 | 3 ++-
> tests/xfs/227 | 25 +++++++++++++------------
> tests/xfs/229 | 1 +
> tests/xfs/238 | 1 +
> tests/xfs/242 | 1 +
> tests/xfs/244 | 17 +++++++++--------
> tests/xfs/250 | 1 +
> tests/xfs/252 | 1 +
> tests/xfs/253 | 1 +
> tests/xfs/259 | 1 +
> tests/xfs/261 | 1 +
> tests/xfs/262 | 1 +
> tests/xfs/266 | 1 +
> tests/xfs/267 | 1 +
> tests/xfs/268 | 1 +
> tests/xfs/278 | 25 +++++++++++++------------
> tests/xfs/279 | 11 ++++++-----
> tests/xfs/281 | 1 +
> tests/xfs/282 | 5 +++--
> tests/xfs/283 | 5 +++--
> 285 files changed, 905 insertions(+), 620 deletions(-)
>
> diff --git a/new b/new
> index 8dde6c5..94638f6 100755
> --- a/new
> +++ b/new
> @@ -106,6 +106,7 @@ cat <<End-of-File >$id
> #
> # creator
> seq=\`basename \$0\`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by \$seq"
>
> here=\`pwd\`
> @@ -134,7 +135,7 @@ exit
>
> # optional stuff if your test has verbose output to help resolve problems
> #echo
> -#echo "If failure, check \$seq.full (this) and \$seq.full.ok (reference)"
> +#echo "If failure, check \$seqres.full (this) and \$seqres.full.ok (reference)"
>
> # success, all done
> status=0
> diff --git a/tests/btrfs/254 b/tests/btrfs/254
> index 73089d1..ec3d2c5 100755
> --- a/tests/btrfs/254
> +++ b/tests/btrfs/254
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/btrfs/264 b/tests/btrfs/264
> index a589c7c..46a4926 100755
> --- a/tests/btrfs/264
> +++ b/tests/btrfs/264
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/btrfs/265 b/tests/btrfs/265
> index f28d4e5..760f383 100755
> --- a/tests/btrfs/265
> +++ b/tests/btrfs/265
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/btrfs/276 b/tests/btrfs/276
> index fc87c28..63dec4d 100755
> --- a/tests/btrfs/276
> +++ b/tests/btrfs/276
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -54,7 +55,7 @@ _require_nobigloopfs
> _require_btrfs inspect-internal
> _require_command "/usr/sbin/filefrag"
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> FILEFRAG_FILTER='if (/, blocksize (\d+)/) {$blocksize = $1; next} ($ext, '\
> '$logical, $physical, $expected, $length, $flags) = (/^\s*(\d+)\s+(\d+)'\
> @@ -68,18 +69,18 @@ FILEFRAG_FILTER='if (/, blocksize (\d+)/) {$blocksize = $1; next} ($ext, '\
> # sample output: "1234#10#5678" -> physical 1234, length 10, logical 5678
> _filter_extents()
> {
> - tee -a $seq.full | $PERL_PROG -ne "$FILEFRAG_FILTER"
> + tee -a $seqres.full | $PERL_PROG -ne "$FILEFRAG_FILTER"
> }
>
> _check_file_extents()
> {
> cmd="filefrag -vx $1"
> - echo "# $cmd" >> $seq.full
> + echo "# $cmd" >> $seqres.full
> out=`$cmd | _filter_extents`
> if [ -z "$out" ]; then
> return 1
> fi
> - echo "after filter: $out" >> $seq.full
> + echo "after filter: $out" >> $seqres.full
> echo $out
> return 0
> }
> @@ -95,9 +96,9 @@ _btrfs_inspect_addr()
> expect_inum=$4
> file=$5
> cmd="$BTRFS_UTIL_PROG inspect-internal logical-resolve -P $addr $mp"
> - echo "# $cmd" >> $seq.full
> + echo "# $cmd" >> $seqres.full
> out=`$cmd`
> - echo "$out" >> $seq.full
> + echo "$out" >> $seqres.full
> grep_expr="inode $expect_inum offset $expect_addr root"
> echo "$out" | grep "^$grep_expr 5$" >/dev/null
> ret=$?
> @@ -128,9 +129,9 @@ _btrfs_inspect_inum()
> snap_name=$3
> mp="$SCRATCH_MNT/$snap_name"
> cmd="$BTRFS_UTIL_PROG inspect-internal inode-resolve $inum $mp"
> - echo "# $cmd" >> $seq.full
> + echo "# $cmd" >> $seqres.full
> out=`$cmd`
> - echo "$out" >> $seq.full
> + echo "$out" >> $seqres.full
> grep_expr="^$file$"
> cnt=`echo "$out" | grep "$grep_expr" | wc -l`
> if [ $cnt -ge "1" ]; then
> @@ -151,9 +152,9 @@ _btrfs_inspect_check()
> logical=$4
> snap_name=$5
> cmd="stat -c %i $file"
> - echo "# $cmd" >> $seq.full
> + echo "# $cmd" >> $seqres.full
> inum=`$cmd`
> - echo "$inum" >> $seq.full
> + echo "$inum" >> $seqres.full
> _btrfs_inspect_addr $SCRATCH_MNT $physical $logical $inum $file
> ret=$?
> if [ $ret -eq 0 ]; then
> @@ -165,8 +166,8 @@ _btrfs_inspect_check()
>
> run_check()
> {
> - echo "# $@" >> $seq.full 2>&1
> - "$@" >> $seq.full 2>&1 || _fail "failed: '$@'"
> + echo "# $@" >> $seqres.full 2>&1
> + "$@" >> $seqres.full 2>&1 || _fail "failed: '$@'"
> }
>
> workout()
> @@ -177,9 +178,9 @@ workout()
> snap_name=$4
>
> umount $SCRATCH_DEV >/dev/null 2>&1
> - echo "*** mkfs -dsize=$fsz" >>$seq.full
> - echo "" >>$seq.full
> - _scratch_mkfs_sized $fsz >>$seq.full 2>&1 \
> + echo "*** mkfs -dsize=$fsz" >>$seqres.full
> + echo "" >>$seqres.full
> + _scratch_mkfs_sized $fsz >>$seqres.full 2>&1 \
> || _fail "size=$fsz mkfs failed"
> run_check _scratch_mount
> # -w ensures that the only ops are ones which cause write I/O
> diff --git a/tests/btrfs/284 b/tests/btrfs/284
> index f8d0340..41688d3 100644
> --- a/tests/btrfs/284
> +++ b/tests/btrfs/284
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
> here="`pwd`"
> tmp=/tmp/$$
> diff --git a/tests/ext4/271 b/tests/ext4/271
> index 50b4c0b..6a0e7b1 100755
> --- a/tests/ext4/271
> +++ b/tests/ext4/271
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -40,7 +41,7 @@ _supported_os Linux
> _need_to_be_root
> _require_scratch
>
> -_scratch_mkfs_sized $((128 * 1024 * 1024)) >> $seq.full 2>&1
> +_scratch_mkfs_sized $((128 * 1024 * 1024)) >> $seqres.full 2>&1
>
> # -onoload and EXT4_SYNC_FL on file is important becase result in
> # metadata sync writes inside ext4_handle_dirty_metadata()
> diff --git a/tests/generic/001 b/tests/generic/001
> index b9997f3..a6659ab 100755
> --- a/tests/generic/001
> +++ b/tests/generic/001
> @@ -32,6 +32,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> # get standard environment, filters and checks
> @@ -189,7 +190,7 @@ _mark_iteration()
> #
> _chain()
> {
> - $AWK_PROG -v full_file=$here/$seq.full -v verify=$verify <$tmp.config '
> + $AWK_PROG -v full_file=$here/$seqres.full -v verify=$verify <$tmp.config '
> BEGIN { nfile = 0 }
> /^\#/ { next }
> { file[nfile] = $1
> @@ -237,7 +238,7 @@ END { srand('$iter')
> }
> }
> }' \
> - | tee -a $here/$seq.full | sh
> + | tee -a $here/$seqres.full | sh
> }
>
> _check()
> @@ -291,7 +292,7 @@ _cleanup()
> fi
> }
>
> -rm -f $here/$seq.full
> +rm -f $here/$seqres.full
> status=0
> _cleanup
> status=1
> @@ -305,7 +306,7 @@ _setup
> for iter in 1 2 3 4 5
> do
> echo -n "iter $iter chain ... "
> - echo "iter $iter" >> $here/$seq.full
> + echo "iter $iter" >> $here/$seqres.full
> _chain
> _check
> if [ -f $tmp.bad ]
> diff --git a/tests/generic/002 b/tests/generic/002
> index db63fa0..ba1a5cf 100755
> --- a/tests/generic/002
> +++ b/tests/generic/002
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> # get standard environment, filters and checks
> diff --git a/tests/generic/005 b/tests/generic/005
> index 27da3d3..ba28502 100755
> --- a/tests/generic/005
> +++ b/tests/generic/005
> @@ -33,6 +33,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/006 b/tests/generic/006
> index 1437b46..9949d84 100755
> --- a/tests/generic/006
> +++ b/tests/generic/006
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/007 b/tests/generic/007
> index 2bb981f..2d026a3 100755
> --- a/tests/generic/007
> +++ b/tests/generic/007
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/010 b/tests/generic/010
> index 245f407..3587f21 100755
> --- a/tests/generic/010
> +++ b/tests/generic/010
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -59,11 +60,11 @@ _supported_os IRIX Linux
>
> _setup_testdir
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> cd $testdir
>
> -$here/src/dbtest -l 5 -n 1000 2>&1 | tee -a $here/$seq.full | _filter_dbtest
> +$here/src/dbtest -l 5 -n 1000 2>&1 | tee -a $here/$seqres.full | _filter_dbtest
>
> # success, all done
> exit
> diff --git a/tests/generic/011 b/tests/generic/011
> index 4ede2d8..e5c6bbf 100755
> --- a/tests/generic/011
> +++ b/tests/generic/011
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> out=""
> @@ -51,7 +52,7 @@ _setup_testdir
>
> out=$testdir/dirstress.$$
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> _test()
> {
> @@ -63,8 +64,8 @@ _test()
> if ! $here/src/dirstress -d $out -f $count $args >$tmp.out 2>&1
> then
> echo " dirstress failed"
> - echo "*** TEST $test -d $out -f $count $args" >>$seq.full
> - cat $tmp.out >>$seq.full
> + echo "*** TEST $test -d $out -f $count $args" >>$seqres.full
> + cat $tmp.out >>$seqres.full
> status=1
> fi
> }
> diff --git a/tests/generic/013 b/tests/generic/013
> index 0879a2a..984ed09 100755
> --- a/tests/generic/013
> +++ b/tests/generic/013
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -73,15 +74,15 @@ _do_test()
> echo "fsstress.$_n : $_param"
> echo "-----------------------------------------------"
> # -m limits number of users/groups so check doesn't fail (malloc) later
> - dbgoutfile=$seq.full
> + dbgoutfile=$seqres.full
> if ! $FSSTRESS_PROG $_param $FSSTRESS_AVOID -v -m 8 -n $_count -d $out >>$dbgoutfile 2>&1
> then
> - echo " fsstress (count=$_count) returned $? - see $seq.full"
> - echo "--------------------------------------" >>$here/$seq.full
> - echo "$_n - output from fsstress:" >>$here/$seq.full
> - echo "--------------------------------------" >>$here/$seq.full
> - echo "<NOT LOGGED>" >>$here/$seq.full
> - #cat $tmp.out >>$here/$seq.full
> + echo " fsstress (count=$_count) returned $? - see $seqres.full"
> + echo "--------------------------------------" >>$here/$seqres.full
> + echo "$_n - output from fsstress:" >>$here/$seqres.full
> + echo "--------------------------------------" >>$here/$seqres.full
> + echo "<NOT LOGGED>" >>$here/$seqres.full
> + #cat $tmp.out >>$here/$seqres.full
> status=1
> fi
>
> @@ -95,7 +96,7 @@ _supported_os IRIX Linux
>
> _setup_testdir
>
> -rm -f $here/$seq.full
> +rm -f $here/$seqres.full
> echo "brevity is wit..."
>
> count=1000
> @@ -115,8 +116,8 @@ _do_test 2 "-p $procs -r" $count
>
> _do_test 3 "-p 4 -z -f rmdir=10 -f link=10 -f creat=10 -f mkdir=10 -f rename=30 -f stat=30 -f unlink=30 -f truncate=20" $count
>
> -# if all ok by here then probably don't need $seq.full
> -rm -f $seq.full
> +# if all ok by here then probably don't need $seqres.full
> +rm -f $seqres.full
>
> exit
>
> diff --git a/tests/generic/014 b/tests/generic/014
> index 93caaa6..096e4e5 100755
> --- a/tests/generic/014
> +++ b/tests/generic/014
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/015 b/tests/generic/015
> index 52ab251..a77d2f7 100755
> --- a/tests/generic/015
> +++ b/tests/generic/015
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -56,7 +57,7 @@ _scratch_mkfs_sized `expr 50 \* 1024 \* 1024` >/dev/null 2>&1 \
> || _fail "mkfs failed"
> _scratch_mount || _fail "mount failed"
> out=$SCRATCH_MNT/fillup.$$
> -rm -f $seq.full
> +rm -f $seqres.full
>
> free0=`_free`
> if [ -z "$free0" ]
> @@ -64,7 +65,7 @@ then
> echo " *** failed to get free space (0)"
> exit 1
> fi
> -echo "free space at start $free0" >> $seq.full
> +echo "free space at start $free0" >> $seqres.full
>
> echo "fill disk:" # well, filesystem really - not disk
>
> @@ -78,7 +79,7 @@ then
> echo " *** failed to get free space (1)"
> exit 1
> fi
> -echo "free space after fill $free1" >> $seq.full
> +echo "free space after fill $free1" >> $seqres.full
>
> if [ ! -e $out ]
> then
> @@ -116,7 +117,7 @@ then
> echo " *** failed to get free space (2)"
> exit 1
> fi
> -echo "free space after delete $free2" >> $seq.full
> +echo "free space after delete $free2" >> $seqres.full
>
> echo -n " !!! "
> _within_tolerance "free space" $free2 $free0 1% -v
> diff --git a/tests/generic/020 b/tests/generic/020
> index 2bd1d9f..42465d8 100755
> --- a/tests/generic/020
> +++ b/tests/generic/020
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -85,7 +86,7 @@ _require_attrs
>
> _setup_testdir
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> testfile=$testdir/attribute_$$
>
> @@ -120,7 +121,7 @@ v=0
>
> while [ $v -lt $MAX_ATTRS ]
> do
> - echo -n "value_$v" | attr -s "attribute_$v" $testfile >>$seq.full
> + echo -n "value_$v" | attr -s "attribute_$v" $testfile >>$seqres.full
> if [ $? -ne 0 ]
> then
> echo "!!! failed to add \"attribute_$v\""
> @@ -133,7 +134,7 @@ done
> echo "*** check"
> # don't print it all out...
> getfattr --absolute-names $testfile \
> - | tee -a $seq.full \
> + | tee -a $seqres.full \
> | $AWK_PROG '
> /^#/ { next }
> /^[ ]*$/ { next }
> @@ -145,7 +146,7 @@ echo "*** remove lots of attributes"
> v=0
> while [ $v -lt $MAX_ATTRS ]
> do
> - if ! $ATTR_PROG -r "attribute_$v" $testfile >>$seq.full
> + if ! $ATTR_PROG -r "attribute_$v" $testfile >>$seqres.full
> then
> echo "!!! failed to remove \"attribute_$v\""
> exit 1
> diff --git a/tests/generic/053 b/tests/generic/053
> index 388c9b4..99dd1b0 100755
> --- a/tests/generic/053
> +++ b/tests/generic/053
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/062 b/tests/generic/062
> index 5a6081e..27907a9 100755
> --- a/tests/generic/062
> +++ b/tests/generic/062
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -75,7 +76,7 @@ _supported_os Linux
> _require_scratch
> _require_attrs
>
> -rm -f $tmp.backup1 $tmp.backup2 $seq.full
> +rm -f $tmp.backup1 $tmp.backup2 $seqres.full
>
> # real QA test starts here
> _scratch_mkfs > /dev/null 2>&1 || _fail "mkfs failed"
> @@ -181,8 +182,8 @@ _backup()
> {
> # NB: no filtering of scratch here... (need to restore too)
> $GETFATTR_PROG --absolute-names -dh -R -m '.' $SCRATCH_MNT >$1
> - echo BACKUP $1 >>$seq.full
> - cat $1 >> $seq.full
> + echo BACKUP $1 >>$seqres.full
> + cat $1 >> $seqres.full
> [ ! -s $1 ] && echo "warning: $1 (backup file) is empty"
> }
>
> @@ -191,8 +192,8 @@ _backup $tmp.backup1
>
> echo "*** clear out the scratch device"
> rm -fr $SCRATCH_MNT/*
> -echo "AFTER REMOVE" >>$seq.full
> -getfattr -L -R -m '.' $SCRATCH_MNT >>$seq.full
> +echo "AFTER REMOVE" >>$seqres.full
> +getfattr -L -R -m '.' $SCRATCH_MNT >>$seqres.full
>
> echo "*** reset test bed with no extended attributes"
> _create_test_bed
> @@ -202,8 +203,8 @@ echo "*** restore everything"
> setfattr -h --restore=$tmp.backup1
> _backup $tmp.backup2
>
> -echo "AFTER RESTORE" >>$seq.full
> -getfattr -L -R -m '.' $SCRATCH_MNT >>$seq.full
> +echo "AFTER RESTORE" >>$seqres.full
> +getfattr -L -R -m '.' $SCRATCH_MNT >>$seqres.full
>
> echo "*** compare before and after backups"
> diff $tmp.backup1 $tmp.backup2
> diff --git a/tests/generic/069 b/tests/generic/069
> index 3451715..b2b18a9 100755
> --- a/tests/generic/069
> +++ b/tests/generic/069
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -39,7 +40,7 @@ _supported_fs generic
> _supported_os IRIX Linux
>
> _require_scratch
> -rm -f $seq.full
> +rm -f $seqres.full
>
> umount $SCRATCH_DEV >/dev/null 2>&1
>
> @@ -60,19 +61,19 @@ done
> cd $here
>
> wait
> -ls -lh $SCRATCH_MNT >> $seq.full
> -echo "*** PIDs file" >> $seq.full
> -cat $SCRATCH_MNT/pids >> $seq.full
> +ls -lh $SCRATCH_MNT >> $seqres.full
> +echo "*** PIDs file" >> $seqres.full
> +cat $SCRATCH_MNT/pids >> $seqres.full
>
> cat $SCRATCH_MNT/pids | while read pid size
> do
> echo "*** checking file with $size integers"
> - echo checking pid=$pid size=$size >> $seq.full
> + echo checking pid=$pid size=$size >> $seqres.full
> $here/src/append_reader $SCRATCH_MNT/testfile.$pid
> status=$?
> [ $status -ne 0 ] && \
> echo "maybe corrupt O_APPEND to $SCRATCH_MOUNT/testfile.$pid!"
> - echo status: $status >> $seq.full
> + echo status: $status >> $seqres.full
> done
>
> # success, all done
> diff --git a/tests/generic/070 b/tests/generic/070
> index 1d978cd..4e86de8 100755
> --- a/tests/generic/070
> +++ b/tests/generic/070
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -60,7 +61,7 @@ $FSSTRESS_PROG \
> -f unresvsp=0 \
> -f attr_set=100 \
> -f attr_remove=100 \
> - -p 1 -n 10000 -S c >$seq.full 2>&1
> + -p 1 -n 10000 -S c >$seqres.full 2>&1
>
> status=$?
> exit
> diff --git a/tests/generic/074 b/tests/generic/074
> index 0e5e820..c795dc7 100755
> --- a/tests/generic/074
> +++ b/tests/generic/074
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -64,9 +65,9 @@ _do_test()
> echo "-----------------------------------------------"
> echo "fstest.$_n : $_filter_param"
> echo "-----------------------------------------------"
> - if ! $here/src/fstest $_param -p $out >>$seq.full
> + if ! $here/src/fstest $_param -p $out >>$seqres.full
> then
> - echo " fstest ($_param) returned $? - see $seq.full"
> + echo " fstest ($_param) returned $? - see $seqres.full"
> status=1
> exit
> fi
> @@ -107,7 +108,7 @@ _process_args()
>
>
> # real QA test starts here
> -rm -f $here/$seq.full
> +rm -f $here/$seqres.full
>
> _supported_fs generic
> _supported_os IRIX Linux
> @@ -153,8 +154,8 @@ fi
> # can override the params here
> _process_args "$@"
>
> -echo "Params are for $param_type" >>$seq.full
> -echo "Params: n = $numchildren l = $numloops f = $numfiles" >>$seq.full
> +echo "Params are for $param_type" >>$seqres.full
> +echo "Params: n = $numchildren l = $numloops f = $numfiles" >>$seqres.full
>
> _setup_testdir
>
> diff --git a/tests/generic/075 b/tests/generic/075
> index de581b6..8012cc1 100755
> --- a/tests/generic/075
> +++ b/tests/generic/075
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -133,12 +134,12 @@ numops2=10000
> # can override the params here
> _process_args "$@"
>
> -echo "Params are for $param_type" >>$seq.full
> -echo "Params: n = $numops1 N = $numops2 l = $filelen" >>$seq.full
> +echo "Params are for $param_type" >>$seqres.full
> +echo "Params: n = $numops1 N = $numops2 l = $filelen" >>$seqres.full
>
> _setup_testdir
>
> -rm -f $here/$seq.full
> +rm -f $here/$seqres.full
> echo "brevity is wit..."
>
> _check_test_fs
> diff --git a/tests/generic/076 b/tests/generic/076
> index a8b5d4a..b8db582 100755
> --- a/tests/generic/076
> +++ b/tests/generic/076
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -58,13 +59,13 @@ _require_scratch
>
> echo "*** init fs"
>
> -rm -f $seq.full
> +rm -f $seqres.full
> umount $SCRATCH_DEV >/dev/null 2>&1
> -echo "*** MKFS ***" >>$seq.full
> -echo "" >>$seq.full
> -_scratch_mkfs >>$seq.full 2>&1 \
> +echo "*** MKFS ***" >>$seqres.full
> +echo "" >>$seqres.full
> +_scratch_mkfs >>$seqres.full 2>&1 \
> || _fail "mkfs failed"
> -_scratch_mount >>$seq.full 2>&1 \
> +_scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed"
>
> echo "*** test concurrent block/fs access"
> @@ -72,7 +73,7 @@ echo "*** test concurrent block/fs access"
> cat $SCRATCH_DEV >/dev/null &
> pid=$!
>
> -$FSSTRESS_PROG -d $SCRATCH_MNT -p 2 -n 2000 $FSSTRESS_AVOID >>$seq.full
> +$FSSTRESS_PROG -d $SCRATCH_MNT -p 2 -n 2000 $FSSTRESS_AVOID >>$seqres.full
>
> _lets_get_pidst
> _check_scratch_fs
> diff --git a/tests/generic/077 b/tests/generic/077
> index 2b86a37..3113119 100755
> --- a/tests/generic/077
> +++ b/tests/generic/077
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -56,29 +57,29 @@ _require_user
>
> echo "*** create filesystem"
>
> -rm -f $seq.full
> +rm -f $seqres.full
> umount $SCRATCH_DEV >/dev/null 2>&1
> -echo "*** MKFS ***" >>$seq.full
> -echo "" >>$seq.full
> +echo "*** MKFS ***" >>$seqres.full
> +echo "" >>$seqres.full
> SIZE=`expr 50 \* 1024 \* 1024`
> -_scratch_mkfs_sized $SIZE >>$seq.full 2>&1 \
> +_scratch_mkfs_sized $SIZE >>$seqres.full 2>&1 \
> || _fail "mkfs failed"
> -_scratch_mount >>$seq.full 2>&1 \
> +_scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed"
> mkdir $SCRATCH_MNT/subdir
>
> echo "*** set default ACL"
> setfacl -R -dm u:fsgqa:rwx,g::rwx,o::r-x,m::rwx $SCRATCH_MNT/subdir
>
> -echo "*** populate filesystem, pass #1" | tee -a $seq.full
> -cp -rf $filler $SCRATCH_MNT/subdir >$seq.full 2>&1
> +echo "*** populate filesystem, pass #1" | tee -a $seqres.full
> +cp -rf $filler $SCRATCH_MNT/subdir >$seqres.full 2>&1
>
> -echo "*** populate filesystem, pass #2" | tee -a $seq.full
> -cp -rf $filler $SCRATCH_MNT/subdir >$seq.full 2>&1
> +echo "*** populate filesystem, pass #2" | tee -a $seqres.full
> +cp -rf $filler $SCRATCH_MNT/subdir >$seqres.full 2>&1
>
> _check_scratch_fs
>
> echo "*** all done"
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> exit
> diff --git a/tests/generic/079 b/tests/generic/079
> index 048b220..3faf106 100755
> --- a/tests/generic/079
> +++ b/tests/generic/079
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/083 b/tests/generic/083
> index dd60118..f0aab4d 100755
> --- a/tests/generic/083
> +++ b/tests/generic/083
> @@ -33,6 +33,7 @@
>
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -58,7 +59,7 @@ _supported_os IRIX Linux
> _require_scratch
> _require_no_large_scratch_dev
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> workout()
> {
> @@ -68,22 +69,22 @@ workout()
> nops=$4
>
> umount $SCRATCH_DEV >/dev/null 2>&1
> - echo "*** mkfs -dsize=$fsz,agcount=$ags" >>$seq.full
> - echo "" >>$seq.full
> + echo "*** mkfs -dsize=$fsz,agcount=$ags" >>$seqres.full
> + echo "" >>$seqres.full
> if [ $FSTYP = xfs ]
> then
> - _scratch_mkfs_xfs -dsize=$fsz,agcount=$ags >>$seq.full 2>&1 \
> + _scratch_mkfs_xfs -dsize=$fsz,agcount=$ags >>$seqres.full 2>&1 \
> || _fail "size=$fsz,agcount=$ags mkfs failed"
> else
> - _scratch_mkfs_sized $fsz >>$seq.full 2>&1 \
> + _scratch_mkfs_sized $fsz >>$seqres.full 2>&1 \
> || _fail "size=$fsz mkfs failed"
> fi
> - _scratch_mount >>$seq.full 2>&1 \
> + _scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed"
>
> # -w ensures that the only ops are ones which cause write I/O
> $FSSTRESS_PROG -d $SCRATCH_MNT -w -p $procs -n $nops $FSSTRESS_AVOID \
> - >>$seq.full
> + >>$seqres.full
> _check_scratch_fs
> }
>
> diff --git a/tests/generic/088 b/tests/generic/088
> index b6266ef..1386322 100755
> --- a/tests/generic/088
> +++ b/tests/generic/088
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -48,7 +49,7 @@ _supported_fs generic
> _supported_os IRIX Linux
>
> path=$TEST_DIR/t_access
> -src/t_access_root $path | tee $seq.full | _filter
> +src/t_access_root $path | tee $seqres.full | _filter
>
> # success, all done
> status=0
> diff --git a/tests/generic/089 b/tests/generic/089
> index 2653183..5e8210d 100755
> --- a/tests/generic/089
> +++ b/tests/generic/089
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> mtab_output=$TEST_DIR/mtab_output
> @@ -51,7 +52,7 @@ addentries()
> _supported_fs generic
> _supported_os Linux
>
> -rm -f $seq.full
> +rm -f $seqres.full
> [ "X$TEST_DIR" = "X" ] && exit 1
> cd $TEST_DIR
> rm -fr test
> @@ -72,8 +73,8 @@ mtab()
>
> echo directory entries:
> ls | grep mtab
> - echo directory entries >> $here/$seq.full
> - ls -li >> $here/$seq.full
> + echo directory entries >> $here/$seqres.full
> + ls -li >> $here/$seqres.full
> }
>
> # directory with only a few entries
> diff --git a/tests/generic/091 b/tests/generic/091
> index ad82b8e..755281e 100755
> --- a/tests/generic/091
> +++ b/tests/generic/091
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -38,16 +39,16 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> _supported_fs generic
> _supported_os Linux
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> run_fsx()
> {
> - echo fsx $@ | tee -a $seq.full
> + echo fsx $@ | tee -a $seqres.full
> args=`echo $@ | sed -e "s/ BSIZE / $bsize /g" -e "s/ PSIZE / $psize /g"`
> rm -f $TEST_DIR/junk
> - $here/ltp/fsx $args $TEST_DIR/junk >>$seq.full 2>&1
> + $here/ltp/fsx $args $TEST_DIR/junk >>$seqres.full 2>&1
> if [ $? -ne 0 ]; then
> - cat $seq.full
> + cat $seqres.full
> exit 1
> fi
> }
> diff --git a/tests/generic/093 b/tests/generic/093
> index 881a833..12ef580 100755
> --- a/tests/generic/093
> +++ b/tests/generic/093
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
>
> here=`pwd`
> tmp=/tmp/$$
> @@ -62,7 +63,7 @@ _require_attrs
>
> [ -x $runas ] || _notrun "$runas executable not found"
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> _setup_testdir
> _need_to_be_root
> diff --git a/tests/generic/097 b/tests/generic/097
> index d3174e4..60f7e4d 100755
> --- a/tests/generic/097
> +++ b/tests/generic/097
> @@ -28,6 +28,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -250,7 +251,7 @@ _check_scratch_fs
>
> # optional stuff if your test has verbose output to help resolve problems
> #echo
> -#echo "If failure, check $seq.full (this) and $seq.full.ok (reference)"
> +#echo "If failure, check $seqres.full (this) and $seqres.full.ok (reference)"
>
> # success, all done
> status=0
> diff --git a/tests/generic/099 b/tests/generic/099
> index edd88a9..6efa7a7 100755
> --- a/tests/generic/099
> +++ b/tests/generic/099
> @@ -24,6 +24,7 @@
> # modifier
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -72,7 +73,7 @@ _cleanup()
> # -> this would be done by simultaneously matching on ACEs
> # -> interesting if it allows user to specify ACEs in any order
> #
> -rm -f $seq.full
> +rm -f $seqres.full
>
> #-------------------------------------------------------
> # real QA test starts here
> diff --git a/tests/generic/100 b/tests/generic/100
> index 1ba5eb7..34cfde7 100755
> --- a/tests/generic/100
> +++ b/tests/generic/100
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -54,17 +55,17 @@ DEPTH=5
> POPULATED_DIR=$TEMP_DIR/populate_root
> SIZE=10
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> # Clean up if file exist from prevous run
> rm -rf $POPULATED_DIR
> rm -f $TEMP_DIR/$TAR_FILE
>
> # Create the new directory structure
> -_populate_fs -n $NDIRS -f $NFILES -d $DEPTH -r $POPULATED_DIR -s $SIZE >>$here/$seq.full 2>&1
> +_populate_fs -n $NDIRS -f $NFILES -d $DEPTH -r $POPULATED_DIR -s $SIZE >>$here/$seqres.full 2>&1
>
> # Then tar up the directory structure
> -tar -cvf $TEMP_DIR/$TAR_FILE $POPULATED_DIR >>$here/$seq.full 2>&1
> +tar -cvf $TEMP_DIR/$TAR_FILE $POPULATED_DIR >>$here/$seqres.full 2>&1
>
> # create f/s
> _require_scratch
> @@ -72,12 +73,12 @@ _setup_testdir
>
> # untar on f/s
> cd $testdir
> -tar -xRvf $TEMP_DIR/$TAR_FILE >>$here/$seq.full 2>&1
> +tar -xRvf $TEMP_DIR/$TAR_FILE >>$here/$seqres.full 2>&1
> cd $here
>
>
> # use diff -qr to compare
> -ls -R -l ${testdir}${POPULATED_DIR} >>$here/$seq.full 2>&1
> +ls -R -l ${testdir}${POPULATED_DIR} >>$here/$seqres.full 2>&1
> diff -qr $POPULATED_DIR ${testdir}${POPULATED_DIR}
>
> cd /
> diff --git a/tests/generic/105 b/tests/generic/105
> index 01bae98..d5b2cb2 100755
> --- a/tests/generic/105
> +++ b/tests/generic/105
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -49,7 +50,7 @@ _supported_os IRIX Linux
>
> # real QA test starts here
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> _require_scratch
> _require_acls
> @@ -57,11 +58,11 @@ _require_acls
> _acl_setup_ids
>
> umount $SCRATCH_DEV >/dev/null 2>&1
> -echo "*** MKFS ***" >>$seq.full
> -echo "" >>$seq.full
> -_scratch_mkfs >>$seq.full 2>&1 \
> +echo "*** MKFS ***" >>$seqres.full
> +echo "" >>$seqres.full
> +_scratch_mkfs >>$seqres.full 2>&1 \
> || _fail "mkfs failed"
> -_scratch_mount >>$seq.full 2>&1 \
> +_scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed"
>
> cd $SCRATCH_MNT
> diff --git a/tests/generic/112 b/tests/generic/112
> index bcdcfec..8959c8b 100755
> --- a/tests/generic/112
> +++ b/tests/generic/112
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -134,12 +135,12 @@ numops2=10000
> # can override the params here
> _process_args "$@"
>
> -echo "Params are for $param_type" >>$seq.full
> -echo "Params: n = $numops1 N = $numops2 l = $filelen" >>$seq.full
> +echo "Params are for $param_type" >>$seqres.full
> +echo "Params: n = $numops1 N = $numops2 l = $filelen" >>$seqres.full
>
> _setup_testdir
>
> -rm -f $here/$seq.full
> +rm -f $here/$seqres.full
> echo "brevity is wit..."
>
> _check_test_fs
> diff --git a/tests/generic/113 b/tests/generic/113
> index fd301cd..b2a7317 100755
> --- a/tests/generic/113
> +++ b/tests/generic/113
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/117 b/tests/generic/117
> index 8afc962..624bfd8 100755
> --- a/tests/generic/117
> +++ b/tests/generic/117
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -82,13 +83,13 @@ _setup_testdir
> _require_scratch
> _require_attrs
>
> -rm -f $seq.full
> +rm -f $seqres.full
> umount $SCRATCH_DEV >/dev/null 2>&1
> -echo "*** MKFS ***" >>$seq.full
> -echo "" >>$seq.full
> -_scratch_mkfs >>$seq.full 2>&1 \
> +echo "*** MKFS ***" >>$seqres.full
> +echo "" >>$seqres.full
> +_scratch_mkfs >>$seqres.full 2>&1 \
> || _fail "mkfs failed"
> -_scratch_mount >>$seq.full 2>&1 \
> +_scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed"
>
> mkdir -p $SCRATCH_MNT/fsstress
> @@ -97,10 +98,10 @@ echo
> echo Running fsstress in serial:
> i=0
> while [ $i -lt $ITERATIONS ]; do
> - echo fsstress iteration: $i | tee -a $seq.full
> + echo fsstress iteration: $i | tee -a $seqres.full
> $FSSTRESS_PROG \
> -d $SCRATCH_MNT/fsstress \
> - $fss_ops -S c >>$seq.full 2>&1
> + $fss_ops -S c >>$seqres.full 2>&1
>
> let i=$i+1
> done
> diff --git a/tests/generic/120 b/tests/generic/120
> index 8389925..c3069f1 100755
> --- a/tests/generic/120
> +++ b/tests/generic/120
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/123 b/tests/generic/123
> index d45c516..2387676 100755
> --- a/tests/generic/123
> +++ b/tests/generic/123
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/124 b/tests/generic/124
> index 6fbb028..65c94b4 100755
> --- a/tests/generic/124
> +++ b/tests/generic/124
> @@ -27,6 +27,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/125 b/tests/generic/125
> index c7215a3..f489e96 100755
> --- a/tests/generic/125
> +++ b/tests/generic/125
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/126 b/tests/generic/126
> index a95c1e4..83671df 100755
> --- a/tests/generic/126
> +++ b/tests/generic/126
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/127 b/tests/generic/127
> index d1101df..021a571 100755
> --- a/tests/generic/127
> +++ b/tests/generic/127
> @@ -27,6 +27,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/128 b/tests/generic/128
> index 85d0f45..165aa00 100755
> --- a/tests/generic/128
> +++ b/tests/generic/128
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/129 b/tests/generic/129
> index 18d891b..e74098f 100755
> --- a/tests/generic/129
> +++ b/tests/generic/129
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/130 b/tests/generic/130
> index 943df72..96491f7 100755
> --- a/tests/generic/130
> +++ b/tests/generic/130
> @@ -32,6 +32,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/131 b/tests/generic/131
> index 176c8b4..02835ab 100755
> --- a/tests/generic/131
> +++ b/tests/generic/131
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/132 b/tests/generic/132
> index 98229a9..2abfccf 100755
> --- a/tests/generic/132
> +++ b/tests/generic/132
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/133 b/tests/generic/133
> index ec225f3..478419c 100755
> --- a/tests/generic/133
> +++ b/tests/generic/133
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/135 b/tests/generic/135
> index f0bf9b9..b5854f4 100755
> --- a/tests/generic/135
> +++ b/tests/generic/135
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/141 b/tests/generic/141
> index 45c1b5e..cb7aae2 100755
> --- a/tests/generic/141
> +++ b/tests/generic/141
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/169 b/tests/generic/169
> index 413a86b..6293654 100755
> --- a/tests/generic/169
> +++ b/tests/generic/169
> @@ -23,11 +23,12 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> -rm -f $seq.full
> +rm -f $seqres.full
> status=1 # failure is the default!
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> @@ -56,10 +57,10 @@ _supported_os Linux
>
> _require_scratch
>
> -_scratch_mkfs >>$seq.full 2>&1 \
> +_scratch_mkfs >>$seqres.full 2>&1 \
> || _fail "mkfs scratch failed"
>
> -_scratch_mount >>$seq.full 2>&1 \
> +_scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed: $MOUNT_OPTIONS"
>
> echo "# creating new file for io"
> @@ -73,11 +74,11 @@ xfs_io -F -a -c "pwrite 0 5k" -c "fsync" \
> | _show_wrote_and_stat_only
>
> echo "# unmounting scratch"
> -umount $SCRATCH_MNT>>$seq.full 2>&1 \
> +umount $SCRATCH_MNT>>$seqres.full 2>&1 \
> || _fail "unmount failed"
>
> echo "# mounting scratch"
> -_scratch_mount >>$seq.full 2>&1 \
> +_scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed: $MOUNT_OPTIONS"
>
> echo "# stating file to confirm correct size"
> @@ -90,11 +91,11 @@ xfs_io -F -f -c "pwrite 0 5" -c s -c "pwrite 5 5" \
> | _show_wrote_and_stat_only
>
> echo "# unmounting scratch"
> -umount $SCRATCH_MNT>>$seq.full 2>&1 \
> +umount $SCRATCH_MNT>>$seqres.full 2>&1 \
> || _fail "unmount failed"
>
> echo "# mounting scratch"
> -_scratch_mount >>$seq.full 2>&1 \
> +_scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed: $MOUNT_OPTIONS"
>
> echo "# stating file to confirm correct size"
> diff --git a/tests/generic/184 b/tests/generic/184
> index a37f700..929e0eb 100755
> --- a/tests/generic/184
> +++ b/tests/generic/184
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq - silence is golden"
>
> here=`pwd`
> diff --git a/tests/generic/192 b/tests/generic/192
> index 691ab7d..4b9d0bb 100755
> --- a/tests/generic/192
> +++ b/tests/generic/192
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -53,20 +54,20 @@ delay=40
>
> testfile=$TEST_DIR/testfile
> rm -f $testfile
> -rm -f $seq.full
> +rm -f $seqres.full
>
> echo test >$testfile
> -time1=`_access_time $testfile | tee -a $seq.full`
> +time1=`_access_time $testfile | tee -a $seqres.full`
>
> echo "sleep for $delay"
> sleep $delay # sleep to allow time to move on for access
> cat $testfile
> -time2=`_access_time $testfile | tee -a $seq.full`
> +time2=`_access_time $testfile | tee -a $seqres.full`
>
> cd /
> umount $TEST_DIR
> _test_mount
> -time3=`_access_time $testfile | tee -a $here/$seq.full`
> +time3=`_access_time $testfile | tee -a $here/$seqres.full`
>
> delta1=`expr $time2 - $time1`
> delta2=`expr $time3 - $time1`
> diff --git a/tests/generic/193 b/tests/generic/193
> index 88ab971..8b3b9db 100755
> --- a/tests/generic/193
> +++ b/tests/generic/193
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -247,5 +248,5 @@ _cleanup_files
>
> # success, all done
> echo "*** done"
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> diff --git a/tests/generic/198 b/tests/generic/198
> index 31de96c..5aac37f 100755
> --- a/tests/generic/198
> +++ b/tests/generic/198
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -47,7 +48,7 @@ _require_aiodio aiodio_sparse2
> echo "Silence is golden."
>
> # real QA test starts here
> -rm -f $seq.full
> +rm -f $seqres.full
>
> rm -f "$TEST_DIR/aiodio_sparse*"
> $AIO_TEST "$TEST_DIR/aiodio_sparse"
> diff --git a/tests/generic/204 b/tests/generic/204
> index 6c4a3f0..ae87930 100755
> --- a/tests/generic/204
> +++ b/tests/generic/204
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -44,7 +45,7 @@ _scratch_mount
>
> # fix the reserve block pool to a known size so that the enospc calculations
> # work out correctly.
> -_scratch_resvblks 1024 > $seq.full 2>&1
> +_scratch_resvblks 1024 > $seqres.full 2>&1
>
> for i in `seq 1 22500`; do
> echo -n > $SCRATCH_MNT/$i
> @@ -53,5 +54,5 @@ done
>
> # success, all done
> echo "*** done"
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> diff --git a/tests/generic/207 b/tests/generic/207
> index 6eaf50c..b520bee 100755
> --- a/tests/generic/207
> +++ b/tests/generic/207
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/208 b/tests/generic/208
> index 7ea7514..4c34e7b 100755
> --- a/tests/generic/208
> +++ b/tests/generic/208
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/209 b/tests/generic/209
> index 8b2a4e1..82d5e6a 100755
> --- a/tests/generic/209
> +++ b/tests/generic/209
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/210 b/tests/generic/210
> index 56ac8ad..16908cc 100755
> --- a/tests/generic/210
> +++ b/tests/generic/210
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/211 b/tests/generic/211
> index 5667d20..6d7b996 100755
> --- a/tests/generic/211
> +++ b/tests/generic/211
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/212 b/tests/generic/212
> index e211cc4..6e86e94 100755
> --- a/tests/generic/212
> +++ b/tests/generic/212
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/213 b/tests/generic/213
> index e297fdf..1fa573c 100755
> --- a/tests/generic/213
> +++ b/tests/generic/213
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> _cleanup()
> @@ -51,7 +52,7 @@ _supported_os Linux
>
> [ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found"
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> _require_xfs_io_falloc
>
> diff --git a/tests/generic/214 b/tests/generic/214
> index 0a27fc5..20acca1 100755
> --- a/tests/generic/214
> +++ b/tests/generic/214
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> _cleanup()
> @@ -49,7 +50,7 @@ _supported_os Linux
>
> [ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found"
>
> -rm -f $seq.full
> +rm -f $seqres.full
> rm -f $TEST_DIR/ouch*
>
> _require_xfs_io_falloc
> diff --git a/tests/generic/215 b/tests/generic/215
> index 749b27b..73cdd14 100755
> --- a/tests/generic/215
> +++ b/tests/generic/215
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> _cleanup()
> @@ -79,5 +80,5 @@ fi
>
> # success, all done
> echo "*** done"
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> diff --git a/tests/generic/219 b/tests/generic/219
> index 047e285..3a8deb6 100755
> --- a/tests/generic/219
> +++ b/tests/generic/219
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -76,17 +77,17 @@ check_usage()
> test_accounting()
> {
> echo "### some controlled buffered, direct and mmapd IO (type=$type)"
> - echo "--- initiating parallel IO..." >>$seq.full
> + echo "--- initiating parallel IO..." >>$seqres.full
> # Small ios here because ext3 will account for indirect blocks too ...
> # 48k will fit w/o indirect for 4k blocks (default blocksize)
> $XFS_IO_PROG -F -c 'pwrite 0 48k' -c 'fsync' \
> - $SCRATCH_MNT/buffer >>$seq.full 2>&1 &
> + $SCRATCH_MNT/buffer >>$seqres.full 2>&1 &
> $XFS_IO_PROG -F -c 'pwrite 0 48k' -d \
> - $SCRATCH_MNT/direct >>$seq.full 2>&1 &
> + $SCRATCH_MNT/direct >>$seqres.full 2>&1 &
> $XFS_IO_PROG -F -c 't 48k' -c 'mm -rw 0 48k' -c 'mw 0 48k' -c 'ms -s' \
> - $SCRATCH_MNT/mmap >>$seq.full 2>&1 &
> + $SCRATCH_MNT/mmap >>$seqres.full 2>&1 &
> wait
> - echo "--- completed parallel IO ($type)" >>$seq.full
> + echo "--- completed parallel IO ($type)" >>$seqres.full
>
> for file in $SCRATCH_MNT/{buffer,direct,mmap}; do
> $here/src/lstat64 $file | head -3 | _filter_scratch
> @@ -101,13 +102,13 @@ test_accounting()
> }
>
> # real QA test starts here
> -rm -f $seq.full
> +rm -f $seqres.full
>
> uid=1
> gid=2
>
> umount $SCRATCH_DEV 2>/dev/null
> -_scratch_mkfs >> $seq.full 2>&1
> +_scratch_mkfs >> $seqres.full 2>&1
> _scratch_mount "-o usrquota,grpquota"
> quotacheck -u -g $SCRATCH_MNT 2>/dev/null
> quotaon $SCRATCH_MNT 2>/dev/null
> diff --git a/tests/generic/221 b/tests/generic/221
> index 9cab3c4..7fca5bb 100755
> --- a/tests/generic/221
> +++ b/tests/generic/221
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/223 b/tests/generic/223
> index 8eba2d7..a6932da 100755
> --- a/tests/generic/223
> +++ b/tests/generic/223
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -47,7 +48,7 @@ _supported_os Linux
> _require_scratch
> _require_xfs_io_falloc
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> BLOCKSIZE=4096
>
> @@ -57,7 +58,7 @@ for SUNIT_K in 8 16 32 64 128; do
>
> echo "=== mkfs with su $SUNIT_BLOCKS blocks x 4 ==="
> export MKFS_OPTIONS=""
> - _scratch_mkfs_geom $SUNIT_BYTES 4 $BLOCKSIZE >> $seq.full 2>&1
> + _scratch_mkfs_geom $SUNIT_BYTES 4 $BLOCKSIZE >> $seqres.full 2>&1
> _scratch_mount
>
> for SIZE_MULT in 1 2 8 64 256; do
> @@ -67,10 +68,10 @@ for SUNIT_K in 8 16 32 64 128; do
> for FILE in 1 2 3 4; do
> xfs_io -F -f -c "falloc 0 $SIZE" \
> $SCRATCH_MNT/file-$FILE-$SIZE-falloc \
> - >> $seq.full 2>&1
> + >> $seqres.full 2>&1
> xfs_io -F -f -c "pwrite 0 $SIZE" \
> $SCRATCH_MNT/file-$FILE-$SIZE-write \
> - >> $seq.full 2>&1
> + >> $seqres.full 2>&1
> src/t_stripealign $SCRATCH_MNT/file-$FILE-$SIZE-falloc \
> $SUNIT_BLOCKS | _filter_scratch
> src/t_stripealign $SCRATCH_MNT/file-$FILE-$SIZE-write \
> @@ -80,7 +81,7 @@ for SUNIT_K in 8 16 32 64 128; do
>
> echo "=== Testing size 1g falloc on ${SUNIT_K}k stripe ==="
> xfs_io -F -f -c "falloc 0 1g" \
> - $SCRATCH_MNT/file-1g-falloc >> $seq.full 2>&1
> + $SCRATCH_MNT/file-1g-falloc >> $seqres.full 2>&1
> src/t_stripealign $SCRATCH_MNT/file-1g-falloc $SUNIT_BLOCKS \
> | _filter_scratch
>
> @@ -88,7 +89,7 @@ for SUNIT_K in 8 16 32 64 128; do
>
> echo "=== Testing size 1073745920 falloc on ${SUNIT_K}k stripe ==="
> xfs_io -F -f -c "falloc 0 1073745920" \
> - $SCRATCH_MNT/file-1073745920-falloc >> $seq.full 2>&1
> + $SCRATCH_MNT/file-1073745920-falloc >> $seqres.full 2>&1
> src/t_stripealign $SCRATCH_MNT/file-1073745920-falloc \
> $SUNIT_BLOCKS | _filter_scratch
>
> diff --git a/tests/generic/224 b/tests/generic/224
> index 23ee7c2..313d9c2 100755
> --- a/tests/generic/224
> +++ b/tests/generic/224
> @@ -28,6 +28,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -53,12 +54,12 @@ _supported_os Linux
> _require_scratch
>
> # make a 1GB filesystem
> -_scratch_mkfs_sized `expr 1024 \* 1024 \* 1024` > $seq.full 2>&1
> -_scratch_mount >> $seq.full 2>&1
> +_scratch_mkfs_sized `expr 1024 \* 1024 \* 1024` > $seqres.full 2>&1
> +_scratch_mount >> $seqres.full 2>&1
>
> # set the reserved block pool to almost empty for XFS
> if [ "$FSTYP" = "xfs" ]; then
> - xfs_io -x -c "resblks 4" $SCRATCH_MNT >> $seq.full 2>&1
> + xfs_io -x -c "resblks 4" $SCRATCH_MNT >> $seqres.full 2>&1
> fi
>
> FILES=1000
> diff --git a/tests/generic/225 b/tests/generic/225
> index c09bd2a..ea44f2e 100755
> --- a/tests/generic/225
> +++ b/tests/generic/225
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -48,7 +49,7 @@ _require_scratch
> _scratch_mkfs > /dev/null 2>&1
> _scratch_mount > /dev/null 2>&1
>
> -rm -f $seq.full
> +rm -f $seqres.full
> fiemapfile=$SCRATCH_MNT/$seq.fiemap
> fiemaplog=$SCRATCH_MNT/$seq.log
>
> diff --git a/tests/generic/226 b/tests/generic/226
> index 2179f2a..da45c9e 100755
> --- a/tests/generic/226
> +++ b/tests/generic/226
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -38,11 +39,11 @@ _supported_os Linux IRIX
> _require_scratch
>
> # real QA test starts here
> -rm -f $seq.full
> +rm -f $seqres.full
>
> umount $SCRATCH_DEV 2>/dev/null
> echo "--> mkfs 256m filesystem"
> -_scratch_mkfs_sized `expr 256 \* 1024 \* 1024` >> $seq.full 2>&1
> +_scratch_mkfs_sized `expr 256 \* 1024 \* 1024` >> $seqres.full 2>&1
> _scratch_mount
>
> loops=16
> @@ -54,7 +55,7 @@ echo "--> $loops buffered 64m writes in a loop"
> for I in `seq 1 $loops`; do
> echo -n "$I "
> xfs_io -F -f \
> - -c "pwrite ${buffer} 0 64m" $SCRATCH_MNT/test >> $seq.full
> + -c "pwrite ${buffer} 0 64m" $SCRATCH_MNT/test >> $seqres.full
> rm -f $SCRATCH_MNT/test
> done
>
> @@ -66,7 +67,7 @@ echo "--> $loops direct 64m writes in a loop"
> for I in `seq 1 $loops`; do
> echo -n "$I "
> xfs_io -F -f -d \
> - -c "pwrite ${buffer} 0 64m" $SCRATCH_MNT/test >> $seq.full
> + -c "pwrite ${buffer} 0 64m" $SCRATCH_MNT/test >> $seqres.full
> rm -f $SCRATCH_MNT/test
> done
>
> diff --git a/tests/generic/228 b/tests/generic/228
> index 2704934..c8af133 100755
> --- a/tests/generic/228
> +++ b/tests/generic/228
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> _cleanup()
> @@ -49,7 +50,7 @@ _supported_os Linux
>
> [ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found"
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> # Sanity check to see if fallocate works
> _require_xfs_io_falloc
> diff --git a/tests/generic/230 b/tests/generic/230
> index a442857..c3db20b 100755
> --- a/tests/generic/230
> +++ b/tests/generic/230
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -58,49 +59,49 @@ test_files()
> test_enforcement()
> {
> echo "### some buffered IO (type=$type)"
> - echo "--- initiating IO..." >>$seq.full
> + echo "--- initiating IO..." >>$seqres.full
> # Firstly fit below block soft limit
> echo "Write 900k..."
> su $qa_user -c "$XFS_IO_PROG -F -c 'pwrite 0 900k' -c fsync \
> - $SCRATCH_MNT/file1" 2>&1 >>$seq.full | tee -a $seq.full
> - repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seq.full 2>&1
> + $SCRATCH_MNT/file1" 2>&1 >>$seqres.full | tee -a $seqres.full
> + repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
> # Secondly overcome block soft limit
> echo "Rewrite 1001k..."
> su $qa_user -c "$XFS_IO_PROG -F -c 'pwrite 0 1001k' -c fsync \
> - $SCRATCH_MNT/file1" 2>&1 >>$seq.full | tee -a $seq.full
> - repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seq.full 2>&1
> + $SCRATCH_MNT/file1" 2>&1 >>$seqres.full | tee -a $seqres.full
> + repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
> # Now try to overcome block hardlimit
> echo "Write 1000k..."
> su $qa_user -c "$XFS_IO_PROG -F -c 'pwrite 0 1000k' -c fsync \
> - $SCRATCH_MNT/file2" 2>&1 >>$seq.full | tee -a $seq.full
> - repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seq.full 2>&1
> + $SCRATCH_MNT/file2" 2>&1 >>$seqres.full | tee -a $seqres.full
> + repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
> # Now sleep for grace time and check that softlimit got enforced
> sleep $((grace+1))
> echo "Write 4096..."
> su $qa_user -c "$XFS_IO_PROG -F -c 'truncate 0' -c 'pwrite 0 4096' \
> - $SCRATCH_MNT/file2" 2>&1 >>$seq.full | tee -a $seq.full
> - repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seq.full 2>&1
> + $SCRATCH_MNT/file2" 2>&1 >>$seqres.full | tee -a $seqres.full
> + repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
> # And now the softlimit test for inodes
> # First reset space limits so that we don't have problems with
> # space reservations on XFS
> setquota -$type $qa_user 0 0 3 5 $SCRATCH_MNT
> echo "Touch 3+4"
> su $qa_user -c "touch $SCRATCH_MNT/file3 $SCRATCH_MNT/file4" \
> - 2>&1 >>$seq.full | _filter_scratch | tee -a $seq.full
> - repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seq.full 2>&1
> + 2>&1 >>$seqres.full | _filter_scratch | tee -a $seqres.full
> + repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
> # Try to exceed inode hardlimit
> echo "Touch 5+6"
> su $qa_user -c "touch $SCRATCH_MNT/file5 $SCRATCH_MNT/file6" \
> - 2>&1 >>$seq.full | _filter_scratch | tee -a $seq.full
> - repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seq.full 2>&1
> + 2>&1 >>$seqres.full | _filter_scratch | tee -a $seqres.full
> + repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
> # Wait and check grace time enforcement
> - rm -f $SCRATCH_MNT/file5 >>$seq.full 2>&1
> + rm -f $SCRATCH_MNT/file5 >>$seqres.full 2>&1
> sleep $((grace+1))
> echo "Touch 5"
> - su $qa_user -c "touch $SCRATCH_MNT/file5" 2>&1 >>$seq.full |
> - _filter_scratch | tee -a $seq.full
> - repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seq.full 2>&1
> - echo "--- completed IO ($type)" >>$seq.full
> + su $qa_user -c "touch $SCRATCH_MNT/file5" 2>&1 >>$seqres.full |
> + _filter_scratch | tee -a $seqres.full
> + repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
> + echo "--- completed IO ($type)" >>$seqres.full
> }
>
> cleanup_files()
> @@ -109,11 +110,11 @@ cleanup_files()
> }
>
> # real QA test starts here
> -rm -f $seq.full
> +rm -f $seqres.full
>
> grace=2
>
> -_scratch_mkfs >> $seq.full 2>&1
> +_scratch_mkfs >> $seqres.full 2>&1
> _scratch_mount "-o usrquota,grpquota"
> quotacheck -u -g $SCRATCH_MNT 2>/dev/null
> quotaon $SCRATCH_MNT 2>/dev/null
> diff --git a/tests/generic/231 b/tests/generic/231
> index 6d8bda7..1a434d4 100755
> --- a/tests/generic/231
> +++ b/tests/generic/231
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -45,19 +46,19 @@ _fsx()
> echo "=== FSX Standard Mode, Memory Mapping, $tasks Tasks ==="
> for (( i = 1; i <= $tasks; i++ )); do
> SEED=$RANDOM
> - echo "ltp/fsx $FSX_ARGS -S $SEED $SCRATCH_MNT/fsx_file$i" >>$seq.full
> + echo "ltp/fsx $FSX_ARGS -S $SEED $SCRATCH_MNT/fsx_file$i" >>$seqres.full
> su $qa_user -c "ltp/fsx $FSX_ARGS -S $SEED \
> $SCRATCH_MNT/fsx_file$i" >$tmp.output$i 2>&1 &
> done
>
> for (( i = 1; i <= $tasks; i++ )); do
> if ! wait %$i; then
> - cat $tmp.output$i | tee -a $seq.full
> + cat $tmp.output$i | tee -a $seqres.full
> wait
> return 1
> fi
> $XFS_IO_PROG -F -c 'fsync' $SCRATCH_MNT/fsx_file$i
> - cat $tmp.output$i | tee -a $seq.full
> + cat $tmp.output$i | tee -a $seqres.full
> done
> return 0
> }
> @@ -70,7 +71,7 @@ _require_quota
> _require_user
> _need_to_be_root
>
> -_scratch_mkfs >> $seq.full 2>&1
> +_scratch_mkfs >> $seqres.full 2>&1
> _scratch_mount "-o usrquota,grpquota"
> chmod 777 $SCRATCH_MNT
> quotacheck -u -g $SCRATCH_MNT 2>/dev/null
> diff --git a/tests/generic/232 b/tests/generic/232
> index 81cd3ca..f716ede 100755
> --- a/tests/generic/232
> +++ b/tests/generic/232
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -38,7 +39,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
>
> _filter_num()
> {
> - tee -a $here/$seq.full |\
> + tee -a $here/$seqres.full |\
> sed -e 's/[0-9][0-9]* inodes/I inodes/g' \
> -e 's/[0-9][0-9]* paths/P paths/g' \
> -e 's/seed = [0-9][0-9]*/seed = S/'
> @@ -54,11 +55,11 @@ _fsstress()
> count=2000
> args="-n $count -d $out -p 7"
>
> - echo "fsstress $args" | tee -a $here/$seq.full | sed -e "s#$out#outdir#"
> - if ! $FSSTRESS_PROG $args | tee -a $here/$seq.full | _filter_num
> + echo "fsstress $args" | tee -a $here/$seqres.full | sed -e "s#$out#outdir#"
> + if ! $FSSTRESS_PROG $args | tee -a $here/$seqres.full | _filter_num
> then
> echo " fsstress $args returned $?"
> - cat $tmp.out | tee -a $here/$seq.full
> + cat $tmp.out | tee -a $here/$seqres.full
> status=1
> fi
> }
> @@ -70,7 +71,7 @@ _require_scratch
> _require_quota
> _need_to_be_root
>
> -_scratch_mkfs >> $seq.full 2>&1
> +_scratch_mkfs >> $seqres.full 2>&1
> _scratch_mount "-o usrquota,grpquota"
> chmod 777 $SCRATCH_MNT
> quotacheck -u -g $SCRATCH_MNT 2>/dev/null
> diff --git a/tests/generic/233 b/tests/generic/233
> index 52d2259..f0fde22 100755
> --- a/tests/generic/233
> +++ b/tests/generic/233
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -42,7 +43,7 @@ FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -S 191110531 -N 100000"
>
> _filter_num()
> {
> - tee -a $here/$seq.full |\
> + tee -a $here/$seqres.full |\
> sed -e 's/[0-9][0-9]* inodes/I inodes/g' \
> -e 's/[0-9][0-9]* paths/P paths/g' \
> -e 's/seed = [0-9][0-9]*/seed = S/'
> @@ -61,11 +62,11 @@ _fsstress()
> -f rename=10 -f fsync=2 -f write=15 -f dwrite=15 \
> -n $count -d $out -p 7"
>
> - echo "fsstress $args" | tee -a $here/$seq.full | sed -e "s#$out#outdir#"
> - if ! su $qa_user -c "$FSSTRESS_PROG $args" | tee -a $here/$seq.full | _filter_num
> + echo "fsstress $args" | tee -a $here/$seqres.full | sed -e "s#$out#outdir#"
> + if ! su $qa_user -c "$FSSTRESS_PROG $args" | tee -a $here/$seqres.full | _filter_num
> then
> echo " fsstress $args returned $?"
> - cat $tmp.out | tee -a $here/$seq.full
> + cat $tmp.out | tee -a $here/$seqres.full
> status=1
> fi
> }
> @@ -78,7 +79,7 @@ _require_quota
> _require_user
> _need_to_be_root
>
> -_scratch_mkfs >> $seq.full 2>&1
> +_scratch_mkfs >> $seqres.full 2>&1
> _scratch_mount "-o usrquota,grpquota"
> chmod 777 $SCRATCH_MNT
> quotacheck -u -g $SCRATCH_MNT 2>/dev/null
> diff --git a/tests/generic/234 b/tests/generic/234
> index dbb13f6..e5c94e9 100755
> --- a/tests/generic/234
> +++ b/tests/generic/234
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -46,7 +47,7 @@ test_setting()
> idmod=200000
> seed=$RANDOM
> RANDOM=$seed
> - echo "Starting test with procs=$procs, idmod=$idmod, and seed=$seed" >>$seq.full
> + echo "Starting test with procs=$procs, idmod=$idmod, and seed=$seed" >>$seqres.full
>
> for (( i = 0; i < $procs; i++ )); do
> ( SETUCOUNT=1; SETGCOUNT=1; SETUIDS[0]=0; SETGIDS[0]=0
> @@ -93,9 +94,9 @@ _require_quota
> _need_to_be_root
>
> # real QA test starts here
> -rm -f $seq.full
> +rm -f $seqres.full
>
> -_scratch_mkfs >> $seq.full 2>&1
> +_scratch_mkfs >> $seqres.full 2>&1
> _scratch_mount "-o usrquota,grpquota"
> quotacheck -u -g $SCRATCH_MNT 2>/dev/null
> quotaon -u -g $SCRATCH_MNT 2>/dev/null
> diff --git a/tests/generic/235 b/tests/generic/235
> index f4a1fce..85ed782 100755
> --- a/tests/generic/235
> +++ b/tests/generic/235
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -47,9 +48,9 @@ _require_user
> _need_to_be_root
>
> # real QA test starts here
> -rm -f $seq.full
> +rm -f $seqres.full
>
> -_scratch_mkfs >> $seq.full 2>&1
> +_scratch_mkfs >> $seqres.full 2>&1
> _scratch_mount "-o usrquota,grpquota"
> quotacheck -u -g $SCRATCH_MNT 2>/dev/null
> quotaon $SCRATCH_MNT 2>/dev/null
> @@ -64,12 +65,12 @@ repquota -u -g $SCRATCH_MNT | grep -v "^root" | _filter_scratch
> #
> # We work around it by editing the context out of mtab. Sigh.
> sed -i "s#^$SCRATCH_DEV\(.*\),context=\"system_u:object_r:nfs_t:s0\"#$SCRATCH_DEV\1#" /etc/mtab
> -mount -o remount,ro $SCRATCH_DEV 2>&1 | tee -a $seq.full | _filter_scratch
> -touch $SCRATCH_MNT/failed 2>&1 | tee -a $seq.full | _filter_scratch
> -mount -o remount,rw $SCRATCH_DEV 2>&1 | tee -a $seq.full | _filter_scratch
> +mount -o remount,ro $SCRATCH_DEV 2>&1 | tee -a $seqres.full | _filter_scratch
> +touch $SCRATCH_MNT/failed 2>&1 | tee -a $seqres.full | _filter_scratch
> +mount -o remount,rw $SCRATCH_DEV 2>&1 | tee -a $seqres.full | _filter_scratch
>
> $XFS_IO_PROG -F -c 'pwrite 0 8k' -c 'fsync' \
> - $SCRATCH_MNT/testfile >>$seq.full 2>&1
> + $SCRATCH_MNT/testfile >>$seqres.full 2>&1
> repquota -u -g $SCRATCH_MNT | grep -v "^root" | _filter_scratch
>
> umount $SCRATCH_DEV 2>/dev/null
> diff --git a/tests/generic/236 b/tests/generic/236
> index ec70cdb..016afae 100755
> --- a/tests/generic/236
> +++ b/tests/generic/236
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> _cleanup()
> diff --git a/tests/generic/237 b/tests/generic/237
> index 7ebb88e..7e54aed 100755
> --- a/tests/generic/237
> +++ b/tests/generic/237
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -52,7 +53,7 @@ _supported_os Linux
>
> [ -x $runas ] || _notrun "$runas executable not found"
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> _setup_testdir
>
> diff --git a/tests/generic/239 b/tests/generic/239
> index 8aa4ed0..e25a6a0 100755
> --- a/tests/generic/239
> +++ b/tests/generic/239
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/240 b/tests/generic/240
> index d5f8940..77fffe8 100755
> --- a/tests/generic/240
> +++ b/tests/generic/240
> @@ -29,6 +29,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -55,7 +56,7 @@ _require_aiodio aiodio_sparse2
> echo "Silence is golden."
>
> # real QA test starts here
> -rm -f $seq.full
> +rm -f $seqres.full
>
> rm -f $TEST_DIR/aiodio_sparse
>
> diff --git a/tests/generic/241 b/tests/generic/241
> index ee572a7..b55344b 100755
> --- a/tests/generic/241
> +++ b/tests/generic/241
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -47,12 +48,12 @@ _supported_os Linux
> echo "Silence is golden."
>
> # real QA test starts here
> -rm -f $seq.full
> +rm -f $seqres.full
>
> rm -rf $TEST_DIR/dbench
> mkdir $TEST_DIR/dbench
>
> -dbench -t 60 -D $TEST_DIR/dbench 4 >> $seq.full
> +dbench -t 60 -D $TEST_DIR/dbench 4 >> $seqres.full
>
> status=$?
> exit
> diff --git a/tests/generic/245 b/tests/generic/245
> index fb81d39..9832e92 100755
> --- a/tests/generic/245
> +++ b/tests/generic/245
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/246 b/tests/generic/246
> index d82e27d..872e513 100755
> --- a/tests/generic/246
> +++ b/tests/generic/246
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/247 b/tests/generic/247
> index 3a2f735..8a7e2c6 100755
> --- a/tests/generic/247
> +++ b/tests/generic/247
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/248 b/tests/generic/248
> index f245c1c..7bb42a1 100755
> --- a/tests/generic/248
> +++ b/tests/generic/248
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/249 b/tests/generic/249
> index e72092d..288328c 100755
> --- a/tests/generic/249
> +++ b/tests/generic/249
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -50,11 +51,11 @@ echo "Feel the serenity."
>
> SRC=$TEST_DIR/$seq.src
> DST=$TEST_DIR/$seq.dst
> -rm -f $seq.full
> +rm -f $seqres.full
>
> -$XFS_IO_PROG -F -f -c "pwrite -S 0xa5a55a5a 0 32768k" -c fsync $SRC >> $seq.full 2>&1
> +$XFS_IO_PROG -F -f -c "pwrite -S 0xa5a55a5a 0 32768k" -c fsync $SRC >> $seqres.full 2>&1
> [ $? -ne 0 ] && _fail "xfs_io pwrite failed"
> -$XFS_IO_PROG -F -f -c "sendfile -i $SRC 0 32768k" -c fsync $DST >> $seq.full 2>&1
> +$XFS_IO_PROG -F -f -c "sendfile -i $SRC 0 32768k" -c fsync $DST >> $seqres.full 2>&1
> [ $? -ne 0 ] && _fail "xfs_io sendfile failed"
>
> diff -q $SRC $DST
> diff --git a/tests/generic/251 b/tests/generic/251
> index c5fc79e..f49f1e9 100755
> --- a/tests/generic/251
> +++ b/tests/generic/251
> @@ -25,6 +25,7 @@
>
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/255 b/tests/generic/255
> index e08c726..8db0978 100755
> --- a/tests/generic/255
> +++ b/tests/generic/255
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/256 b/tests/generic/256
> index 0d72795..d60584b 100755
> --- a/tests/generic/256
> +++ b/tests/generic/256
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/257 b/tests/generic/257
> index b58bd56..09a8fd8 100755
> --- a/tests/generic/257
> +++ b/tests/generic/257
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -50,5 +51,5 @@ src/t_dir_offset2 $TEST_DIR/ttt
>
> # success, all done
> echo "*** done"
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> diff --git a/tests/generic/258 b/tests/generic/258
> index 87817bc..ac03bb5 100755
> --- a/tests/generic/258
> +++ b/tests/generic/258
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/260 b/tests/generic/260
> index 5bd3b39..032baa5 100755
> --- a/tests/generic/260
> +++ b/tests/generic/260
> @@ -23,6 +23,7 @@
>
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/generic/263 b/tests/generic/263
> index 18cd5de..3e86efc 100755
> --- a/tests/generic/263
> +++ b/tests/generic/263
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -38,16 +39,16 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> _supported_fs generic
> _supported_os Linux
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> run_fsx()
> {
> - echo fsx $@ | tee -a $seq.full
> + echo fsx $@ | tee -a $seqres.full
> args=`echo $@ | sed -e "s/ BSIZE / $bsize /g" -e "s/ PSIZE / $psize /g"`
> rm -f $TEST_DIR/junk
> - $here/ltp/fsx $args $TEST_DIR/junk >>$seq.full 2>&1
> + $here/ltp/fsx $args $TEST_DIR/junk >>$seqres.full 2>&1
> if [ $? -ne 0 ]; then
> - cat $seq.full
> + cat $seqres.full
> exit 1
> fi
> }
> diff --git a/tests/generic/269 b/tests/generic/269
> index 5bf24af..3c5f68a 100755
> --- a/tests/generic/269
> +++ b/tests/generic/269
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -44,7 +45,7 @@ _workout()
> enospc_time=2
> out=$SCRATCH_MNT/fsstress.$$
> args="-p128 -n999999999 -f setattr=1 $FSSTRESS_AVOID -d $out"
> - echo "fsstress $args" >> $here/$seq.full
> + echo "fsstress $args" >> $here/$seqres.full
> $FSSTRESS_PROG $args > /dev/null 2>&1 &
> pid=$!
> echo "Run dd writers in parallel"
> @@ -52,7 +53,7 @@ _workout()
> do
> # File will be opened with O_TRUNC each time
> dd if=/dev/zero of=$SCRATCH_MNT/SPACE_CONSUMER bs=1M \
> - >> $here/$seq.full 2>&1
> + >> $here/$seqres.full 2>&1
> sleep $enospc_time
> done
> kill $pid
> @@ -65,7 +66,7 @@ _supported_os Linux
> _need_to_be_root
> _require_scratch
>
> -_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seq.full 2>&1
> +_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full 2>&1
> _scratch_mount
>
> if ! _workout; then
> diff --git a/tests/generic/270 b/tests/generic/270
> index c095606..8d6555b 100755
> --- a/tests/generic/270
> +++ b/tests/generic/270
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -47,7 +48,7 @@ _workout()
> enospc_time=2
> out=$SCRATCH_MNT/fsstress.$$
> args="-p128 -n999999999 -f setattr=1 $FSSTRESS_AVOID -d $out"
> - echo "fsstress $args" >> $here/$seq.full
> + echo "fsstress $args" >> $here/$seqres.full
> # Grant chown capability
> cp $FSSTRESS_PROG $tmp.fsstress.bin
> if [ "`whereis setcap`" == "setcap:" ]; then
> @@ -64,7 +65,7 @@ _workout()
> # File will be opened with O_TRUNC each time
> su $qa_user -c "dd if=/dev/zero \
> of=$SCRATCH_MNT/SPACE_CONSUMER bs=1M " \
> - >> $here/$seq.full 2>&1
> + >> $here/$seqres.full 2>&1
> sleep $enospc_time
> done
>
> @@ -80,7 +81,7 @@ _require_user
> _need_to_be_root
> _require_scratch
>
> -_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seq.full 2>&1
> +_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full 2>&1
> _scratch_mount "-o usrquota,grpquota"
> chmod 777 $SCRATCH_MNT
> quotacheck -u -g $SCRATCH_MNT 2>/dev/null
> diff --git a/tests/generic/273 b/tests/generic/273
> index 9a40394..5a8d593 100755
> --- a/tests/generic/273
> +++ b/tests/generic/273
> @@ -24,6 +24,7 @@
> #creator
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -91,7 +92,7 @@ _porter()
> exit
> fi
>
> - cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seq.full 2>&1
> + cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seqres.full 2>&1
> if [ $? -ne 0 ]
> then
> echo "_porter $_suffix not complete"
> @@ -129,10 +130,10 @@ echo "------------------------------"
> echo "start the workload"
> echo "------------------------------"
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> _scratch_unmount 2>/dev/null
> -_scratch_mkfs_sized $((2 * 1024 * 1024 * 1024)) >>$seq.full 2>&1
> +_scratch_mkfs_sized $((2 * 1024 * 1024 * 1024)) >>$seqres.full 2>&1
> _scratch_mount
>
> _do_workload
> diff --git a/tests/generic/274 b/tests/generic/274
> index 9b0fb71..d5f09a4 100755
> --- a/tests/generic/274
> +++ b/tests/generic/274
> @@ -26,6 +26,7 @@
> #creator
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -53,48 +54,48 @@ echo "------------------------------"
> echo "preallocation test"
> echo "------------------------------"
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> umount $SCRATCH_DEV 2>/dev/null
> -_scratch_mkfs_sized $((1 * 1024 * 1024 * 1024)) >>$seq.full 2>&1
> +_scratch_mkfs_sized $((1 * 1024 * 1024 * 1024)) >>$seqres.full 2>&1
> _scratch_mount
>
> # Create a 4k file and Allocate 4M past EOF on that file
> xfs_io -F -f -c "pwrite 0 4k" -c "falloc -k 4k 4m" $SCRATCH_MNT/test \
> - >>$seq.full 2>&1 || _fail "failed to create test file"
> + >>$seqres.full 2>&1 || _fail "failed to create test file"
>
> # Fill the rest of the fs completely
> -# Note, this will show ENOSPC errors in $seq.full, that's ok.
> -echo "Fill fs with 1M IOs; ENOSPC expected" >> $seq.full
> -dd if=/dev/zero of=$SCRATCH_MNT/tmp1 bs=1M >>$seq.full 2>&1
> -echo "Fill fs with 4K IOs; ENOSPC expected" >> $seq.full
> -dd if=/dev/zero of=$SCRATCH_MNT/tmp2 bs=4K >>$seq.full 2>&1
> +# Note, this will show ENOSPC errors in $seqres.full, that's ok.
> +echo "Fill fs with 1M IOs; ENOSPC expected" >> $seqres.full
> +dd if=/dev/zero of=$SCRATCH_MNT/tmp1 bs=1M >>$seqres.full 2>&1
> +echo "Fill fs with 4K IOs; ENOSPC expected" >> $seqres.full
> +dd if=/dev/zero of=$SCRATCH_MNT/tmp2 bs=4K >>$seqres.full 2>&1
> sync
> # Last effort, use O_SYNC
> -echo "Fill fs with 4K DIOs; ENOSPC expected" >> $seq.full
> -dd if=/dev/zero of=$SCRATCH_MNT/tmp3 bs=4K oflag=sync >>$seq.full 2>&1
> +echo "Fill fs with 4K DIOs; ENOSPC expected" >> $seqres.full
> +dd if=/dev/zero of=$SCRATCH_MNT/tmp3 bs=4K oflag=sync >>$seqres.full 2>&1
> # Save space usage info
> -echo "Post-fill space:" >> $seq.full
> -df $SCRATCH_MNT >>$seq.full 2>&1
> +echo "Post-fill space:" >> $seqres.full
> +df $SCRATCH_MNT >>$seqres.full 2>&1
>
> # Now attempt a write into all of the preallocated space -
> # in a very nasty way, badly fragmenting it and then filling it in.
> -echo "Fill in prealloc space; fragment at offsets:" >> $seq.full
> +echo "Fill in prealloc space; fragment at offsets:" >> $seqres.full
> for i in `seq 1 2 1023`; do
> - echo -n "$i " >> $seq.full
> + echo -n "$i " >> $seqres.full
> dd if=/dev/zero of=$SCRATCH_MNT/test seek=$i bs=4K count=1 conv=notrunc \
> - >>$seq.full 2>/dev/null || _fail "failed to write to test file"
> + >>$seqres.full 2>/dev/null || _fail "failed to write to test file"
> done
> sync
> -echo >> $seq.full
> -echo "Fill in prealloc space; fill holes at offsets:" >> $seq.full
> +echo >> $seqres.full
> +echo "Fill in prealloc space; fill holes at offsets:" >> $seqres.full
> for i in `seq 2 2 1023`; do
> - echo -n "$i " >> $seq.full
> + echo -n "$i " >> $seqres.full
> dd if=/dev/zero of=$SCRATCH_MNT/test seek=$i bs=4K count=1 conv=notrunc \
> - >>$seq.full 2>/dev/null || _fail "failed to fill test file"
> + >>$seqres.full 2>/dev/null || _fail "failed to fill test file"
> done
> sync
> -echo >> $seq.full
> +echo >> $seqres.full
>
> echo "done"
> exit
> diff --git a/tests/generic/275 b/tests/generic/275
> index 5bf06e4..949ffdb 100755
> --- a/tests/generic/275
> +++ b/tests/generic/275
> @@ -25,6 +25,7 @@
> #creator
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -51,10 +52,10 @@ echo "------------------------------"
> echo "write lack test"
> echo "------------------------------"
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> umount $SCRATCH_DEV 2>/dev/null
> -_scratch_mkfs_sized $((1 * 1024 * 1024 * 1024)) >>$seq.full 2>&1
> +_scratch_mkfs_sized $((1 * 1024 * 1024 * 1024)) >>$seqres.full 2>&1
> _scratch_mount
>
> rm -rf $SCRATCH_MNT/*
> diff --git a/tests/generic/277 b/tests/generic/277
> index 8ef809c..b85e429 100755
> --- a/tests/generic/277
> +++ b/tests/generic/277
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> status=1 # failure is the default!
> diff --git a/tests/generic/280 b/tests/generic/280
> index 69c9afd..a43c211 100755
> --- a/tests/generic/280
> +++ b/tests/generic/280
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -52,7 +53,7 @@ _supported_os Linux
> _supported_fs ext3 ext4 xfs
>
> umount $SCRATCH_DEV 2>/dev/null
> -_scratch_mkfs >> $seq.full 2>&1
> +_scratch_mkfs >> $seqres.full 2>&1
> _scratch_mount "-o usrquota,grpquota"
> quotacheck -u -g $SCRATCH_MNT 2>/dev/null
> quotaon $SCRATCH_MNT 2>/dev/null
> diff --git a/tests/shared/051 b/tests/shared/051
> index 07d5a9b..0671f83 100755
> --- a/tests/shared/051
> +++ b/tests/shared/051
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
>
> here=`pwd`
> tmp=/tmp/$$
> @@ -73,7 +74,7 @@ _supported_os Linux
>
> [ -x $runas ] || _notrun "$runas executable not found"
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> _setup_testdir
>
> diff --git a/tests/shared/068 b/tests/shared/068
> index fe4684c..c8128c5 100755
> --- a/tests/shared/068
> +++ b/tests/shared/068
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -56,13 +57,13 @@ _require_scratch
>
> echo "*** init FS"
>
> -rm -f $seq.full
> +rm -f $seqres.full
> umount $SCRATCH_DEV >/dev/null 2>&1
> -echo "*** MKFS ***" >>$seq.full
> -echo "" >>$seq.full
> -_scratch_mkfs >>$seq.full 2>&1 \
> +echo "*** MKFS ***" >>$seqres.full
> +echo "" >>$seqres.full
> +_scratch_mkfs >>$seqres.full 2>&1 \
> || _fail "mkfs failed"
> -_scratch_mount >>$seq.full 2>&1 \
> +_scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed"
>
> touch $tmp.running
> @@ -90,23 +91,23 @@ touch $tmp.running
> i=0
> let ITERATIONS=$ITERATIONS-1
>
> -echo | tee -a $seq.full
> +echo | tee -a $seqres.full
> while [ $i -le $ITERATIONS ]
> do
> - echo "*** iteration: $i" | tee -a $seq.full
> - echo "*** freezing \$SCRATCH_MNT" | tee -a $seq.full
> - xfs_freeze -f "$SCRATCH_MNT" | tee -a $seq.full
> + echo "*** iteration: $i" | tee -a $seqres.full
> + echo "*** freezing \$SCRATCH_MNT" | tee -a $seqres.full
> + xfs_freeze -f "$SCRATCH_MNT" | tee -a $seqres.full
> [ $? != 0 ] && echo xfs_freeze -f "$SCRATCH_MNT" failed | \
> - tee -a $seq.full
> + tee -a $seqres.full
> sleep 2
>
> - echo "*** thawing \$SCRATCH_MNT" | tee -a $seq.full
> - xfs_freeze -u "$SCRATCH_MNT" | tee -a $seq.full
> + echo "*** thawing \$SCRATCH_MNT" | tee -a $seqres.full
> + xfs_freeze -u "$SCRATCH_MNT" | tee -a $seqres.full
> [ $? != 0 ] && echo xfs_freeze -u "$SCRATCH_MNT" failed | \
> - tee -a $seq.full
> + tee -a $seqres.full
> sleep 2
>
> - echo | tee -a $seq.full
> + echo | tee -a $seqres.full
> let i=$i+1
> done
>
> diff --git a/tests/shared/218 b/tests/shared/218
> index 4b46452..7c2bd53 100755
> --- a/tests/shared/218
> +++ b/tests/shared/218
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -59,36 +60,36 @@ rm -f $fragfile
>
> # Craft some fragmented files, defrag them, check the result.
>
> -echo "zero-length file:" | tee -a $seq.full
> +echo "zero-length file:" | tee -a $seqres.full
> touch $fragfile
> _defrag $fragfile
>
> -echo "Sparse file (no blocks):" | tee -a $seq.full
> +echo "Sparse file (no blocks):" | tee -a $seqres.full
> xfs_io -F -f -c "truncate 1m" $fragfile
> _defrag $fragfile
>
> -echo "Contiguous file:" | tee -a $seq.full
> +echo "Contiguous file:" | tee -a $seqres.full
> dd if=/dev/zero of=$fragfile bs=4k count=4 &>/dev/null
> _defrag $fragfile
>
> -echo "Write backwards sync, but contiguous - should defrag to 1 extent" | tee -a $seq.full
> +echo "Write backwards sync, but contiguous - should defrag to 1 extent" | tee -a $seqres.full
> for I in `seq 9 -1 0`; do
> dd if=/dev/zero of=$fragfile bs=4k count=1 conv=notrunc seek=$I oflag=sync &>/dev/null
> done
> _defrag $fragfile
>
> -echo "Write backwards sync leaving holes - defrag should do nothing" | tee -a $seq.full
> +echo "Write backwards sync leaving holes - defrag should do nothing" | tee -a $seqres.full
> for I in `seq 31 -2 0`; do
> dd if=/dev/zero of=$fragfile bs=4k count=1 conv=notrunc seek=$I oflag=sync &>/dev/null
> done
> _defrag $fragfile
>
> -echo "Write forwards sync leaving holes - defrag should do nothing" | tee -a $seq.full
> +echo "Write forwards sync leaving holes - defrag should do nothing" | tee -a $seqres.full
> for I in `seq 0 2 31`; do
> dd if=/dev/zero of=$fragfile bs=4k count=1 conv=notrunc seek=$I oflag=sync &>/dev/null
> done
> _defrag $fragfile
>
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> exit
> diff --git a/tests/shared/243 b/tests/shared/243
> index 6a1b6d7..4884e29 100755
> --- a/tests/shared/243
> +++ b/tests/shared/243
> @@ -42,6 +42,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -85,23 +86,23 @@ _check_ext4_eof_flag()
>
> # Ensure that the iflags value was parsed correctly.
> if [ -z ${iflags} ]; then
> - echo "iFlags value was not parsed successfully." >> $seq.full
> + echo "iFlags value was not parsed successfully." >> $seqres.full
> status=1
> exit ${status}
> fi
>
> # Check if EOFBLOCKS_FL is set.
> if ((${iflags} & 0x400000)); then
> - echo "EOFBLOCK_FL bit is set." >> $seq.full
> + echo "EOFBLOCK_FL bit is set." >> $seqres.full
> bit_set=1
> else
> - echo "EOFBLOCK_FL bit is not set." >> $seq.full
> + echo "EOFBLOCK_FL bit is not set." >> $seqres.full
> bit_set=0
> fi
>
> # Check current bit state to expected value.
> if [ ${bit_set} -ne ${2} ]; then
> - echo "Error: Current bit state incorrect." >> $seq.full
> + echo "Error: Current bit state incorrect." >> $seqres.full
> status=1
> exit ${status}
> fi
> @@ -121,14 +122,14 @@ _supported_os Linux
> _require_xfs_io_falloc
>
> # Real QA test starts here.
> -rm -f $seq.full
> +rm -f $seqres.full
>
> # Remove any leftover files from last run.
> rm -f ${TEST_DIR}/test_?
>
> # Begin test cases.
> echo "Test 1: Fallocate 40960 bytes and write 4096 bytes (buffered io)." \
> - >> $seq.full
> + >> $seqres.full
> ${XFS_IO_PROG} -F -f \
> -c 'falloc -k 0 40960' \
> -c 'pwrite 0 4096' \
> @@ -136,7 +137,7 @@ ${XFS_IO_PROG} -F -f \
> _check_ext4_eof_flag test_1 ${BIT_SET}
>
> echo "Test 2: Fallocate 40960 bytes and write 4096 bytes (direct io)." \
> - >> $seq.full
> + >> $seqres.full
> ${XFS_IO_PROG} -F -f -d \
> -c 'falloc -k 0 40960' \
> -c 'pwrite 0 4096' \
> @@ -144,7 +145,7 @@ ${XFS_IO_PROG} -F -f -d \
> _check_ext4_eof_flag test_2 ${BIT_SET}
>
> echo "Test 3: Fallocate 40960 bytes and write 40960 bytes (buffered io)." \
> - >> $seq.full
> + >> $seqres.full
> ${XFS_IO_PROG} -F -f \
> -c 'falloc -k 0 40960' \
> -c 'pwrite 0 40960' \
> @@ -152,7 +153,7 @@ ${XFS_IO_PROG} -F -f \
> _check_ext4_eof_flag test_3 ${BIT_NOT_SET}
>
> echo "Test 4: Fallocate 40960 bytes and write 40960 bytes (direct io)." \
> - >> $seq.full
> + >> $seqres.full
> ${XFS_IO_PROG} -F -f -d \
> -c 'falloc -k 0 40960' \
> -c 'pwrite 0 40960' \
> @@ -160,7 +161,7 @@ ${XFS_IO_PROG} -F -f -d \
> _check_ext4_eof_flag test_4 ${BIT_NOT_SET}
>
> echo "Test 5: Fallocate 128k, seek 256k and write 4k block (buffered io)." \
> - >> $seq.full
> + >> $seqres.full
> ${XFS_IO_PROG} -F -f \
> -c 'falloc -k 0 128k' \
> -c 'pwrite 256k 4k' \
> @@ -168,7 +169,7 @@ ${XFS_IO_PROG} -F -f \
> _check_ext4_eof_flag test_5 ${BIT_NOT_SET}
>
> echo "Test 6: Fallocate 128k, seek to 256k and write a 4k block (direct io)." \
> - >> $seq.full
> + >> $seqres.full
> ${XFS_IO_PROG} -F -f -d \
> -c 'falloc -k 0 128k' \
> -c 'pwrite 256k 4k' \
> diff --git a/tests/shared/272 b/tests/shared/272
> index ed85216..f5b826f 100755
> --- a/tests/shared/272
> +++ b/tests/shared/272
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -52,8 +53,8 @@ _workout()
> chattr_opt: $chattr_opt"
> dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \
> bs=1M count=4 $write_opt \
> - >> $seq.full 2>&1 || exit
> - chattr $chattr_opt $SCRATCH_MNT/file.$idx >> $seq.full \
> + >> $seqres.full 2>&1 || exit
> + chattr $chattr_opt $SCRATCH_MNT/file.$idx >> $seqres.full \
> || exit
> done
> done
> @@ -69,9 +70,9 @@ chattr_opt: $chattr_opt"
> echo "OP write_opt: $write_opt ENOSPC, \
> chattr_opt: $chattr_opt"
> dd if=/dev/zero of=$SCRATCH_MNT/file.$idx \
> - bs=1M $write_opt >> $seq.full 2>&1
> + bs=1M $write_opt >> $seqres.full 2>&1
> chattr $chattr_opt $SCRATCH_MNT/file.$idx \
> - >> $seq.full || exit
> + >> $seqres.full || exit
> done
> sync
> unlink $SCRATCH_MNT/file.$idx
> @@ -84,7 +85,7 @@ _supported_os Linux
> _need_to_be_root
> _require_scratch
>
> -_scratch_mkfs_sized $((64 * 1024 * 1024)) >> $seq.full 2>&1
> +_scratch_mkfs_sized $((64 * 1024 * 1024)) >> $seqres.full 2>&1
> _scratch_mount
>
> if ! _workout; then
> diff --git a/tests/udf/098 b/tests/udf/098
> index 58d2a95..dd1e9ad 100755
> --- a/tests/udf/098
> +++ b/tests/udf/098
> @@ -30,6 +30,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -268,7 +269,7 @@ _check_udf_filesystem $SCRATCH_DEV
>
> # optional stuff if your test has verbose output to help resolve problems
> #echo
> -#echo "If failure, check $seq.full (this) and $seq.full.ok (reference)"
> +#echo "If failure, check $seqres.full (this) and $seqres.full.ok (reference)"
>
> # success, all done
> status=0
> diff --git a/tests/udf/101 b/tests/udf/101
> index 0d274e5..89507a9 100755
> --- a/tests/udf/101
> +++ b/tests/udf/101
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/udf/102 b/tests/udf/102
> index 68407a7..bf3edd2 100755
> --- a/tests/udf/102
> +++ b/tests/udf/102
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/003 b/tests/xfs/003
> index 79b6bc5..56dd852 100755
> --- a/tests/xfs/003
> +++ b/tests/xfs/003
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> # get standard environment, filters and checks
> diff --git a/tests/xfs/004 b/tests/xfs/004
> index d75c3c0..fb02b95 100755
> --- a/tests/xfs/004
> +++ b/tests/xfs/004
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -39,8 +40,8 @@ trap "_cleanup" 0 1 2 3 15
>
> _populate_scratch()
> {
> - echo "=== mkfs output ===" >>$seq.full
> - _scratch_mkfs_xfs | tee -a $seq.full | _filter_mkfs 2>$tmp.mkfs
> + echo "=== mkfs output ===" >>$seqres.full
> + _scratch_mkfs_xfs | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs
> . $tmp.mkfs
> _scratch_mount
> dd if=/dev/zero of=$SCRATCH_MNT/foo count=200 bs=4096 >/dev/null 2>&1 &
> @@ -64,7 +65,7 @@ _need_to_be_root
> _require_scratch
> _require_no_large_scratch_dev
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> _populate_scratch
>
> @@ -72,16 +73,16 @@ _populate_scratch
>
> eval `$DF_PROG $SCRATCH_MNT 2>&1 \
> | tail -1 | $AWK_PROG '{ printf "blocks=%u used=%u avail=%u\n", $3, $4, $5 }'`
> -echo "df gave: blocks=$blocks used=$used avail=$avail" >>$seq.full
> -echo "blocksize from mkfs is '$dbsize'" >>$seq.full
> +echo "df gave: blocks=$blocks used=$used avail=$avail" >>$seqres.full
> +echo "blocksize from mkfs is '$dbsize'" >>$seqres.full
>
> xfs_db -r -c "freesp -s" $SCRATCH_DEV >$tmp.xfs_db
> -echo "xfs_db for $SCRATCH_DEV" >>$seq.full
> -cat $tmp.xfs_db >>$seq.full
> +echo "xfs_db for $SCRATCH_DEV" >>$seqres.full
> +cat $tmp.xfs_db >>$seqres.full
>
> eval `$XFS_IO_PROG -x -c resblks $SCRATCH_MNT 2>&1 \
> | $AWK_PROG '/available/ { printf "resblks=%u\n", $5 }'`
> -echo "resblks gave: resblks=$resblks" >>$seq.full
> +echo "resblks gave: resblks=$resblks" >>$seqres.full
>
> # check the 'blocks' field from freesp command is OK
> # since 2.6.18, df does not report the 4 blocks per AG that cannot
> diff --git a/tests/xfs/008 b/tests/xfs/008
> index 0dee9f5..1f66779 100755
> --- a/tests/xfs/008
> +++ b/tests/xfs/008
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/009 b/tests/xfs/009
> index 1883f15..3e74160 100755
> --- a/tests/xfs/009
> +++ b/tests/xfs/009
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/012 b/tests/xfs/012
> index 10498d5..4bd2afc 100755
> --- a/tests/xfs/012
> +++ b/tests/xfs/012
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/016 b/tests/xfs/016
> index 538ba14..fcb0637 100755
> --- a/tests/xfs/016
> +++ b/tests/xfs/016
> @@ -36,6 +36,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -72,7 +73,7 @@ _init()
> if _scratch_mkfs_xfs -N -K $force_opts >/dev/null 2>&1; then
> force_opts="-K $force_opts"
> fi
> - echo mkfs_xfs $force_opts $SCRATCH_DEV >>$seq.full
> + echo mkfs_xfs $force_opts $SCRATCH_DEV >>$seqres.full
> _scratch_mkfs_xfs $force_opts >$tmp.mkfs0 2>&1
> [ $? -ne 0 ] && \
> _notrun "Cannot mkfs for this test using MKFS_OPTIONS specified"
> @@ -163,8 +164,8 @@ _check_corrupt()
> {
> f="c6c6c6c6"
> echo "*** check for corruption"
> - echo "expect $f..." >>$seq.full
> - xfs_db -r -c "fsblock $2" -c "print" $1 | head | tee -a $seq.full | \
> + echo "expect $f..." >>$seqres.full
> + xfs_db -r -c "fsblock $2" -c "print" $1 | head | tee -a $seqres.full | \
> grep -q -v "$f $f $f $f $f $f $f $f" && \
> _fail "!!! block $2 corrupted!"
> }
> @@ -177,7 +178,7 @@ _check_corrupt()
> _supported_fs xfs
> _supported_os Linux
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> # mkfs sizes
> log_size=2097152
> @@ -187,15 +188,15 @@ _require_scratch
> _init
>
> block=`_after_log $SCRATCH_DEV`
> -echo "fsblock after log = $block" >>$seq.full
> +echo "fsblock after log = $block" >>$seqres.full
> _check_corrupt $SCRATCH_DEV $block
>
> actual_log_size=`_log_size`
> -echo "log size = $actual_log_size BB" >>$seq.full
> +echo "log size = $actual_log_size BB" >>$seqres.full
> head=`_log_head`
> -echo "log position = $head" >>$seq.full
> +echo "log position = $head" >>$seqres.full
> lsunit=`_log_sunit`
> -echo "log sunit = $lsunit" >>$seq.full
> +echo "log sunit = $lsunit" >>$seqres.full
>
> # sanity checks
> [ $actual_log_size -eq $log_size_bb ] || \
> @@ -206,36 +207,36 @@ echo "log sunit = $lsunit" >>$seq.full
> # find how how many blocks per op for 100 ops
> # ignore the fact that it will also include an unmount record etc...
> # this should be small overall
> -echo " lots of traffic for sampling" >>$seq.full
> +echo " lots of traffic for sampling" >>$seqres.full
> sample_size_ops=100
> _log_traffic $sample_size_ops
> head1=`_log_head`
> num_blocks=`expr $head1 - $head`
> blocks_per_op=`echo "scale=3; $num_blocks / $sample_size_ops" | bc`
> -echo "blocks_per_op = $blocks_per_op" >>$seq.full
> +echo "blocks_per_op = $blocks_per_op" >>$seqres.full
> num_expected_ops=`echo "$log_size_bb / $blocks_per_op" | bc`
> -echo "num_expected_ops = $num_expected_ops" >>$seq.full
> +echo "num_expected_ops = $num_expected_ops" >>$seqres.full
> num_expected_to_go=`echo "$num_expected_ops - $sample_size_ops" | bc`
> -echo "num_expected_to_go = $num_expected_to_go" >>$seq.full
> +echo "num_expected_to_go = $num_expected_to_go" >>$seqres.full
>
> -echo " lots more traffic" >>$seq.full
> +echo " lots more traffic" >>$seqres.full
> _log_traffic $num_expected_to_go
> head=`_log_head`
> -echo "log position = $head" >>$seq.full
> +echo "log position = $head" >>$seqres.full
>
> # e.g. 3891
> near_end_min=`echo "0.95 * $log_size_bb" | bc | sed 's/\..*//'`
> -echo "near_end_min = $near_end_min" >>$seq.full
> +echo "near_end_min = $near_end_min" >>$seqres.full
>
> [ $head -gt $near_end_min -a $head -lt $log_size_bb ] || \
> _fail "!!! unexpected near end log position $head"
>
> for c in `seq 0 20`
> do
> - echo " little traffic" >>$seq.full
> + echo " little traffic" >>$seqres.full
> _log_traffic 2
> head=`_log_head`
> - echo "log position = $head" >>$seq.full
> + echo "log position = $head" >>$seqres.full
> _check_corrupt $SCRATCH_DEV $block
> done
>
> diff --git a/tests/xfs/017 b/tests/xfs/017
> index 59d092d..7c29d21 100755
> --- a/tests/xfs/017
> +++ b/tests/xfs/017
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -52,13 +53,13 @@ _require_no_large_scratch_dev
>
> echo "*** init FS"
>
> -rm -f $seq.full
> +rm -f $seqres.full
> umount $SCRATCH_DEV >/dev/null 2>&1
> -echo "*** MKFS ***" >>$seq.full
> -echo "" >>$seq.full
> -_scratch_mkfs_xfs >>$seq.full 2>&1 \
> +echo "*** MKFS ***" >>$seqres.full
> +echo "" >>$seqres.full
> +_scratch_mkfs_xfs >>$seqres.full 2>&1 \
> || _fail "mkfs failed"
> -_scratch_mount >>$seq.full 2>&1 \
> +_scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed"
>
> echo "*** test"
> @@ -66,21 +67,21 @@ echo "*** test"
> for l in 0 1 2 3 4
> do
> echo " *** test $l"
> - $FSSTRESS_PROG -d $SCRATCH_MNT -n 1000 $FSSTRESS_AVOID >>$seq.full
> + $FSSTRESS_PROG -d $SCRATCH_MNT -n 1000 $FSSTRESS_AVOID >>$seqres.full
>
> _scratch_mount -o remount,ro \
> || _fail "remount ro failed"
>
> - echo "" >>$seq.full
> - echo "*** xfs_logprint ***" >>$seq.full
> - echo "" >>$seq.full
> - _scratch_xfs_logprint -tb | tee -a $seq.full \
> + echo "" >>$seqres.full
> + echo "*** xfs_logprint ***" >>$seqres.full
> + echo "" >>$seqres.full
> + _scratch_xfs_logprint -tb | tee -a $seqres.full \
> | head | grep -q "<CLEAN>" || _fail "DIRTY LOG"
>
> - echo "" >>$seq.full
> - echo "*** XFS_CHECK ***" >>$seq.full
> - echo "" >>$seq.full
> - _scratch_xfs_check >>$seq.full 2>&1 \
> + echo "" >>$seqres.full
> + echo "*** XFS_CHECK ***" >>$seqres.full
> + echo "" >>$seqres.full
> + _scratch_xfs_check >>$seqres.full 2>&1 \
> || _fail "xfs_check failed"
> _scratch_mount -o remount,rw \
> || _fail "remount rw failed"
> @@ -88,6 +89,6 @@ done
>
> echo "*** done"
> # happy exit
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> exit 0
> diff --git a/tests/xfs/018 b/tests/xfs/018
> index 156cc1d..ed99f20 100755
> --- a/tests/xfs/018
> +++ b/tests/xfs/018
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -47,7 +48,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fs xfs
> _supported_os IRIX Linux
> # prelim
> -rm -f $seq.full $tmp.*
> +rm -f $seqres.full $tmp.*
> _require_scratch
> _require_v2log
>
> diff --git a/tests/xfs/019 b/tests/xfs/019
> index 1fb0d83..c4bb681 100755
> --- a/tests/xfs/019
> +++ b/tests/xfs/019
> @@ -23,11 +23,12 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> -seqfull="$seq.full"
> +seqfull="$seqres.full"
> status=1 # failure is the default!
> # get standard environment, filters and checks
> . ./common.rc
> diff --git a/tests/xfs/021 b/tests/xfs/021
> index 18fe40e..3cbf088 100755
> --- a/tests/xfs/021
> +++ b/tests/xfs/021
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -78,7 +79,7 @@ _supported_os Linux
> _require_scratch
> _require_attrs
>
> -rm -f $seq.full
> +rm -f $seqres.full
> umount $SCRATCH_DEV >/dev/null 2>&1
>
> echo "*** mkfs"
> @@ -124,7 +125,7 @@ echo ""
> inum_2=`ls -li $testfile.2 | $AWK_PROG '{ print $1 }'`
>
> echo "*** unmount FS"
> -umount $SCRATCH_DEV >>$seq.full 2>&1 \
> +umount $SCRATCH_DEV >>$seqres.full 2>&1 \
> || _fail "umount failed"
>
> echo "*** dump attributes (1)"
> diff --git a/tests/xfs/022 b/tests/xfs/022
> index 962316f..0251936 100755
> --- a/tests/xfs/022
> +++ b/tests/xfs/022
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/023 b/tests/xfs/023
> index 3e7fdd2..7bb77da 100755
> --- a/tests/xfs/023
> +++ b/tests/xfs/023
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/024 b/tests/xfs/024
> index b7f1c10..ec5edc5 100755
> --- a/tests/xfs/024
> +++ b/tests/xfs/024
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -42,11 +43,11 @@ _require_tape $TAPE_DEV
> _create_dumpdir_fill
> # ensure file/dir timestamps precede dump timestamp
> sleep 2
> -src/bstat $SCRATCH_MNT >>$here/$seq.full
> +src/bstat $SCRATCH_MNT >>$here/$seqres.full
> _erase_hard
> _do_dump
> _append_dumpdir_fill
> -src/bstat $SCRATCH_MNT >>$here/$seq.full
> +src/bstat $SCRATCH_MNT >>$here/$seqres.full
> _erase_hard
> _do_dump -l 1
> _do_restore
> diff --git a/tests/xfs/025 b/tests/xfs/025
> index 4ccb5de..1e44732 100755
> --- a/tests/xfs/025
> +++ b/tests/xfs/025
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/026 b/tests/xfs/026
> index 37a23cc..04bda76 100755
> --- a/tests/xfs/026
> +++ b/tests/xfs/026
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/027 b/tests/xfs/027
> index 772705d..712378d 100755
> --- a/tests/xfs/027
> +++ b/tests/xfs/027
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/028 b/tests/xfs/028
> index 0bf042f..e70bc57 100755
> --- a/tests/xfs/028
> +++ b/tests/xfs/028
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -59,7 +60,7 @@ while [ $i -lt 5 ]; do
> let i=$i+1
> done
>
> -echo "middate = $middate" >>$seq.full
> +echo "middate = $middate" >>$seqres.full
>
> #
> # Now do the xfsinvutil and
> diff --git a/tests/xfs/029 b/tests/xfs/029
> index 70c0d10..4916c33 100755
> --- a/tests/xfs/029
> +++ b/tests/xfs/029
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/030 b/tests/xfs/030
> index 080d3fe..f9c1dfb 100755
> --- a/tests/xfs/030
> +++ b/tests/xfs/030
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/031 b/tests/xfs/031
> index 422a271..3dec089 100755
> --- a/tests/xfs/031
> +++ b/tests/xfs/031
> @@ -23,13 +23,14 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> status=1 # failure is the default!
> trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> -rm -f $seq.full
> +rm -f $seqres.full
>
> # get standard environment, filters and checks
> . ./common.rc
> @@ -41,15 +42,15 @@ _link_out_file $seq.out
>
> _check_repair()
> {
> - echo "Repairing, round 0" >> $seq.full
> - _scratch_xfs_repair 2>&1 | _filter_repair | tee -a $seq.full >$tmp.0
> + echo "Repairing, round 0" >> $seqres.full
> + _scratch_xfs_repair 2>&1 | _filter_repair | tee -a $seqres.full >$tmp.0
> for i in 1 2 3 4
> do
> - echo "Repairing, iteration $i" | tee -a $seq.full
> + echo "Repairing, iteration $i" | tee -a $seqres.full
> _scratch_xfs_repair 2>&1 | _filter_repair >$tmp.$i
> - diff $tmp.0 $tmp.$i >> $seq.full
> + diff $tmp.0 $tmp.$i >> $seqres.full
> if [ $? -ne 0 ]; then
> - echo "ERROR: repair round $i differs to round 0 (see $seq.full)" | tee -a $seq.full
> + echo "ERROR: repair round $i differs to round 0 (see $seqres.full)" | tee -a $seqres.full
> break
> fi
> # echo all interesting stuff...
> diff --git a/tests/xfs/032 b/tests/xfs/032
> index ad1909d..9836bcc 100755
> --- a/tests/xfs/032
> +++ b/tests/xfs/032
> @@ -23,13 +23,14 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> status=1 # failure is the default!
> trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> -rm -f $seq.full
> +rm -f $seqres.full
>
> # get standard environment, filters and checks
> . ./common.rc
> @@ -69,18 +70,18 @@ do
> src/devzero -n 20 $SCRATCH_DEV >/dev/null
>
> # create a filesystem of this type
> - echo "=== Creating $fs filesystem..." >>$seq.full
> - echo " ( $preop mkfs -t $fs $preargs $SCRATCH_DEV $postargs )" >>$seq.full
> - eval $preop mkfs -t $fs $preargs $SCRATCH_DEV $postargs >>$seq.full 2>&1
> + echo "=== Creating $fs filesystem..." >>$seqres.full
> + echo " ( $preop mkfs -t $fs $preargs $SCRATCH_DEV $postargs )" >>$seqres.full
> + eval $preop mkfs -t $fs $preargs $SCRATCH_DEV $postargs >>$seqres.full 2>&1
>
> if [ $? -eq 0 ] ; then
> # next, ensure we don't overwrite it
> - echo "=== Attempting XFS overwrite of $fs..." >>$seq.full
> - /sbin/mkfs.xfs $SCRATCH_DEV >>$seq.full 2>&1
> + echo "=== Attempting XFS overwrite of $fs..." >>$seqres.full
> + /sbin/mkfs.xfs $SCRATCH_DEV >>$seqres.full 2>&1
>
> [ $? -eq 0 ] && echo "Failed - overwrote fs type ${fs}!"
> else
> - echo "mkfs of type ${fs} failed" >>$seq.full
> + echo "mkfs of type ${fs} failed" >>$seqres.full
> fi
> done
>
> diff --git a/tests/xfs/033 b/tests/xfs/033
> index dc5a32d..1540a1c 100755
> --- a/tests/xfs/033
> +++ b/tests/xfs/033
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/034 b/tests/xfs/034
> index 27f3f22..372dead 100755
> --- a/tests/xfs/034
> +++ b/tests/xfs/034
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -50,13 +51,13 @@ _require_scratch
>
> echo "*** init FS"
>
> -rm -f $seq.full
> +rm -f $seqres.full
> umount $SCRATCH_DEV >/dev/null 2>&1
> -echo "*** MKFS ***" >>$seq.full
> -echo "" >>$seq.full
> -_scratch_mkfs_xfs >>$seq.full 2>&1 \
> +echo "*** MKFS ***" >>$seqres.full
> +echo "" >>$seqres.full
> +_scratch_mkfs_xfs >>$seqres.full 2>&1 \
> || _fail "mkfs failed"
> -_scratch_mount >>$seq.full 2>&1 \
> +_scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed"
>
> echo "*** test"
> @@ -69,7 +70,7 @@ then
> exit
> fi
>
> -if ! src/xfsctl $SCRATCH_MNT $SCRATCH_MNT/fish >>$seq.full 2>&1
> +if ! src/xfsctl $SCRATCH_MNT $SCRATCH_MNT/fish >>$seqres.full 2>&1
> then
> echo "!!! failed to run xfsctl test program"
> exit
> diff --git a/tests/xfs/035 b/tests/xfs/035
> index b2fc417..cd743f6 100755
> --- a/tests/xfs/035
> +++ b/tests/xfs/035
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/036 b/tests/xfs/036
> index e9bb411..5a7ee01 100755
> --- a/tests/xfs/036
> +++ b/tests/xfs/036
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/037 b/tests/xfs/037
> index e2e71c5..ca10429 100755
> --- a/tests/xfs/037
> +++ b/tests/xfs/037
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/038 b/tests/xfs/038
> index b62a4c9..64d2428 100755
> --- a/tests/xfs/038
> +++ b/tests/xfs/038
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/039 b/tests/xfs/039
> index 428e8bb..21574d6 100755
> --- a/tests/xfs/039
> +++ b/tests/xfs/039
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/040 b/tests/xfs/040
> index 0021c22..119a770 100755
> --- a/tests/xfs/040
> +++ b/tests/xfs/040
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -49,9 +50,9 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> # real QA test starts here
> cd "$WORKAREA/xfstests"
> echo Silence is golden.
> -perl tools/srcdiff -q >$seq.full
> -if ! diff $seq.full $seq.good >/dev/null; then
> - echo "FAILED: srcdiff output $seq.full differs to $seq.good"
> +perl tools/srcdiff -q >$seqres.full
> +if ! diff $seqres.full $seq.good >/dev/null; then
> + echo "FAILED: srcdiff output $seqres.full differs to $seq.good"
> exit 1
> fi
>
> diff --git a/tests/xfs/041 b/tests/xfs/041
> index a9a9a23..dd50301 100755
> --- a/tests/xfs/041
> +++ b/tests/xfs/041
> @@ -25,6 +25,7 @@
> set +x
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -59,7 +60,7 @@ _fill()
> }
>
> _do_die_on_error=message_only
> -rm -f $seq.full
> +rm -f $seqres.full
> agsize=32
> echo -n "Make $agsize megabyte filesystem on SCRATCH_DEV and mount... "
> _scratch_mkfs_xfs -dsize=${agsize}m,agcount=1 2>&1 >/dev/null || _fail "mkfs failed"
> @@ -84,7 +85,7 @@ do
> echo "done"
> echo -n "Check files... "
> if ! _do "src/fill2fs_check $tmp.manifest"; then
> - echo "fail (see $seq.full)"
> + echo "fail (see $seqres.full)"
> _do "cat $tmp.manifest"
> _do "ls -altrR $SCRATCH_MNT"
> _do "dd if=$SCRATCH_DEV bs=4096 count=$grow_size | gzip -9 > $seq.fsimage.gz"
> diff --git a/tests/xfs/042 b/tests/xfs/042
> index 15fa5dc..1127b46 100755
> --- a/tests/xfs/042
> +++ b/tests/xfs/042
> @@ -26,6 +26,7 @@
> set +x
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -86,7 +87,7 @@ _cull_files()
> # create 3 minimum sized (16Mb) allocation groups
> # xfs_repair is going to need three to verify the superblock
>
> -rm -f $seq.full
> +rm -f $seqres.full
> _do_die_on_error=message_only
>
> echo -n "Make a 48 megabyte filesystem on SCRATCH_DEV and mount... "
> @@ -147,7 +148,7 @@ echo -n "Check fill file... "
> _do "sum $SCRATCH_MNT/fill >$tmp.fillsum2"
> if ! _do "diff $tmp.fillsum1 $tmp.fillsum2"; then
> echo "fail"
> - echo "Fill file is corrupt/missing after fsr. Test failed see $seq.full"
> + echo "Fill file is corrupt/missing after fsr. Test failed see $seqres.full"
> status=1; exit
> fi
> echo "done"
> @@ -157,7 +158,7 @@ echo -n "Check large file... "
> _do "sum $SCRATCH_MNT/fragmented >$tmp.sum2"
> if ! _do "diff $tmp.sum1 $tmp.sum2"; then
> echo "fail"
> - echo "File is corrupt/missing after fsr. Test failed see $seq.full"
> + echo "File is corrupt/missing after fsr. Test failed see $seqres.full"
> status=1; exit
> fi
> echo "done"
> diff --git a/tests/xfs/043 b/tests/xfs/043
> index ef92c0a..75c2d38 100755
> --- a/tests/xfs/043
> +++ b/tests/xfs/043
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/044 b/tests/xfs/044
> index d0d8bd8..3b330b9 100755
> --- a/tests/xfs/044
> +++ b/tests/xfs/044
> @@ -27,6 +27,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/045 b/tests/xfs/045
> index c20e3a8..9d07570 100755
> --- a/tests/xfs/045
> +++ b/tests/xfs/045
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/046 b/tests/xfs/046
> index fb83b7a..d5f4fca 100755
> --- a/tests/xfs/046
> +++ b/tests/xfs/046
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/047 b/tests/xfs/047
> index 7c5e896..18960ea 100755
> --- a/tests/xfs/047
> +++ b/tests/xfs/047
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -59,7 +60,7 @@ while [ $i -lt 5 ]; do
> let i=$i+1
> done
>
> -echo "middate = $middate" >>$seq.full
> +echo "middate = $middate" >>$seqres.full
>
> # Only say No to 1st question to prune
> cat >$tmp.input <<EOF
> diff --git a/tests/xfs/048 b/tests/xfs/048
> index 6139361..a39ec66 100755
> --- a/tests/xfs/048
> +++ b/tests/xfs/048
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/049 b/tests/xfs/049
> index 0a6e69c..e2d1293 100755
> --- a/tests/xfs/049
> +++ b/tests/xfs/049
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> _cleanup()
> @@ -32,10 +33,10 @@ _cleanup()
> umount -d $SCRATCH_MNT/test > /dev/null 2>&1
> rm -f $tmp.*
>
> - if [ -w $seq.full ]
> + if [ -w $seqres.full ]
> then
> - echo "--- mounts at end (after cleanup)" >> $seq.full
> - mount >> $seq.full
> + echo "--- mounts at end (after cleanup)" >> $seqres.full
> + mount >> $seqres.full
> fi
> }
>
> @@ -55,7 +56,7 @@ _supported_os Linux
> _log()
> {
> echo "--- $*"
> - echo "--- $*" >> $seq.full
> + echo "--- $*" >> $seqres.full
> }
>
> _require_nonexternal
> @@ -64,75 +65,75 @@ _require_no_large_scratch_dev
> _require_loop
> _require_ext2
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> -echo "(dev=$SCRATCH_DEV, mount=$SCRATCH_MNT)" >> $seq.full
> -echo "" >> $seq.full
> +echo "(dev=$SCRATCH_DEV, mount=$SCRATCH_MNT)" >> $seqres.full
> +echo "" >> $seqres.full
>
> -echo "--- mounts" >> $seq.full
> -mount >> $seq.full
> +echo "--- mounts" >> $seqres.full
> +mount >> $seqres.full
>
> _log "Create ext2 fs on scratch"
> -mkfs -t ext2 -F $SCRATCH_DEV >> $seq.full 2>&1 \
> +mkfs -t ext2 -F $SCRATCH_DEV >> $seqres.full 2>&1 \
> || _fail "!!! failed to mkfs ext2"
>
> _log "Mount ext2 fs on scratch"
> -mount -t ext2 $SCRATCH_DEV $SCRATCH_MNT >> $seq.full 2>&1 \
> +mount -t ext2 $SCRATCH_DEV $SCRATCH_MNT >> $seqres.full 2>&1 \
> || _fail "!!! failed to mount"
>
> _log "Create xfs fs in file on scratch"
> /sbin/mkfs.xfs -f -dfile,name=$SCRATCH_MNT/test.xfs,size=40m \
> - >> $seq.full 2>&1 \
> + >> $seqres.full 2>&1 \
> || _fail "!!! failed to mkfs xfs"
>
> _log "Make mount points"
> -mkdir $SCRATCH_MNT/test $SCRATCH_MNT/test2 >> $seq.full 2>&1 \
> +mkdir $SCRATCH_MNT/test $SCRATCH_MNT/test2 >> $seqres.full 2>&1 \
> || _fail "!!! failed to make mount points"
>
> _log "Mount xfs via loop"
> -mount -t xfs -o loop $SCRATCH_MNT/test.xfs $SCRATCH_MNT/test >> $seq.full 2>&1 \
> +mount -t xfs -o loop $SCRATCH_MNT/test.xfs $SCRATCH_MNT/test >> $seqres.full 2>&1 \
> || _fail "!!! failed to loop mount xfs"
>
> _log "stress"
> -$FSSTRESS_PROG -d $SCRATCH_MNT/test -n 1000 $FSSTRESS_AVOID >> $seq.full 2>&1 \
> +$FSSTRESS_PROG -d $SCRATCH_MNT/test -n 1000 $FSSTRESS_AVOID >> $seqres.full 2>&1 \
> || _fail "!!! stress failed"
>
> _log "clean"
> -rm -rf $SCRATCH_MNT/test/* >> $seq.full 2>&1 \
> +rm -rf $SCRATCH_MNT/test/* >> $seqres.full 2>&1 \
> || _fail "!!! clean failed"
>
> _log "create file for ext2 fs"
> -dd if=/dev/zero of=$SCRATCH_MNT/test/test.ext2 bs=1024 count=10240 >> $seq.full 2>&1 \
> +dd if=/dev/zero of=$SCRATCH_MNT/test/test.ext2 bs=1024 count=10240 >> $seqres.full 2>&1 \
> || _fail "!!! create file failed"
>
> _log "Create ext2 fs in file on looped xfs"
> -echo y | mkfs -t ext2 $SCRATCH_MNT/test/test.ext2 >> $seq.full 2>&1 \
> +echo y | mkfs -t ext2 $SCRATCH_MNT/test/test.ext2 >> $seqres.full 2>&1 \
> || _fail "!!! failed to mkfs ext2 on xfs"
>
> _log "Mount ext2 on xfs via loop"
> -mount -t ext2 -o loop $SCRATCH_MNT/test/test.ext2 $SCRATCH_MNT/test2 >> $seq.full 2>&1 \
> +mount -t ext2 -o loop $SCRATCH_MNT/test/test.ext2 $SCRATCH_MNT/test2 >> $seqres.full 2>&1 \
> || _fail "!!! failed to loop mount xfs"
>
> _log "stress ext2 on xfs via loop"
> -$FSSTRESS_PROG -d $SCRATCH_MNT/test2 -n 1000 $FSSTRESS_AVOID >> $seq.full 2>&1 \
> +$FSSTRESS_PROG -d $SCRATCH_MNT/test2 -n 1000 $FSSTRESS_AVOID >> $seqres.full 2>&1 \
> || _fail "!!! stress ext2 failed"
>
> _log "clean"
> -rm -rf $SCRATCH_MNT/test/* >> $seq.full 2>&1 \
> +rm -rf $SCRATCH_MNT/test/* >> $seqres.full 2>&1 \
> || _fail "!!! clean failed"
>
> _log "umount ext2 on xfs"
> -umount -d $SCRATCH_MNT/test2 >> $seq.full 2>&1 \
> +umount -d $SCRATCH_MNT/test2 >> $seqres.full 2>&1 \
> || _fail "!!! umount ext2 failed"
>
> _log "umount xfs"
> -umount -d $SCRATCH_MNT/test >> $seq.full 2>&1 \
> +umount -d $SCRATCH_MNT/test >> $seqres.full 2>&1 \
> || _fail "!!! umount xfs failed"
>
> -echo "--- mounts at end (before cleanup)" >> $seq.full
> -mount >> $seq.full
> +echo "--- mounts at end (before cleanup)" >> $seqres.full
> +mount >> $seqres.full
>
> -rm -f $seq.full
> +rm -f $seqres.full
> # success, all done
> status=0
> exit
> diff --git a/tests/xfs/050 b/tests/xfs/050
> index 6a66032..d402cbf 100755
> --- a/tests/xfs/050
> +++ b/tests/xfs/050
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -49,8 +50,8 @@ _supported_fs xfs
> _supported_os Linux IRIX
>
>
> -cp /dev/null $seq.full
> -chmod a+rwx $seq.full # arbitrary users will write here
> +cp /dev/null $seqres.full
> +chmod a+rwx $seqres.full # arbitrary users will write here
>
> _require_scratch
> _require_xfs_quota
> @@ -94,7 +95,7 @@ _filter_and_check_blks()
> _exercise()
> {
> _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
> - cat $tmp.mkfs >>$seq.full
> + cat $tmp.mkfs >>$seqres.full
>
> # keep the blocksize and data size for dd later
> . $tmp.mkfs
> @@ -111,20 +112,20 @@ _exercise()
>
> _qsetup
>
> - echo "Using output from '" `ls -l $seq.out` "'" >>$seq.full
> - echo "and using type=$type id=$id" >>$seq.full
> + echo "Using output from '" `ls -l $seq.out` "'" >>$seqres.full
> + echo "and using type=$type id=$id" >>$seqres.full
>
> echo
> - echo "*** report no quota settings" | tee -a $seq.full
> + echo "*** report no quota settings" | tee -a $seqres.full
> xfs_quota -D $tmp.projects -P $tmp.projid -x \
> -c "repquota -birnN -$type" $SCRATCH_DEV |
> _filter_report | LC_COLLATE=POSIX sort -ru
>
> echo
> - echo "*** report initial settings" | tee -a $seq.full
> + echo "*** report initial settings" | tee -a $seqres.full
> _file_as_id $SCRATCH_MNT/initme $id $type 1024 0
> - echo "ls -l $SCRATCH_MNT" >>$seq.full
> - ls -l $SCRATCH_MNT >>$seq.full
> + echo "ls -l $SCRATCH_MNT" >>$seqres.full
> + ls -l $SCRATCH_MNT >>$seqres.full
> xfs_quota -D $tmp.projects -P $temp.projid -x \
> -c "limit -$type bsoft=${bsoft}k bhard=${bhard}k $id" \
> -c "limit -$type isoft=$isoft ihard=$ihard $id" \
> @@ -134,7 +135,7 @@ _exercise()
> _filter_report | LC_COLLATE=POSIX sort -ru
>
> echo
> - echo "*** push past the soft inode limit" | tee -a $seq.full
> + echo "*** push past the soft inode limit" | tee -a $seqres.full
> _file_as_id $SCRATCH_MNT/softie1 $id $type 1024 0
> _file_as_id $SCRATCH_MNT/softie2 $id $type 1024 0
> _qmount
> @@ -143,7 +144,7 @@ _exercise()
> _filter_report | LC_COLLATE=POSIX sort -ru
>
> echo
> - echo "*** push past the soft block limit" | tee -a $seq.full
> + echo "*** push past the soft block limit" | tee -a $seqres.full
> _file_as_id $SCRATCH_MNT/softie $id $type 1024 140
> _qmount
> xfs_quota -D $tmp.projects -P $tmp.projid -x \
> @@ -152,7 +153,7 @@ _exercise()
>
> echo
> # Note: for quota accounting (not enforcement), EDQUOT is not expected
> - echo "*** push past the hard inode limit (expect EDQUOT)" | tee -a $seq.full
> + echo "*** push past the hard inode limit (expect EDQUOT)" | tee -a $seqres.full
> for i in 1 2 3 4 5 6 7 8 9 10 11 12
> do
> _file_as_id $SCRATCH_MNT/hard$i $id $type 1024 0
> @@ -164,10 +165,10 @@ _exercise()
>
> echo
> # Note: for quota accounting (not enforcement), EDQUOT is not expected
> - echo "*** push past the hard block limit (expect EDQUOT)" | tee -a $seq.full
> + echo "*** push past the hard block limit (expect EDQUOT)" | tee -a $seqres.full
> _file_as_id $SCRATCH_MNT/softie $id $type 1024 540
> - echo "ls -l $SCRATCH_MNT" >>$seq.full
> - ls -l $SCRATCH_MNT >>$seq.full
> + echo "ls -l $SCRATCH_MNT" >>$seqres.full
> + ls -l $SCRATCH_MNT >>$seqres.full
> _qmount
> xfs_quota -D $tmp.projects -P $tmp.projid -x \
> -c "repquota -birnN -$type" $SCRATCH_DEV |
> diff --git a/tests/xfs/052 b/tests/xfs/052
> index 01d5469..2abd78d 100755
> --- a/tests/xfs/052
> +++ b/tests/xfs/052
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -49,7 +50,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fs xfs
> _supported_os IRIX Linux
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> _require_scratch
> _require_xfs_quota
> @@ -59,8 +60,8 @@ _require_nobody
> _qmount_option uquota
>
> _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
> -cat $tmp.mkfs >>$seq.full
> -chmod a+w $seq.full # arbitrary users will write here
> +cat $tmp.mkfs >>$seqres.full
> +chmod a+w $seqres.full # arbitrary users will write here
>
> # keep the blocksize from mkfs ($dbsize)
> . $tmp.mkfs
> @@ -94,7 +95,7 @@ xfs_quota -x \
>
> # cross check blks, softblks, hardblks <-> quota, xfs_db
> xfs_quota -c "quota -$type -birnN $id" $SCRATCH_DEV |
> - tr -d '\n' | tr -s '[:space:]' | tee -a $seq.full |
> + tr -d '\n' | tr -s '[:space:]' | tee -a $seqres.full |
> perl -ne 'if (m[^\s*'$SCRATCH_DEV'\s+(\d+)\s+(\d+)\s+(\d+)]) {
> print "used_blocks=", $1, "\n";
> print "soft_blocks=", $2, "\n";
> @@ -102,14 +103,14 @@ xfs_quota -c "quota -$type -birnN $id" $SCRATCH_DEV |
> $next = 0;
> }' | LC_COLLATE=POSIX sort >$tmp.quota
>
> -echo ===quota output >> $seq.full
> -cat $tmp.quota >> $seq.full
> +echo ===quota output >> $seqres.full
> +cat $tmp.quota >> $seqres.full
> [ ! -s $tmp.quota ] && echo "warning: quota output file is empty"
>
> umount $SCRATCH_MNT
>
> # note - does (insitu) conversion from fs blocks to 1K blocks
> -xfs_db -rc "dquot -$type $id" -c p $SCRATCH_DEV | tee -a $seq.full | perl -ne '
> +xfs_db -rc "dquot -$type $id" -c p $SCRATCH_DEV | tee -a $seqres.full | perl -ne '
> if (/^diskdq.bcount = (\d+)$/) {
> print "used_blocks=", $1 * '$dbsize' / 1024, "\n";
> }
> @@ -120,8 +121,8 @@ xfs_db -rc "dquot -$type $id" -c p $SCRATCH_DEV | tee -a $seq.full | perl -ne '
> print "soft_blocks=", $1 * '$dbsize' / 1024, "\n";
> }' | LC_COLLATE=POSIX sort >$tmp.xfs_db
>
> -echo ===xfs_db output >> $seq.full
> -cat $tmp.xfs_db >> $seq.full
> +echo ===xfs_db output >> $seqres.full
> +cat $tmp.xfs_db >> $seqres.full
> [ ! -s $tmp.xfs_db ] && echo "warning: xfs_db output file is empty"
>
> echo Comparing out of xfs_quota and xfs_db
> diff --git a/tests/xfs/054 b/tests/xfs/054
> index 1ce6180..97590e8 100755
> --- a/tests/xfs/054
> +++ b/tests/xfs/054
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -46,8 +47,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fs xfs
> _supported_os Linux IRIX
>
> -cp /dev/null $seq.full
> -chmod ugo+rwx $seq.full
> +cp /dev/null $seqres.full
> +chmod ugo+rwx $seqres.full
>
> _require_scratch
> _require_xfs_quota
> @@ -98,7 +99,7 @@ _exercise()
> umount $SCRATCH_MNT 2>/dev/null
> }
>
> -_scratch_mkfs_xfs >> $seq.full 2>&1 || _fail "mkfs failed!"
> +_scratch_mkfs_xfs >> $seqres.full 2>&1 || _fail "mkfs failed!"
>
> _qmount_option "uquota,gquota"
> _qmount
> diff --git a/tests/xfs/055 b/tests/xfs/055
> index 965b43a..1804727 100755
> --- a/tests/xfs/055
> +++ b/tests/xfs/055
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/056 b/tests/xfs/056
> index be65bfb..8ab61f9 100755
> --- a/tests/xfs/056
> +++ b/tests/xfs/056
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/057 b/tests/xfs/057
> index faa4776..fd856d7 100755
> --- a/tests/xfs/057
> +++ b/tests/xfs/057
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/058 b/tests/xfs/058
> index dfce43b..c800286 100755
> --- a/tests/xfs/058
> +++ b/tests/xfs/058
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/059 b/tests/xfs/059
> index a2a07c9..c26fa4d 100755
> --- a/tests/xfs/059
> +++ b/tests/xfs/059
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/060 b/tests/xfs/060
> index f0d9870..6adce78 100755
> --- a/tests/xfs/060
> +++ b/tests/xfs/060
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/061 b/tests/xfs/061
> index fa98085..e5a8413 100755
> --- a/tests/xfs/061
> +++ b/tests/xfs/061
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/063 b/tests/xfs/063
> index cdaf524..a2ee188 100755
> --- a/tests/xfs/063
> +++ b/tests/xfs/063
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/064 b/tests/xfs/064
> index c7e727c..9ba542e 100755
> --- a/tests/xfs/064
> +++ b/tests/xfs/064
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -66,14 +67,14 @@ while [ $i -le 9 ]; do
> _stable_fs
> sleep 2
>
> - echo "********* level $i ***********" >>$seq.full
> - date >>$seq.full
> + echo "********* level $i ***********" >>$seqres.full
> + date >>$seqres.full
> find $SCRATCH_MNT -exec $here/src/lstat64 {} \; | sed 's/(00.*)//' >$tmp.dates.$i
> if [ $i -gt 0 ]; then
> let level_1=$i-1
> - diff -c $tmp.dates.$level_1 $tmp.dates.$i >>$seq.full
> + diff -c $tmp.dates.$level_1 $tmp.dates.$i >>$seqres.full
> else
> - cat $tmp.dates.$i >>$seq.full
> + cat $tmp.dates.$i >>$seqres.full
> fi
>
> _do_dump_file -f $tmp.df.level$i -l $i
> diff --git a/tests/xfs/065 b/tests/xfs/065
> index 12f2ac9..ef1d10f 100755
> --- a/tests/xfs/065
> +++ b/tests/xfs/065
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/066 b/tests/xfs/066
> index 7a68f79..8709a2b 100755
> --- a/tests/xfs/066
> +++ b/tests/xfs/066
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/067 b/tests/xfs/067
> index baaed77..87b3cc9 100755
> --- a/tests/xfs/067
> +++ b/tests/xfs/067
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -46,14 +47,14 @@ _require_scratch
>
> # set up fs for 1K inodes
> isize=0
> -_scratch_mkfs_xfs | _filter_mkfs >$seq.full 2>$tmp.mkfs
> +_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs
> [ $? -eq 0 ] && source $tmp.mkfs
> if [ "$isize" -lt 1024 ]; then
> - _scratch_mkfs_xfs -i size=1024 >>$here/$seq.full \
> + _scratch_mkfs_xfs -i size=1024 >>$here/$seqres.full \
> || _notrun "Cannot mkfs for this test using MKFS_OPTIONS specified"
> fi
> -_scratch_mount >>$here/$seq.full || _fail "mount failed"
> -xfs_info $SCRATCH_MNT >>$here/$seq.full
> +_scratch_mount >>$here/$seqres.full || _fail "mount failed"
> +xfs_info $SCRATCH_MNT >>$here/$seqres.full
> cd $SCRATCH_MNT
>
> echo ""
> diff --git a/tests/xfs/071 b/tests/xfs/071
> index c135d1a..b22dd6d 100755
> --- a/tests/xfs/071
> +++ b/tests/xfs/071
> @@ -22,8 +22,9 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
> -rm -f $seq.full
> +rm -f $seqres.full
>
> here=`pwd`
> tmp=/tmp/$$
> @@ -81,19 +82,19 @@ write_block()
> [ `$direct` ] && flags=-d
>
> echo "Writing $bytes bytes, offset is $words (direct=$direct)" | _filter_io
> - echo "Writing $bytes bytes at $location $words (direct=$direct)" >>$seq.full
> + echo "Writing $bytes bytes at $location $words (direct=$direct)" >>$seqres.full
> $XFS_IO_PROG -c "pwrite $offset 512" $flags $SCRATCH_MNT/$seq \
> - 2>&1 | _filter_off $offset | tee -a $seq.full | _filter_pwrite
> - xfs_bmap -v $SCRATCH_MNT/$seq >>$seq.full
> + 2>&1 | _filter_off $offset | tee -a $seqres.full | _filter_pwrite
> + xfs_bmap -v $SCRATCH_MNT/$seq >>$seqres.full
>
> echo "Reading $bytes bytes (direct=$direct)" | _filter_io
> - echo "Reading $bytes bytes at $location (direct=$direct)" >>$seq.full
> + echo "Reading $bytes bytes at $location (direct=$direct)" >>$seqres.full
> $XFS_IO_PROG -c "pread $offset $bytes" $flags $SCRATCH_MNT/$seq \
> - 2>&1 | _filter_off $offset | tee -a $seq.full | _filter_pread
> + 2>&1 | _filter_off $offset | tee -a $seqres.full | _filter_pread
>
> - $XFS_IO_PROG -c "pread -v $offset $bytes" $flags $SCRATCH_MNT/$seq >>$seq.full 2>&1
> + $XFS_IO_PROG -c "pread -v $offset $bytes" $flags $SCRATCH_MNT/$seq >>$seqres.full 2>&1
>
> - echo | tee -a $seq.full
> + echo | tee -a $seqres.full
> }
>
> # real QA test starts here
> diff --git a/tests/xfs/072 b/tests/xfs/072
> index 930a983..d5bec3c 100755
> --- a/tests/xfs/072
> +++ b/tests/xfs/072
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> _cleanup()
> @@ -49,7 +50,7 @@ _supported_os IRIX Linux
>
> _require_scratch
>
> -rm -f $seq.full
> +rm -f $seqres.full
> umount $SCRATCH_DEV >/dev/null 2>&1
>
> _scratch_mkfs_xfs >/dev/null || _fail "mkfs failed"
> diff --git a/tests/xfs/073 b/tests/xfs/073
> index d19c8f5..336cb89 100755
> --- a/tests/xfs/073
> +++ b/tests/xfs/073
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/078 b/tests/xfs/078
> index 901723e..df4fc6f 100755
> --- a/tests/xfs/078
> +++ b/tests/xfs/078
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/080 b/tests/xfs/080
> index 3243fe1..fb5b6a6 100755
> --- a/tests/xfs/080
> +++ b/tests/xfs/080
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/081 b/tests/xfs/081
> index f0ee819..44018bc 100755
> --- a/tests/xfs/081
> +++ b/tests/xfs/081
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -50,7 +51,7 @@ _cleanup()
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> # prelim
> -rm -f $seq.full $tmp.*
> +rm -f $seqres.full $tmp.*
> _require_scratch
> _require_xfs_quota
> _require_v2log
> diff --git a/tests/xfs/082 b/tests/xfs/082
> index e21a793..652f362 100755
> --- a/tests/xfs/082
> +++ b/tests/xfs/082
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -48,7 +49,7 @@ _supported_fs xfs
> _supported_os IRIX Linux
>
> # prelim
> -rm -f $seq.full $tmp.*
> +rm -f $seqres.full $tmp.*
> _require_scratch
> _require_v2log
>
> diff --git a/tests/xfs/084 b/tests/xfs/084
> index ba5743a..46aa837 100755
> --- a/tests/xfs/084
> +++ b/tests/xfs/084
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/085 b/tests/xfs/085
> index 44123ad..a02c42d 100755
> --- a/tests/xfs/085
> +++ b/tests/xfs/085
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -42,24 +43,24 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> _supported_fs xfs
> _supported_os IRIX Linux
>
> -rm -f $seq.full
> +rm -f $seqres.full
> rm -f $tmp.log
>
> _require_scratch
>
> echo "mkfs"
> -_scratch_mkfs_xfs >>$seq.full 2>&1 \
> +_scratch_mkfs_xfs >>$seqres.full 2>&1 \
> || _fail "mkfs scratch failed"
>
> echo "mount"
> -_scratch_mount >>$seq.full 2>&1 \
> +_scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed: $MOUNT_OPTIONS"
>
> echo "touch files"
> touch $SCRATCH_MNT/{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}
>
> echo "godown"
> -src/godown -v -f $SCRATCH_MNT >> $seq.full
> +src/godown -v -f $SCRATCH_MNT >> $seqres.full
>
> echo "unmount"
> umount $SCRATCH_MNT
> @@ -75,7 +76,7 @@ if false; then
> fi
>
> echo "mount with replay"
> -_scratch_mount $mnt >>$seq.full 2>&1 \
> +_scratch_mount $mnt >>$seqres.full 2>&1 \
> || _fail "mount failed: $mnt $MOUNT_OPTIONS"
>
> echo "ls SCRATCH_MNT"
> diff --git a/tests/xfs/086 b/tests/xfs/086
> index b59ad0a..2e2d4cf 100755
> --- a/tests/xfs/086
> +++ b/tests/xfs/086
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -41,7 +42,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> _supported_fs xfs
> _supported_os IRIX Linux
>
> -rm -f $seq.full $tmp.*
> +rm -f $seqres.full $tmp.*
> _require_scratch
> _require_v2log
>
> @@ -83,7 +84,7 @@ for s in sync nosync ; do
>
> # mkfs the FS
> _echofull "mkfs"
> - _scratch_mkfs_xfs >>$seq.full 2>&1
> + _scratch_mkfs_xfs >>$seqres.full 2>&1
> if [ $? -ne 0 ] ; then
> _echofull "mkfs failed: $MKFS_OPTIONS"
> continue
> @@ -91,7 +92,7 @@ for s in sync nosync ; do
>
> # mount the FS
> _echofull "mount"
> - if ! _scratch_mount >>$seq.full 2>&1; then
> + if ! _scratch_mount >>$seqres.full 2>&1; then
> _echofull "mount failed: $MOUNT_OPTIONS"
> continue
> fi
> @@ -116,17 +117,17 @@ for s in sync nosync ; do
> ls $SCRATCH_MNT
>
> _echofull "godown"
> - src/godown -v -f $SCRATCH_MNT >> $seq.full
> + src/godown -v -f $SCRATCH_MNT >> $seqres.full
>
> _echofull "unmount"
> - umount $SCRATCH_DEV >>$seq.full 2>&1 \
> + umount $SCRATCH_DEV >>$seqres.full 2>&1 \
> || _fail "umount failed"
>
> _echofull "logprint after going down..."
> _print_logstate
>
> _echofull "mount with replay"
> - _scratch_mount >>$seq.full 2>&1 \
> + _scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed: $MOUNT_OPTIONS"
>
> # check on what FS looks like after log recovery
> diff --git a/tests/xfs/087 b/tests/xfs/087
> index 30e117b..3e51fcb 100755
> --- a/tests/xfs/087
> +++ b/tests/xfs/087
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -45,7 +46,7 @@ _do_meta()
> param="-p 4 -z -f rmdir=10 -f link=10 -f creat=10 -f mkdir=10 \
> -f rename=30 -f stat=30 -f unlink=30 -f truncate=20"
> _echofull "calling fsstress $param -m8 -n $count"
> - if ! $FSSTRESS_PROG $param $FSSTRESS_AVOID -m 8 -n $count -d $out >>$seq.full 2>&1
> + if ! $FSSTRESS_PROG $param $FSSTRESS_AVOID -m 8 -n $count -d $out >>$seqres.full 2>&1
> then
> _echofull "fsstress failed"
> fi
> @@ -55,7 +56,7 @@ _do_meta()
> _supported_fs xfs
> _supported_os IRIX Linux
>
> -rm -f $seq.full $tmp.*
> +rm -f $seqres.full $tmp.*
> _require_scratch
> _require_v2log
> _require_xfs_quota
> @@ -90,7 +91,7 @@ do
>
> # mkfs the FS
> _echofull "mkfs"
> - _scratch_mkfs_xfs >>$seq.full 2>&1
> + _scratch_mkfs_xfs >>$seqres.full 2>&1
> if [ $? -ne 0 ] ; then
> _echofull "mkfs failed: $MKFS_OPTIONS"
> continue
> @@ -98,7 +99,7 @@ do
>
> # mount the FS
> _echofull "mount"
> - if ! _scratch_mount -o uquota >>$seq.full 2>&1; then
> + if ! _scratch_mount -o uquota >>$seqres.full 2>&1; then
> _echofull "mount failed: $MOUNT_OPTIONS"
> continue
> fi
> @@ -111,20 +112,20 @@ do
> ls -RF $SCRATCH_MNT >$tmp.ls1
>
> _echofull "godown"
> - src/godown -v -f $SCRATCH_MNT >> $seq.full
> + src/godown -v -f $SCRATCH_MNT >> $seqres.full
>
> _echofull "unmount"
> - umount $SCRATCH_DEV >>$seq.full 2>&1 \
> + umount $SCRATCH_DEV >>$seqres.full 2>&1 \
> || _fail "umount failed"
>
> _echofull "logprint after going down..."
> _print_logstate
>
> _full "logprint headers"
> - _scratch_xfs_logprint -n >>$seq.full 2>&1
> + _scratch_xfs_logprint -n >>$seqres.full 2>&1
>
> _echofull "mount with replay"
> - _scratch_mount -o uquota >>$seq.full 2>&1 \
> + _scratch_mount -o uquota >>$seqres.full 2>&1 \
> || _fail "mount failed: $MOUNT_OPTIONS"
>
> # check on what FS looks like after log recovery
> diff --git a/tests/xfs/090 b/tests/xfs/090
> index 8ce50c0..8477329 100755
> --- a/tests/xfs/090
> +++ b/tests/xfs/090
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/092 b/tests/xfs/092
> index 2f849f3..e65fe27 100755
> --- a/tests/xfs/092
> +++ b/tests/xfs/092
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/094 b/tests/xfs/094
> index 4f4cf34..6aa2d74 100755
> --- a/tests/xfs/094
> +++ b/tests/xfs/094
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/095 b/tests/xfs/095
> index 9de4476..9a74d5f 100755
> --- a/tests/xfs/095
> +++ b/tests/xfs/095
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/096 b/tests/xfs/096
> index ecadd73..0fef425 100755
> --- a/tests/xfs/096
> +++ b/tests/xfs/096
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -63,7 +64,7 @@ _cleanup()
> #
> _mkfs_filter()
> {
> - tee -a $seq.full | \
> + tee -a $seqres.full | \
> sed \
> -e 's/extsz=[0-9][0-9]*[ ]*/extsz=N, /' \
> -e 's/blocks=[0-9][0-9]*/blocks=N/' \
> @@ -88,7 +89,7 @@ _mkfs_filter()
> }
>
> # real QA test starts here
> -rm -f $seq.full
> +rm -f $seqres.full
>
> # Modify as appropriate.
> _supported_fs xfs
> diff --git a/tests/xfs/103 b/tests/xfs/103
> index 9750153..753b14d 100755
> --- a/tests/xfs/103
> +++ b/tests/xfs/103
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/104 b/tests/xfs/104
> index 4e61837..0968daa 100755
> --- a/tests/xfs/104
> +++ b/tests/xfs/104
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -37,7 +38,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> _create_scratch()
> {
> echo "*** mkfs"
> - _scratch_mkfs_xfs $@ | tee -a $seq.full | _filter_mkfs 2>$tmp.mkfs
> + _scratch_mkfs_xfs $@ | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs
> . $tmp.mkfs
>
> echo "*** mount"
> @@ -68,7 +69,7 @@ _stress_scratch()
> # real QA test starts here
> _supported_fs xfs
> _require_scratch
> -_scratch_mkfs_xfs | tee -a $seq.full | _filter_mkfs 2>$tmp.mkfs
> +_scratch_mkfs_xfs | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs
> . $tmp.mkfs # extract blocksize and data size for scratch device
>
> endsize=`expr 550 \* 1048576` # stop after growing this big
> @@ -93,19 +94,19 @@ _fill_scratch $fillsize
> #
> while [ $size -le $endsize ]; do
> echo "*** stressing a ${size} byte filesystem"
> - echo "*** stressing a ${sizeb} block filesystem" >> $seq.full
> + echo "*** stressing a ${sizeb} block filesystem" >> $seqres.full
> _stress_scratch
> sleep 1
> size=`expr $size + $incsize`
> sizeb=`expr $size / $dbsize` # in data blocks
> echo "*** growing to a ${size} byte filesystem"
> - echo "*** growing to a ${sizeb} block filesystem" >> $seq.full
> + echo "*** growing to a ${sizeb} block filesystem" >> $seqres.full
> xfs_growfs -D ${sizeb} $SCRATCH_MNT \
> - | tee -a $seq.full | _filter_mkfs 2>$tmp.growfs
> + | tee -a $seqres.full | _filter_mkfs 2>$tmp.growfs
> . $tmp.growfs
> [ `expr $size % $modsize` -eq 0 ] && wait # every 4th iteration
> - echo AGCOUNT=$agcount | tee -a $seq.full
> - echo && echo >> $seq.full
> + echo AGCOUNT=$agcount | tee -a $seqres.full
> + echo && echo >> $seqres.full
> done
> wait # stop for any remaining stress processes
>
> diff --git a/tests/xfs/106 b/tests/xfs/106
> index 613b12c..667115d 100755
> --- a/tests/xfs/106
> +++ b/tests/xfs/106
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -44,7 +45,7 @@ _require_xfs_quota
>
> # real QA test starts here
> _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
> -cat $tmp.mkfs >$seq.full
> +cat $tmp.mkfs >$seqres.full
> . $tmp.mkfs
>
> # setup a default run
> @@ -86,7 +87,7 @@ s/Inode: \#\d+ \(\d+ blocks, \d+ extents\)/Inode: #[INO] (X blocks, Y extents)/;
> test_quot()
> {
> echo "checking quot command (type=$type)" # not deterministic on blks
> - xfs_quota -x -c "quot -n -$type" $SCRATCH_MNT >>$seq.full 2>&1
> + xfs_quota -x -c "quot -n -$type" $SCRATCH_MNT >>$seqres.full 2>&1
> }
>
> test_report()
> diff --git a/tests/xfs/107 b/tests/xfs/107
> index e887384..7124dc2 100755
> --- a/tests/xfs/107
> +++ b/tests/xfs/107
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -56,7 +57,7 @@ _require_xfs_quota
>
> # real QA test starts here
> _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
> -cat $tmp.mkfs >$seq.full
> +cat $tmp.mkfs >$seqres.full
> . $tmp.mkfs
>
> # setup a default run
> @@ -72,7 +73,7 @@ _require_prjquota $SCRATCH_DEV
> echo "### create projects file"
> rm -f $tmp.projects
> target=$SCRATCH_MNT/project
> -echo "6:$target" | tee -a $seq.full > $tmp.projects
> +echo "6:$target" | tee -a $seqres.full > $tmp.projects
>
> echo "### populate filesystem"
> mkdir $target || exit
> diff --git a/tests/xfs/108 b/tests/xfs/108
> index 6b656e6..809659d 100755
> --- a/tests/xfs/108
> +++ b/tests/xfs/108
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -57,15 +58,15 @@ test_files()
> test_accounting()
> {
> echo "### some controlled buffered, direct and mmapd IO (type=$type)"
> - echo "--- initiating parallel IO..." >>$seq.full
> + echo "--- initiating parallel IO..." >>$seqres.full
> $XFS_IO_PROG -c 'pwrite -b 1m 0 16m' -c 'fsync' \
> - $SCRATCH_MNT/buffer >>$seq.full 2>&1 &
> + $SCRATCH_MNT/buffer >>$seqres.full 2>&1 &
> $XFS_IO_PROG -c 'pwrite -b 1m 0 16m' -d \
> - $SCRATCH_MNT/direct >>$seq.full 2>&1 &
> + $SCRATCH_MNT/direct >>$seqres.full 2>&1 &
> $XFS_IO_PROG -c 't 16m' -c 'mm -rw 0 16m' -c 'mw 0 16m' -c 'ms -s' \
> - $SCRATCH_MNT/mmap >>$seq.full 2>&1 &
> + $SCRATCH_MNT/mmap >>$seqres.full 2>&1 &
> wait
> - echo "--- completed parallel IO ($type)" >>$seq.full
> + echo "--- completed parallel IO ($type)" >>$seqres.full
>
> for file in $SCRATCH_MNT/{buffer,direct,mmap}; do
> $here/src/lstat64 $file | head -3 | _filter_scratch
> @@ -80,10 +81,10 @@ _qmount
> _require_prjquota $SCRATCH_DEV
>
> # real QA test starts here
> -rm -f $tmp.projects $seq.full
> +rm -f $tmp.projects $seqres.full
> umount $SCRATCH_DEV 2>/dev/null
> _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
> -cat $tmp.mkfs >>$seq.full
> +cat $tmp.mkfs >>$seqres.full
> _scratch_mount
>
> uid=1
> diff --git a/tests/xfs/109 b/tests/xfs/109
> index 56364f4..2e36d0f 100755
> --- a/tests/xfs/109
> +++ b/tests/xfs/109
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -102,7 +103,7 @@ fi
> umount $SCRATCH_DEV
>
> _scratch_mkfs_xfs -dsize=160m,agcount=4 $faststart | _filter_mkfs 2>$tmp.mkfs
> -cat $tmp.mkfs >>$seq.full
> +cat $tmp.mkfs >>$seqres.full
> _scratch_mount
>
> populate
> diff --git a/tests/xfs/110 b/tests/xfs/110
> index 8749afa..a2790c8 100755
> --- a/tests/xfs/110
> +++ b/tests/xfs/110
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/111 b/tests/xfs/111
> index 8f4c142..af7cd65 100755
> --- a/tests/xfs/111
> +++ b/tests/xfs/111
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/114 b/tests/xfs/114
> index fa64093..5228eca 100755
> --- a/tests/xfs/114
> +++ b/tests/xfs/114
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -79,8 +80,8 @@ _test_create()
> p=dir2/dir3/dir4/file4
> touch $p
>
> - #_print_names $p >>$here/$seq.full
> - _print_names $p | tee -a $here/$seq.full
> + #_print_names $p >>$here/$seqres.full
> + _print_names $p | tee -a $here/$seqres.full
>
> _check_paths $SCRATCH_MNT/$p
> }
> @@ -130,13 +131,13 @@ _test_hardlink()
> ln $p $x
> done
>
> - _print_names $p >>$here/$seq.full
> + _print_names $p >>$here/$seqres.full
>
> echo ""
> echo "print out names and check after created hardlinks"
> echo ""
> for x in $paths; do
> - _print_names $x | tee -a $here/$seq.full
> + _print_names $x | tee -a $here/$seqres.full
> _check_paths $SCRATCH_MNT/$x
> done
>
> @@ -160,7 +161,7 @@ _test_hardlink()
> echo ""
> for x in $paths; do
> if [ -e $x ]; then
> - _print_names $x | tee -a $here/$seq.full
> + _print_names $x | tee -a $here/$seqres.full
> _check_paths $SCRATCH_MNT/$x
> fi
> done
> @@ -229,7 +230,7 @@ _test_rename()
>
> _filter_num()
> {
> - tee -a $here/$seq.full |\
> + tee -a $here/$seqres.full |\
> sed -e 's/[0-9][0-9]* inodes/I inodes/g' \
> -e 's/[0-9][0-9]* paths/P paths/g' \
> -e 's/seed = [0-9][0-9]*/seed = S/'
> @@ -254,7 +255,7 @@ _test_fsstress()
> if ! $FSSTRESS_PROG $args | _filter_num
> then
> echo " fsstress $args returned $?"
> - cat $tmp.out | tee -a $here/$seq.full
> + cat $tmp.out | tee -a $here/$seqres.full
> status=1
> fi
>
> @@ -283,8 +284,8 @@ _test_dirstress()
> if ! $here/src/dirstress $args >$tmp.out 2>&1 | _filter_num
> then
> echo " dirstress failed"
> - echo "*** dirstress $args" | tee -a $here/$seq.full
> - cat $tmp.out >>$here/$seq.full
> + echo "*** dirstress $args" | tee -a $here/$seqres.full
> + cat $tmp.out >>$here/$seqres.full
> status=1
> exit
> fi
> @@ -294,8 +295,8 @@ _test_dirstress()
> if ! $here/src/dirstress $args >$tmp.out 2>&1 | _filter_num
> then
> echo " dirstress failed"
> - echo "*** dirstress $args" | tee -a $here/$seq.full
> - cat $tmp.out >>$here/$seq.full
> + echo "*** dirstress $args" | tee -a $here/$seqres.full
> + cat $tmp.out >>$here/$seqres.full
> status=1
> exit
> fi
> @@ -315,16 +316,16 @@ _require_scratch
> _require_attrs
> _need_to_be_root
>
> -rm -f $here/$seq.full
> +rm -f $here/$seqres.full
>
> echo "mkfs"
> -_scratch_mkfs_xfs >>$here/$seq.full 2>&1 \
> +_scratch_mkfs_xfs >>$here/$seqres.full 2>&1 \
> || _fail "mkfs scratch failed"
> -_scratch_mkfs_xfs -i parent=1 >>$here/$seq.full 2>&1 \
> +_scratch_mkfs_xfs -i parent=1 >>$here/$seqres.full 2>&1 \
> || _notrun "parent inodes not supported"
>
> echo "mount"
> -_scratch_mount >>$here/$seq.full 2>&1 \
> +_scratch_mount >>$here/$seqres.full 2>&1 \
> || _fail "mount failed: $MOUNT_OPTIONS"
>
> # real QA test starts here
> diff --git a/tests/xfs/115 b/tests/xfs/115
> index ebcc995..aa281d6 100755
> --- a/tests/xfs/115
> +++ b/tests/xfs/115
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -101,16 +102,16 @@ _supported_os IRIX
> _require_scratch
> _require_attrs
>
> -rm -f $here/$seq.full
> +rm -f $here/$seqres.full
>
> echo "mkfs"
> -_scratch_mkfs_xfs >>$here/$seq.full 2>&1 \
> +_scratch_mkfs_xfs >>$here/$seqres.full 2>&1 \
> || _fail "mkfs scratch failed"
> -_scratch_mkfs_xfs -i paths=1 >>$here/$seq.full 2>&1 \
> +_scratch_mkfs_xfs -i paths=1 >>$here/$seqres.full 2>&1 \
> || _notrun "i_paths not supported"
>
> echo "mount"
> -_scratch_mount >>$here/$seq.full 2>&1 \
> +_scratch_mount >>$here/$seqres.full 2>&1 \
> || _fail "mount failed: $MOUNT_OPTIONS"
>
> # real QA test starts here
> @@ -251,7 +252,7 @@ _do_test()
> xfs_repair_ipaths -n $SCRATCH_MNT
> }
>
> -_do_test 2>&1 | tee $seq.full | _filter_inodes
> +_do_test 2>&1 | tee $seqres.full | _filter_inodes
>
> # success, all done
> status=0
> diff --git a/tests/xfs/116 b/tests/xfs/116
> index 2c3ab92..4554d20 100755
> --- a/tests/xfs/116
> +++ b/tests/xfs/116
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/118 b/tests/xfs/118
> index d140a8b..e4ce711 100755
> --- a/tests/xfs/118
> +++ b/tests/xfs/118
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -72,7 +73,7 @@ _chowning_file()
>
>
> echo "mkfs on scratch"
> -_scratch_mkfs_xfs >$seq.full
> +_scratch_mkfs_xfs >$seqres.full
>
> echo "mount with quotas"
> export MOUNT_OPTIONS="-o uquota"
> diff --git a/tests/xfs/119 b/tests/xfs/119
> index 85af211..066ddbd 100755
> --- a/tests/xfs/119
> +++ b/tests/xfs/119
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/121 b/tests/xfs/121
> index a590bb0..f6dc83a 100755
> --- a/tests/xfs/121
> +++ b/tests/xfs/121
> @@ -27,6 +27,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -43,17 +44,17 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> _supported_fs xfs
> _supported_os IRIX Linux
>
> -rm -f $seq.full
> +rm -f $seqres.full
> rm -f $tmp.log
>
> _require_scratch
>
> echo "mkfs"
> -_scratch_mkfs_xfs >>$seq.full 2>&1 \
> +_scratch_mkfs_xfs >>$seqres.full 2>&1 \
> || _fail "mkfs scratch failed"
>
> echo "mount"
> -_scratch_mount >>$seq.full 2>&1 \
> +_scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed: $MOUNT_OPTIONS"
>
> # num_files must be greater than 64 (XFS_AGI_UNLINKED_BUCKETS)
> @@ -68,7 +69,7 @@ src/multi_open_unlink -f $SCRATCH_MNT/test_file -n $num_files -s $delay &
> sleep 3
>
> echo "godown"
> -src/godown -v -f $SCRATCH_MNT >> $seq.full
> +src/godown -v -f $SCRATCH_MNT >> $seqres.full
>
> # time for multi_open_unlink to exit out after its delay
> # so we have no references and can unmount
> @@ -81,11 +82,11 @@ echo "logprint after going down..."
> _print_logstate
>
> echo "mount with replay"
> -_scratch_mount $mnt >>$seq.full 2>&1 \
> +_scratch_mount $mnt >>$seqres.full 2>&1 \
> || _fail "mount failed: $mnt $MOUNT_OPTIONS"
>
> echo "godown"
> -src/godown -v -f $SCRATCH_MNT >> $seq.full
> +src/godown -v -f $SCRATCH_MNT >> $seqres.full
>
> echo "unmount"
> umount $SCRATCH_MNT
> @@ -94,7 +95,7 @@ echo "logprint after going down..."
> _print_logstate
>
> echo "logprint to check for CLEAR_AGI_BUCKET..."
> -if _scratch_xfs_logprint -t | tee -a $seq.full | grep CLEAR; then
> +if _scratch_xfs_logprint -t | tee -a $seqres.full | grep CLEAR; then
> echo 'CLEAR_AGI_BUCKET transactions found!!'
> echo 'Are you running with an old xfs kernel - where the bug still exists?'
> else
> @@ -102,7 +103,7 @@ else
> fi
>
> # clean up dirty log with log recovery on mount
> -_scratch_mount >> $seq.full 2>&1 \
> +_scratch_mount >> $seqres.full 2>&1 \
> || _fail "mount failed"
>
> # should now be peaches
> diff --git a/tests/xfs/122 b/tests/xfs/122
> index 1c4f3a4..2a81728 100755
> --- a/tests/xfs/122
> +++ b/tests/xfs/122
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -176,7 +177,7 @@ echo 'int main(int argc, char *argv[]) {' >>$cprog
> #
> cat /usr/include/xfs/xfs*.h | indent |\
> _attribute_filter |\
> -tee $seq.full |\
> +tee $seqres.full |\
> egrep '} *xfs_.*_t' |\
> egrep -v -f $tmp.ignore |\
> awk '{sub(/[;,]/,"",$2); print "printf(\"sizeof(", $2, ") = %d\\n\", sizeof(", $2, "));"}' \
> @@ -198,8 +199,8 @@ awk '
> echo 'return 0; }' >>$cprog
>
> # create and run program
> -cc -o $oprog $cprog >> $seq.full 2>&1 || \
> - _notrun "Could not compile test program (see end of $seq.full)"
> +cc -o $oprog $cprog >> $seqres.full 2>&1 || \
> + _notrun "Could not compile test program (see end of $seqres.full)"
> $oprog | _type_size_filter | _type_name_filter > $progout
>
> #
> diff --git a/tests/xfs/134 b/tests/xfs/134
> index 2117b4a..f38fc6e 100755
> --- a/tests/xfs/134
> +++ b/tests/xfs/134
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -60,8 +61,8 @@ cat >$tmp.projid <<EOF
> test:1
> EOF
>
> -cp /dev/null $seq.full
> -chmod a+rwx $seq.full # arbitrary users will write here
> +cp /dev/null $seqres.full
> +chmod a+rwx $seqres.full # arbitrary users will write here
>
> _require_scratch
> _scratch_mkfs_xfs >/dev/null 2>&1
> diff --git a/tests/xfs/136 b/tests/xfs/136
> index 6479c8c..ec3f71a 100755
> --- a/tests/xfs/136
> +++ b/tests/xfs/136
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/137 b/tests/xfs/137
> index 0f65d08..5c0fc51 100755
> --- a/tests/xfs/137
> +++ b/tests/xfs/137
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/138 b/tests/xfs/138
> index f8af8dd..a0aeb82 100755
> --- a/tests/xfs/138
> +++ b/tests/xfs/138
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/139 b/tests/xfs/139
> index 7d2e409..9de1fca 100755
> --- a/tests/xfs/139
> +++ b/tests/xfs/139
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/140 b/tests/xfs/140
> index a8cbd09..8564b28 100755
> --- a/tests/xfs/140
> +++ b/tests/xfs/140
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/142 b/tests/xfs/142
> index 526167d..e09ae3f 100755
> --- a/tests/xfs/142
> +++ b/tests/xfs/142
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/143 b/tests/xfs/143
> index 63281f9..686be64 100755
> --- a/tests/xfs/143
> +++ b/tests/xfs/143
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/144 b/tests/xfs/144
> index 52123cc..cf5eca7 100755
> --- a/tests/xfs/144
> +++ b/tests/xfs/144
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/145 b/tests/xfs/145
> index 54b8198..2a4b2f6 100755
> --- a/tests/xfs/145
> +++ b/tests/xfs/145
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/146 b/tests/xfs/146
> index bb4975c..2091db1 100755
> --- a/tests/xfs/146
> +++ b/tests/xfs/146
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/147 b/tests/xfs/147
> index e366dc7..c65dde9 100755
> --- a/tests/xfs/147
> +++ b/tests/xfs/147
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/148 b/tests/xfs/148
> index abc516a..49892ab 100755
> --- a/tests/xfs/148
> +++ b/tests/xfs/148
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/149 b/tests/xfs/149
> index b1793b7..d345f4a 100755
> --- a/tests/xfs/149
> +++ b/tests/xfs/149
> @@ -24,13 +24,14 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> status=1 # failure is the default!
> trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
> -rm -f $seq.full
> +rm -f $seqres.full
>
> # get standard environment, filters and checks
> . ./common.rc
> @@ -44,15 +45,15 @@ export XFS_REPAIR_PROG=$XFS_PARALLEL_REPAIR_PROG
>
> _check_repair()
> {
> - echo "Repairing, round 0" >> $seq.full
> - _scratch_xfs_repair 2>&1 | _filter_repair | tee -a $seq.full >$tmp.0
> + echo "Repairing, round 0" >> $seqres.full
> + _scratch_xfs_repair 2>&1 | _filter_repair | tee -a $seqres.full >$tmp.0
> for i in 1 2 3 4
> do
> - echo "Repairing, iteration $i" | tee -a $seq.full
> + echo "Repairing, iteration $i" | tee -a $seqres.full
> _scratch_xfs_repair 2>&1 | _filter_repair >$tmp.$i
> - diff $tmp.0 $tmp.$i >> $seq.full
> + diff $tmp.0 $tmp.$i >> $seqres.full
> if [ $? -ne 0 ]; then
> - echo "ERROR: repair round $i differs to round 0 (see $seq.full)" | tee -a $seq.full
> + echo "ERROR: repair round $i differs to round 0 (see $seqres.full)" | tee -a $seqres.full
> break
> fi
> # echo all interesting stuff...
> diff --git a/tests/xfs/150 b/tests/xfs/150
> index b6a04c5..529b6b4 100755
> --- a/tests/xfs/150
> +++ b/tests/xfs/150
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/151 b/tests/xfs/151
> index 4bfaff3..9de8ab4 100755
> --- a/tests/xfs/151
> +++ b/tests/xfs/151
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -55,7 +56,7 @@ _check_sids()
> | perl -ne "if (/^sids.*[\"|\s]($i)[\"|\s].*/) {print \$1} ;"`
> if [ -z "$CHECKED_SID" ] ; then
> echo "ERROR: SID(s) not created"
> - ${DMAPI_QASUITE1_DIR}../simple/dm_getall_sessions >>$seq.full
> + ${DMAPI_QASUITE1_DIR}../simple/dm_getall_sessions >>$seqres.full
> return
> fi
> done
> diff --git a/tests/xfs/152 b/tests/xfs/152
> index 2317291..4b9d471 100755
> --- a/tests/xfs/152
> +++ b/tests/xfs/152
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/153 b/tests/xfs/153
> index 81be175..86df036 100755
> --- a/tests/xfs/153
> +++ b/tests/xfs/153
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/154 b/tests/xfs/154
> index 62e79c2..528ec9c 100755
> --- a/tests/xfs/154
> +++ b/tests/xfs/154
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/155 b/tests/xfs/155
> index 949bd98..1c4ea6c 100755
> --- a/tests/xfs/155
> +++ b/tests/xfs/155
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/156 b/tests/xfs/156
> index 549cac8..0a73b6b 100755
> --- a/tests/xfs/156
> +++ b/tests/xfs/156
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -48,8 +49,8 @@ _require_scratch
> _scratch_mkfs_xfs >/dev/null 2>&1
> _dmapi_scratch_mount
>
> -${DMAPI_QASUITE1_DIR}cmd/get_dirattrs $SCRATCH_MNT > $seq.full
> -[ $? -ne 0 ] && echo "get_dirattrs failed - see $seq.full"
> +${DMAPI_QASUITE1_DIR}cmd/get_dirattrs $SCRATCH_MNT > $seqres.full
> +[ $? -ne 0 ] && echo "get_dirattrs failed - see $seqres.full"
>
> status=0
> exit
> diff --git a/tests/xfs/157 b/tests/xfs/157
> index 9ae3c40..91819ef 100755
> --- a/tests/xfs/157
> +++ b/tests/xfs/157
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/158 b/tests/xfs/158
> index e740654..ef8d4d1 100755
> --- a/tests/xfs/158
> +++ b/tests/xfs/158
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/159 b/tests/xfs/159
> index bfc225d..8f80482 100755
> --- a/tests/xfs/159
> +++ b/tests/xfs/159
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/160 b/tests/xfs/160
> index 3900299..2323697 100755
> --- a/tests/xfs/160
> +++ b/tests/xfs/160
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/161 b/tests/xfs/161
> index c419380..45210c7 100755
> --- a/tests/xfs/161
> +++ b/tests/xfs/161
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/162 b/tests/xfs/162
> index acd70e0..67aec9a 100755
> --- a/tests/xfs/162
> +++ b/tests/xfs/162
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/163 b/tests/xfs/163
> index d4eef64..434f100 100755
> --- a/tests/xfs/163
> +++ b/tests/xfs/163
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/164 b/tests/xfs/164
> index 1ef4aaf..8af0b0d 100755
> --- a/tests/xfs/164
> +++ b/tests/xfs/164
> @@ -29,6 +29,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -44,7 +45,7 @@ _cleanup()
>
> _filter_io()
> {
> - tee -a $seq.full | sed 's/ops;.*/ops/'
> + tee -a $seqres.full | sed 's/ops;.*/ops/'
> }
>
> #
> @@ -55,7 +56,7 @@ _filter_bmap()
> {
> awk '$3 ~ /hole/ { print $1, $2, $3; next }
> $7 ~ /10000/ { print $1, $2, "unwritten"; next }
> - {print $1, $2}' >> $seq.full
> + {print $1, $2}' >> $seqres.full
> }
>
>
> diff --git a/tests/xfs/165 b/tests/xfs/165
> index 3b321b9..72376f3 100755
> --- a/tests/xfs/165
> +++ b/tests/xfs/165
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -41,7 +42,7 @@ _cleanup()
>
> _filter_io()
> {
> - tee -a $seq.full | _filter_xfs_io
> + tee -a $seqres.full | _filter_xfs_io
> }
>
> #
> @@ -52,7 +53,7 @@ _filter_io()
> _filter_bmap()
> {
> awk '$3 ~ /hole/ { print $1, $2, $3; next }
> - {print $1, $2}' >> $seq.full
> + {print $1, $2}' >> $seqres.full
> }
>
> # get standard environment, filters and checks
> @@ -68,7 +69,7 @@ _supported_os IRIX Linux
> # io tests
> testfile=$TEST_DIR/file.$seq
> rm -f $testfile
> -rm -f $seq.full
> +rm -f $seqres.full
> len=4
> end=`expr 10 \* $len`
>
> diff --git a/tests/xfs/166 b/tests/xfs/166
> index 527686f..3170fa6 100755
> --- a/tests/xfs/166
> +++ b/tests/xfs/166
> @@ -23,13 +23,14 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> 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
> -rm -f $seq.full
> +rm -f $seqres.full
>
> _cleanup()
> {
> @@ -91,7 +92,7 @@ FILE_SIZE=1048576
> rm -f $TEST_FILE
> $TEST_PROG $FILE_SIZE $TEST_FILE
>
> -xfs_bmap -vp $TEST_FILE >> $seq.full
> +xfs_bmap -vp $TEST_FILE >> $seqres.full
> xfs_bmap -vp $TEST_FILE | _filter_blocks
>
> status=0
> diff --git a/tests/xfs/167 b/tests/xfs/167
> index c2e15e8..84bbe09 100755
> --- a/tests/xfs/167
> +++ b/tests/xfs/167
> @@ -23,11 +23,12 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> -rm -f $seq.full
> +rm -f $seqres.full
> status=1 # failure is the default!
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> @@ -43,7 +44,7 @@ workout()
> procs=100
> nops=15000
> $FSSTRESS_PROG -d $SCRATCH_MNT -p $procs -n $nops $FSSTRESS_AVOID \
> - >>$seq.full &
> + >>$seqres.full &
> sleep 2
> }
>
> diff --git a/tests/xfs/168 b/tests/xfs/168
> index 8980f9b..67f1e19 100755
> --- a/tests/xfs/168
> +++ b/tests/xfs/168
> @@ -24,11 +24,12 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> -rm -f $seq.full
> +rm -f $seqres.full
> status=1 # failure is the default!
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> @@ -106,7 +107,7 @@ wait
> # dmapi destroy events are asyncronous, don't rely on fixed ordering of events
> # in print_event output, use sort.
> echo "# here comes the dmapi print_event filtered and sorted output"
> -cat $tmp.print_event_out | tee -a $here/$seq.full | _filter_dmapi_print_event | LC_COLLATE=POSIX sort
> +cat $tmp.print_event_out | tee -a $here/$seqres.full | _filter_dmapi_print_event | LC_COLLATE=POSIX sort
> rm $tmp.print_event_out
>
> status=0
> diff --git a/tests/xfs/170 b/tests/xfs/170
> index b725d3a..f470946 100755
> --- a/tests/xfs/170
> +++ b/tests/xfs/170
> @@ -25,11 +25,12 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> -rm -f $seq.full
> +rm -f $seqres.full
> status=1 # failure is the default!
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/xfs/171 b/tests/xfs/171
> index 4f77a41..af7a216 100755
> --- a/tests/xfs/171
> +++ b/tests/xfs/171
> @@ -24,11 +24,12 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> -rm -f $seq.full
> +rm -f $seqres.full
> status=1 # failure is the default!
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/xfs/172 b/tests/xfs/172
> index b6b496c..50eda81 100755
> --- a/tests/xfs/172
> +++ b/tests/xfs/172
> @@ -24,11 +24,12 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> -rm -f $seq.full
> +rm -f $seqres.full
> status=1 # failure is the default!
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/xfs/173 b/tests/xfs/173
> index 7146d2f..6761a8a 100755
> --- a/tests/xfs/173
> +++ b/tests/xfs/173
> @@ -24,11 +24,12 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> -rm -f $seq.full
> +rm -f $seqres.full
> status=1 # failure is the default!
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/xfs/174 b/tests/xfs/174
> index 7745a6a..ffb6754 100755
> --- a/tests/xfs/174
> +++ b/tests/xfs/174
> @@ -24,11 +24,12 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> -rm -f $seq.full
> +rm -f $seqres.full
> status=1 # failure is the default!
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/xfs/175 b/tests/xfs/175
> index 4fc3ffb..4753f21 100755
> --- a/tests/xfs/175
> +++ b/tests/xfs/175
> @@ -26,11 +26,12 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> -rm -f $seq.full
> +rm -f $seqres.full
> status=1 # failure is the default!
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/xfs/176 b/tests/xfs/176
> index 93083c4..3fe9f04 100755
> --- a/tests/xfs/176
> +++ b/tests/xfs/176
> @@ -23,11 +23,12 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> -rm -f $seq.full
> +rm -f $seqres.full
> status=1 # failure is the default!
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/xfs/177 b/tests/xfs/177
> index ec8aca7..49ca282 100755
> --- a/tests/xfs/177
> +++ b/tests/xfs/177
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/178 b/tests/xfs/178
> index 8856656..084aeb9 100755
> --- a/tests/xfs/178
> +++ b/tests/xfs/178
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/179 b/tests/xfs/179
> index f3facca..451d7cc 100755
> --- a/tests/xfs/179
> +++ b/tests/xfs/179
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/180 b/tests/xfs/180
> index 0f82306..15e0221 100755
> --- a/tests/xfs/180
> +++ b/tests/xfs/180
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/181 b/tests/xfs/181
> index fb65100..35e808f 100755
> --- a/tests/xfs/181
> +++ b/tests/xfs/181
> @@ -27,6 +27,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> _cleanup()
> @@ -50,17 +51,17 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fs xfs
> _supported_os IRIX Linux
>
> -rm -f $seq.full
> +rm -f $seqres.full
> rm -f $tmp.log
>
> _require_scratch
>
> echo "mkfs"
> -_scratch_mkfs_xfs >>$seq.full 2>&1 \
> +_scratch_mkfs_xfs >>$seqres.full 2>&1 \
> || _fail "mkfs scratch failed"
>
> echo "mount"
> -_scratch_mount >>$seq.full 2>&1 \
> +_scratch_mount >>$seqres.full 2>&1 \
> || _fail "mount failed: $MOUNT_OPTIONS"
>
> # num_files must be greater than 64 (XFS_AGI_UNLINKED_BUCKETS)
> @@ -81,7 +82,7 @@ pid=$!
> sleep 10
>
> echo "godown"
> -src/godown -v -f $SCRATCH_MNT >> $seq.full
> +src/godown -v -f $SCRATCH_MNT >> $seqres.full
>
> # kill the multi_open_unlink
> kill $pid 2>/dev/null
> @@ -95,11 +96,11 @@ echo "logprint after going down..."
> _print_logstate
>
> echo "mount with replay"
> -_scratch_mount $mnt >>$seq.full 2>&1 \
> +_scratch_mount $mnt >>$seqres.full 2>&1 \
> || _fail "mount failed: $mnt $MOUNT_OPTIONS"
>
> echo "godown"
> -src/godown -v -f $SCRATCH_MNT >> $seq.full
> +src/godown -v -f $SCRATCH_MNT >> $seqres.full
>
> echo "unmount"
> umount $SCRATCH_MNT
> @@ -108,7 +109,7 @@ echo "logprint after going down..."
> _print_logstate
>
> echo "logprint to check for CLEAR_AGI_BUCKET..."
> -if _scratch_xfs_logprint -t | tee -a $seq.full | grep CLEAR; then
> +if _scratch_xfs_logprint -t | tee -a $seqres.full | grep CLEAR; then
> echo 'CLEAR_AGI_BUCKET transactions found!!'
> echo 'Are you running with an old xfs kernel - where the bug still exists?'
> else
> @@ -116,7 +117,7 @@ else
> fi
>
> # clean up dirty log with log recovery on mount
> -_scratch_mount >> $seq.full 2>&1 \
> +_scratch_mount >> $seqres.full 2>&1 \
> || _fail "mount failed"
>
> # should now be peaches
> diff --git a/tests/xfs/182 b/tests/xfs/182
> index 33e8010..7495eb1 100755
> --- a/tests/xfs/182
> +++ b/tests/xfs/182
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/183 b/tests/xfs/183
> index 4624ab4..5a7587f 100755
> --- a/tests/xfs/183
> +++ b/tests/xfs/183
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/185 b/tests/xfs/185
> index 928eb24..f00858b 100755
> --- a/tests/xfs/185
> +++ b/tests/xfs/185
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/186 b/tests/xfs/186
> index 2c66026..46cd087 100755
> --- a/tests/xfs/186
> +++ b/tests/xfs/186
> @@ -34,6 +34,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -77,7 +78,7 @@ _rmv_eas()
>
> _filter_inode()
> {
> - tee -a $here/$seq.full | \
> + tee -a $here/$seqres.full | \
> sed -e "s/core.forkoff/forkoff/g" | \
> egrep '^u.sfdir2|^a.sfattr|forkoff' | \
> egrep -v 'inumber|parent'
> @@ -85,7 +86,7 @@ _filter_inode()
>
> _filter_version()
> {
> - tee -a $here/$seq.full | tr ',' '\n' | grep ATTR
> + tee -a $here/$seqres.full | tr ',' '\n' | grep ATTR
> }
>
> _print_inode()
> @@ -148,7 +149,7 @@ _supported_os Linux
> _require_scratch
> _require_attrs
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> _scratch_mkfs -i attr=2,size=512 -l lazy-count=1 >/dev/null 2>&1
>
> diff --git a/tests/xfs/187 b/tests/xfs/187
> index bff0caa..c414017 100755
> --- a/tests/xfs/187
> +++ b/tests/xfs/187
> @@ -28,6 +28,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -43,7 +44,7 @@ _cleanup()
>
> _filter_version()
> {
> - tee -a $seq.full | tr ',' '\n' | egrep 'ATTR|MORE|LAZY'
> + tee -a $seqres.full | tr ',' '\n' | egrep 'ATTR|MORE|LAZY'
> }
>
> # get standard environment, filters and checks
> @@ -58,7 +59,7 @@ _supported_os Linux
> _require_scratch
> _require_attrs
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> # lazysb and attr2 are in features2 and will require morebitsbit on
> # So test with lazysb and without it to see if the morebitsbit is
> diff --git a/tests/xfs/188 b/tests/xfs/188
> index 4ebbfc1..a8fe431 100755
> --- a/tests/xfs/188
> +++ b/tests/xfs/188
> @@ -30,6 +30,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -57,7 +58,7 @@ if [ $XFSPROGS_VERSION -lt 21000 ]; then
> fi
>
> _require_scratch
> -rm -f $seq.full
> +rm -f $seqres.full
>
> _scratch_mkfs -n version=ci >/dev/null 2>&1
> _scratch_mount
> diff --git a/tests/xfs/189 b/tests/xfs/189
> index a5a5682..24cc29e 100755
> --- a/tests/xfs/189
> +++ b/tests/xfs/189
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -220,5 +221,5 @@ _test_remount_barrier
>
> # success, all done
> echo "*** done"
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> diff --git a/tests/xfs/190 b/tests/xfs/190
> index 5bb4743..c760ee6 100755
> --- a/tests/xfs/190
> +++ b/tests/xfs/190
> @@ -35,12 +35,13 @@ filesize=10
> filename=test-190
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> tmp=/tmp/$$
> status=0 # success is the default!
> -rm -f $seq.full
> +rm -f $seqres.full
>
> # get standard environment, filters and checks
> . ./common.rc
> @@ -55,20 +56,20 @@ _scratch_mkfs_xfs >/dev/null 2>&1
> _scratch_mount
> fsblocksize=`xfs_info $SCRATCH_MNT|sed 's/=/ /g'|awk '/^data / { print $3 }'`
>
> -dd if=/dev/zero of=$SCRATCH_MNT/$filename bs=1024k count=10 >> $seq.full 2>&1
> +dd if=/dev/zero of=$SCRATCH_MNT/$filename bs=1024k count=10 >> $seqres.full 2>&1
>
> # run DMAPI test using verbose output
> echo Punching holes in file
> -echo Punching holes in file >> $seq.full
> +echo Punching holes in file >> $seqres.full
> for i in $holes ; do
> - echo xfs_io -c "unresvsp `echo $i |$SED_PROG 's/:/ /g'`" $SCRATCH_MNT/$filename >> $seq.full
> + echo xfs_io -c "unresvsp `echo $i |$SED_PROG 's/:/ /g'`" $SCRATCH_MNT/$filename >> $seqres.full
> xfs_io -c "unresvsp `echo $i |$SED_PROG 's/:/ /g'`" $SCRATCH_MNT/$filename ;
> done
>
> echo Verifying holes are in the correct spots:
>
> xfs_bmap=`xfs_bmap $SCRATCH_MNT/$filename`
> -xfs_bmap $SCRATCH_MNT/$filename >> $seq.full
> +xfs_bmap $SCRATCH_MNT/$filename >> $seqres.full
> for i in $holes ; do
> holeStart=$[`echo $i|$SED_PROG 's/:/ /g'|awk '{print $1}'`];
> holeEnd=$[`echo $i|$SED_PROG 's/:/ /g'|awk '{print $2}'`];
> @@ -83,7 +84,7 @@ for i in $holes ; do
> #xfs_bmap prints holes in the following format
> # 1: [8..15]: hole
> bmap="\[$[$holeStart/512]..$[($holeEnd/512) -1]\]";
> - echo $bmap >> $seq.full
> + echo $bmap >> $seqres.full
> if [ $holeEnd == $holeStart ] ; then
> continue #there is no hole
> fi
> diff --git a/tests/xfs/191 b/tests/xfs/191
> index 3120dcb..d3b227c 100755
> --- a/tests/xfs/191
> +++ b/tests/xfs/191
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -41,7 +42,7 @@ _supported_fs xfs
> _supported_os Linux
>
> _require_scratch
> -_scratch_mkfs_xfs -i nfs4acl 1>$tmp.mkfs 2>$seq.full
> +_scratch_mkfs_xfs -i nfs4acl 1>$tmp.mkfs 2>$seqres.full
> if [ $? -ne 0 ]
> then
> _notrun "no mkfs support for NFS v4 ACLs"
> @@ -53,7 +54,7 @@ then
> _notrun "no kernel mount support for NFS v4 ACLs"
> fi
>
> -set_prog_path nfs4acl >>$seq.full
> +set_prog_path nfs4acl >>$seqres.full
> if [ $? -ne 0 ]
> then
> _notrun "no nfs4acl utility found"
> diff --git a/tests/xfs/194 b/tests/xfs/194
> index 595da25..4609a17 100755
> --- a/tests/xfs/194
> +++ b/tests/xfs/194
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -44,7 +45,7 @@ _supported_fs xfs
> _supported_os IRIX Linux
>
> # real QA test starts here
> -rm -f $seq.full
> +rm -f $seqres.full
>
> # For this test we use block size = 1/8 page size
> pgsize=`$here/src/feature -s`
> @@ -63,7 +64,7 @@ blksize=`expr $pgsize / 8`
>
> _filter_bmap()
> {
> - tee -a $seq.full | \
> + tee -a $seqres.full | \
> sed "s#$SCRATCH_MNT#SCRATCH_MNT#g" | \
> awk \
> '$3 ~ /hole/ { print $1 "\t" $3 "\t" ($4 * 512) / blksize; next }
> @@ -75,7 +76,7 @@ _filter_bmap()
> # Filter out offsets, which vary by blocksize
> _filter_od()
> {
> - tee -a $seq.full | \
> + tee -a $seqres.full | \
> sed -e "s/^[0-9A-Fa-f ]\{7,8\}//"
> }
>
> @@ -118,12 +119,12 @@ xfs_io \
> -c "pwrite -S 0x11 -b `expr $pgsize / 2` 0 `expr $pgsize / 2`" \
> -c "truncate `expr $blksize / 2`" \
> -c "truncate $pgsize" \
> --t -f $SCRATCH_MNT/testfile1 >> $seq.full
> +-t -f $SCRATCH_MNT/testfile1 >> $seqres.full
>
> # directio read of entire file
> xfs_io \
> -c "pread 0 $pgsize" \
> --d $SCRATCH_MNT/testfile1 >> $seq.full
> +-d $SCRATCH_MNT/testfile1 >> $seqres.full
>
> xfs_bmap -v $SCRATCH_MNT/testfile1 | _filter_bmap
> od -x $SCRATCH_MNT/testfile1 | _filter_od
> @@ -137,12 +138,12 @@ xfs_io \
> -c "truncate `expr $blksize / 2`" \
> -c "truncate $pgsize" \
> -c "pwrite -S 0x22 -b $blksize `expr $blksize \* 4` $blksize" \
> --t -f $SCRATCH_MNT/testfile2 >> $seq.full
> +-t -f $SCRATCH_MNT/testfile2 >> $seqres.full
>
> # directio read of entire file
> xfs_io \
> -c "pread 0 $pgsize" \
> --d $SCRATCH_MNT/testfile2 >> $seq.full
> +-d $SCRATCH_MNT/testfile2 >> $seqres.full
>
> xfs_bmap -v $SCRATCH_MNT/testfile2 | _filter_bmap
> od -x $SCRATCH_MNT/testfile2 | _filter_od
> @@ -187,7 +188,7 @@ xfs_io \
> -c "truncate `expr $blksize / 2`" \
> -c "truncate `expr $blksize + 1`" \
> -c "pwrite -S 0x22 -b $blksize `expr $pgsize / 2` $blksize" \
> --t -d -f $SCRATCH_MNT/testfile3 >> $seq.full
> +-t -d -f $SCRATCH_MNT/testfile3 >> $seqres.full
>
> xfs_bmap -v $SCRATCH_MNT/testfile3 | _filter_bmap
> od -x $SCRATCH_MNT/testfile3 | _filter_od
> @@ -207,7 +208,7 @@ xfs_io \
> -c "truncate `expr $blksize + 1`" \
> -c "pwrite -S 0x22 -b $blksize `expr $pgsize / 2` $blksize" \
> -c "pwrite -S 0x33 -b 512 `expr $blksize \* 2` 512" \
> --t -d -f $SCRATCH_MNT/testfile4 >> $seq.full
> +-t -d -f $SCRATCH_MNT/testfile4 >> $seqres.full
>
> xfs_bmap -v $SCRATCH_MNT/testfile4 | _filter_bmap
> od -x $SCRATCH_MNT/testfile4 | _filter_od
> diff --git a/tests/xfs/195 b/tests/xfs/195
> index cd64db1..e0755f4 100755
> --- a/tests/xfs/195
> +++ b/tests/xfs/195
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -82,5 +83,5 @@ _do_dump
>
> # success, all done
> echo "*** done"
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> diff --git a/tests/xfs/196 b/tests/xfs/196
> index 321fe47..20b20b2 100755
> --- a/tests/xfs/196
> +++ b/tests/xfs/196
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -93,5 +94,5 @@ done
>
> # success, all done
> echo "*** done"
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> diff --git a/tests/xfs/197 b/tests/xfs/197
> index 8c2ebd2..b17ea37 100755
> --- a/tests/xfs/197
> +++ b/tests/xfs/197
> @@ -28,6 +28,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -61,5 +62,5 @@ src/t_dir_offset $TEST_DIR/ttt
>
> # success, all done
> echo "*** done"
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> diff --git a/tests/xfs/199 b/tests/xfs/199
> index 127f307..fbca7c6 100755
> --- a/tests/xfs/199
> +++ b/tests/xfs/199
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -86,5 +87,5 @@ xfs_db -x $SCRATCH_DEV -c 'sb' -c 'print features2'
>
> # success, all done
> echo "*** done"
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> diff --git a/tests/xfs/200 b/tests/xfs/200
> index 34139cc..a70fcfe 100755
> --- a/tests/xfs/200
> +++ b/tests/xfs/200
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -121,5 +122,5 @@ _scratch_mount -o ro 2>&1 | _filter_scratch
>
> # success, all done
> echo "*** done"
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> diff --git a/tests/xfs/201 b/tests/xfs/201
> index e868d99..3f5b1fb 100755
> --- a/tests/xfs/201
> +++ b/tests/xfs/201
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -94,5 +95,5 @@ sync
>
> # success, all done
> echo "*** done"
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> diff --git a/tests/xfs/202 b/tests/xfs/202
> index 27f9e67..b0591d3 100755
> --- a/tests/xfs/202
> +++ b/tests/xfs/202
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -56,5 +57,5 @@ _scratch_xfs_repair -o force_geometry 2>&1 | _filter_repair
>
> # success, all done
> echo "*** done"
> -rm -f $seq.full
> +rm -f $seqres.full
> status=0
> diff --git a/tests/xfs/203 b/tests/xfs/203
> index ed89600..98ee792 100755
> --- a/tests/xfs/203
> +++ b/tests/xfs/203
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -61,7 +62,7 @@ _cleanup()
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> # get standard environment, filters and checks
> . ./common.rc
> diff --git a/tests/xfs/205 b/tests/xfs/205
> index 7c953db..8b973c2 100755
> --- a/tests/xfs/205
> +++ b/tests/xfs/205
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -38,14 +39,14 @@ _supported_os Linux
>
> _require_scratch
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> -_scratch_mkfs_xfs -d size=16m -b size=512 >> $seq.full 2>&1
> +_scratch_mkfs_xfs -d size=16m -b size=512 >> $seqres.full 2>&1
> _scratch_mount
>
> # fix the reserve block pool to a known size so that the enospc calculations
> # work out correctly.
> -_scratch_resvblks 1024 >> $seq.full 2>&1
> +_scratch_resvblks 1024 >> $seqres.full 2>&1
>
> # on a 16MB filesystem, there's 32768x512byte blocks. used is:
> # - 4944 in the log,
> diff --git a/tests/xfs/206 b/tests/xfs/206
> index 1c25305..7f822cc 100755
> --- a/tests/xfs/206
> +++ b/tests/xfs/206
> @@ -28,6 +28,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -58,7 +59,7 @@ if [ "$bitsperlong" -ne 64 ]; then
> _notrun "This test is only valid on 64 bit machines"
> fi
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> tmpfile=$TEST_DIR/fsfile.$$
> tmpdir=$TEST_DIR/tmpdir.$$
> diff --git a/tests/xfs/216 b/tests/xfs/216
> index a997d5a..486bd9d 100755
> --- a/tests/xfs/216
> +++ b/tests/xfs/216
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/217 b/tests/xfs/217
> index b33c2e7..25d3a15 100755
> --- a/tests/xfs/217
> +++ b/tests/xfs/217
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/220 b/tests/xfs/220
> index 061b395..a696aa0 100755
> --- a/tests/xfs/220
> +++ b/tests/xfs/220
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/222 b/tests/xfs/222
> index 133f221..bb22756 100755
> --- a/tests/xfs/222
> +++ b/tests/xfs/222
> @@ -26,6 +26,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -49,7 +50,7 @@ _supported_os Linux
>
> [ "$XFS_FSR_PROG" = "" ] && _notrun "xfs_fsr not found"
>
> -xfs_fsr -d -v $TEST_MNT > $seq.full 2>&1
> +xfs_fsr -d -v $TEST_MNT > $seqres.full 2>&1
>
> echo "--- silence is golden ---"
> status=0 ; exit
> diff --git a/tests/xfs/227 b/tests/xfs/227
> index 8403724..650c72e 100755
> --- a/tests/xfs/227
> +++ b/tests/xfs/227
> @@ -28,6 +28,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -50,7 +51,7 @@ _supported_fs xfs
> _supported_os Linux
> _require_scratch
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> [ "$XFS_FSR_PROG" = "" ] && _notrun "xfs_fsr not found"
>
> @@ -152,10 +153,10 @@ create_target_attr_last()
> create_attrs $nattrs $target
> }
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> # use a small filesystem so we can control freespace easily
> -_scratch_mkfs_sized $((50 * 1024 * 1024)) >> $seq.full 2>&1
> +_scratch_mkfs_sized $((50 * 1024 * 1024)) >> $seqres.full 2>&1
> _scratch_mount
> fragment_freespace
>
> @@ -187,20 +188,20 @@ _scratch_mount
>
> targ=$SCRATCH_MNT/fsr_test_file.$$
> for n in `seq 4 1 12`; do
> - echo "*** n == $n ***" >> $seq.full
> + echo "*** n == $n ***" >> $seqres.full
> for i in `seq 5 1 15`; do
> for j in `seq 5 1 20`; do
> - create_target_attr_first $i $j $targ.$i.$j >> $seq.full 2>&1
> + create_target_attr_first $i $j $targ.$i.$j >> $seqres.full 2>&1
> done
> - xfs_bmap -vp $targ.$i.* >> $seq.full 2>&1
> - FSRXFSTEST=true xfs_fsr -d -v -C $n $targ.$i.* >> $seq.full 2>&1
> - xfs_bmap -vp $targ.$i.* >> $seq.full 2>&1
> + xfs_bmap -vp $targ.$i.* >> $seqres.full 2>&1
> + FSRXFSTEST=true xfs_fsr -d -v -C $n $targ.$i.* >> $seqres.full 2>&1
> + xfs_bmap -vp $targ.$i.* >> $seqres.full 2>&1
> for j in `seq 5 1 20`; do
> - create_target_attr_last $i $j $targ.$i.$j >> $seq.full 2>&1
> + create_target_attr_last $i $j $targ.$i.$j >> $seqres.full 2>&1
> done
> - xfs_bmap -vp $targ.$i.* >> $seq.full 2>&1
> - FSRXFSTEST=true xfs_fsr -d -v -C $n $targ.$i.* >> $seq.full 2>&1
> - xfs_bmap -vp $targ.$i.* >> $seq.full 2>&1
> + xfs_bmap -vp $targ.$i.* >> $seqres.full 2>&1
> + FSRXFSTEST=true xfs_fsr -d -v -C $n $targ.$i.* >> $seqres.full 2>&1
> + xfs_bmap -vp $targ.$i.* >> $seqres.full 2>&1
> done
> done
>
> diff --git a/tests/xfs/229 b/tests/xfs/229
> index 52be5c3..eef6a2d 100755
> --- a/tests/xfs/229
> +++ b/tests/xfs/229
> @@ -29,6 +29,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/238 b/tests/xfs/238
> index e1a8749..00dd620 100755
> --- a/tests/xfs/238
> +++ b/tests/xfs/238
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/242 b/tests/xfs/242
> index eb5f9df..6476d5a 100755
> --- a/tests/xfs/242
> +++ b/tests/xfs/242
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/244 b/tests/xfs/244
> index c96d4eb..566caaa 100755
> --- a/tests/xfs/244
> +++ b/tests/xfs/244
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -51,7 +52,7 @@ _require_projid32bit
> export MOUNT_OPTIONS="-opquota"
>
> # make fs with no projid32bit
> -_scratch_mkfs_xfs -i projid32bit=0 >> $seq.full || _fail "mkfs failed"
> +_scratch_mkfs_xfs -i projid32bit=0 >> $seqres.full || _fail "mkfs failed"
> _qmount
> # make sure project quota is supported
> _require_prjquota ${SCRATCH_DEV}
> @@ -68,7 +69,7 @@ mkdir $dir
> touch $dir/below16bit
> # below 16bit value
> $XFS_QUOTA_PROG -x -c "project -s -p $dir/below16bit 3422" $SCRATCH_DEV \
> - >> $seq.full
> + >> $seqres.full
> projid=$($XFS_IO_PROG -r -c "lsproj" $dir/below16bit)
> if [ "projid = 3422" != "$projid" ]; then
> echo "FAIL: projid32bit disabled: returned projid value ($projid)"
> @@ -79,7 +80,7 @@ fi
> # 32bit value, should fail
> touch $dir/over16bit
> if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over16bit 108545" $SCRATCH_DEV \
> - >> $seq.full 2>&1; then
> + >> $seqres.full 2>&1; then
> echo "FAIL: projid32bit disabled: setting 32bit projid succeeded"
> echo " while it should fail"
> status=1
> @@ -87,7 +88,7 @@ fi
>
> # over 32bit value, should fail
> touch $dir/over32bit
> -if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over32bit 5344967296" $SCRATCH_DEV >> $seq.full 2>&1; then
> +if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over32bit 5344967296" $SCRATCH_DEV >> $seqres.full 2>&1; then
> echo "FAIL: projid32bit disabled: setting over 32bit projid succeeded"
> echo " while it should fail"
> status=1
> @@ -95,14 +96,14 @@ fi
>
> # Do testing on filesystem with projid32bit feature enabled
> umount $SCRATCH_DEV 2>/dev/null
> -_scratch_mkfs_xfs -i projid32bit=1 >> $seq.full || _fail "mkfs failed"
> +_scratch_mkfs_xfs -i projid32bit=1 >> $seqres.full || _fail "mkfs failed"
> _qmount
> mkdir $dir
>
> touch $dir/below16bit
> # below 16bit value, should succeed
> $XFS_QUOTA_PROG -x -c "project -s -p $dir/below16bit 3422" $SCRATCH_DEV \
> - >> $seq.full
> + >> $seqres.full
> projid=$($XFS_IO_PROG -r -c "lsproj" $dir/below16bit)
> if [ "projid = 3422" != "$projid" ]; then
> echo "FAIL: projid32bit enabled: returned projid value ($projid)"
> @@ -113,7 +114,7 @@ fi
> # 32bit value, should succeed
> touch $dir/over16bit
> if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over16bit 108545" $SCRATCH_DEV \
> - >> $seq.full 2>&1; then
> + >> $seqres.full 2>&1; then
> projid=$($XFS_IO_PROG -r -c "lsproj" $dir/over16bit)
> if [ "projid = 108545" != "$projid" ]; then
> echo "FAIL: projid32bit enabled: returned projid value ($projid)"
> @@ -129,7 +130,7 @@ fi
> # over 32bit value, should fail
> touch $dir/over32bit
> if $XFS_QUOTA_PROG -x -c "project -s -p $dir/over32bit 5344967296" $SCRATCH_DEV \
> - >> $seq.full 2>&1; then
> + >> $seqres.full 2>&1; then
> echo "FAIL: projid32bit enabled: setting over 32bit projid succeeded"
> echo " while it should fail"
> status=1
> diff --git a/tests/xfs/250 b/tests/xfs/250
> index 2dd12e8..a6edc2d 100755
> --- a/tests/xfs/250
> +++ b/tests/xfs/250
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/252 b/tests/xfs/252
> index 9f0424d..be3bfcf 100755
> --- a/tests/xfs/252
> +++ b/tests/xfs/252
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/253 b/tests/xfs/253
> index b63b7f6..b73cf6d 100755
> --- a/tests/xfs/253
> +++ b/tests/xfs/253
> @@ -33,6 +33,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/259 b/tests/xfs/259
> index 91503a0..6a29230 100755
> --- a/tests/xfs/259
> +++ b/tests/xfs/259
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> status=1 # failure is the default!
> diff --git a/tests/xfs/261 b/tests/xfs/261
> index 8903ec8..7c575aa 100755
> --- a/tests/xfs/261
> +++ b/tests/xfs/261
> @@ -26,6 +26,7 @@
> #
>
> seq=$(basename $0)
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by ${seq}"
>
> here=$(pwd)
> diff --git a/tests/xfs/262 b/tests/xfs/262
> index 5a060f1..2ed7123 100755
> --- a/tests/xfs/262
> +++ b/tests/xfs/262
> @@ -27,6 +27,7 @@
> #
>
> seq=$(basename $0)
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by ${seq}"
>
> here=$(pwd)
> diff --git a/tests/xfs/266 b/tests/xfs/266
> index 89c590f..3efbb75 100755
> --- a/tests/xfs/266
> +++ b/tests/xfs/266
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/267 b/tests/xfs/267
> index c52d810..05360a9 100755
> --- a/tests/xfs/267
> +++ b/tests/xfs/267
> @@ -22,6 +22,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/268 b/tests/xfs/268
> index 36391a3..c0c45f2 100755
> --- a/tests/xfs/268
> +++ b/tests/xfs/268
> @@ -24,6 +24,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/278 b/tests/xfs/278
> index 559e174..6439eb4 100755
> --- a/tests/xfs/278
> +++ b/tests/xfs/278
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -60,22 +61,22 @@ _scratch_unmount
> echo "Silence is goodness..."
>
> # Corrupt DIR
> -xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].inumber.i4 0" $SCRATCH_DEV >> $seq.full
> -xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].name 0" $SCRATCH_DEV >> $seq.full
> -xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].offset 0" $SCRATCH_DEV >> $seq.full
> -xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].namelen 0" $SCRATCH_DEV >> $seq.full
> -xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" $SCRATCH_DEV >> $seq.full
> -xfs_db -x -c "inode $DIR_INO" -c "write core.nlinkv2 0" $SCRATCH_DEV >> $seq.full
> +xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].inumber.i4 0" $SCRATCH_DEV >> $seqres.full
> +xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].name 0" $SCRATCH_DEV >> $seqres.full
> +xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].offset 0" $SCRATCH_DEV >> $seqres.full
> +xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].namelen 0" $SCRATCH_DEV >> $seqres.full
> +xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" $SCRATCH_DEV >> $seqres.full
> +xfs_db -x -c "inode $DIR_INO" -c "write core.nlinkv2 0" $SCRATCH_DEV >> $seqres.full
>
> # Corrupt SUBDIR
> -xfs_db -x -c "inode $SUBDIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" $SCRATCH_DEV >> $seq.full
> -xfs_db -x -c "inode $SUBDIR_INO" -c "write core.nlinkv2 0" $SCRATCH_DEV >> $seq.full
> +xfs_db -x -c "inode $SUBDIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" $SCRATCH_DEV >> $seqres.full
> +xfs_db -x -c "inode $SUBDIR_INO" -c "write core.nlinkv2 0" $SCRATCH_DEV >> $seqres.full
>
> -echo "===== BEGIN of xfs_repair =====" >> $seq.full
> -echo "" >>$seq.full
> +echo "===== BEGIN of xfs_repair =====" >> $seqres.full
> +echo "" >>$seqres.full
>
> -xfs_repair $SCRATCH_DEV >> $seq.full 2>&1
> -echo "===== END of xfs_repair =====" >> $seq.full
> +xfs_repair $SCRATCH_DEV >> $seqres.full 2>&1
> +echo "===== END of xfs_repair =====" >> $seqres.full
>
> #if _check_scratch_fs; then
> # status=0
> diff --git a/tests/xfs/279 b/tests/xfs/279
> index 8ee3328..e96c823 100755
> --- a/tests/xfs/279
> +++ b/tests/xfs/279
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -48,7 +49,7 @@ _supported_os Linux
>
> _require_scsi_debug
>
> -rm -f $seq.full
> +rm -f $seqres.full
>
> # Remove xfs signature so -f isn't needed to re-mkfs
> _wipe_device()
> @@ -67,7 +68,7 @@ _check_mkfs()
> return
> fi
> echo "Passed."
> - cat $tmp.mkfs.full | _filter_mkfs >> $seq.full 2>$tmp.mkfs
> + cat $tmp.mkfs.full | _filter_mkfs >> $seqres.full 2>$tmp.mkfs
> . $tmp.mkfs
> echo "Got sector size: $sectsz"
> device=`echo $@ | awk '{print $NF}'`
> @@ -83,7 +84,7 @@ SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 128`
> _check_mkfs $SCSI_DEBUG_DEV
> # blocksize smaller than physical sectorsize should revert to logical sectorsize
> _check_mkfs -b size=2048 -f $SCSI_DEBUG_DEV
> -) | tee -a $seq.full
> +) | tee -a $seqres.full
> _put_scsi_debug_dev
>
> # === 4k physical 512b logical unaligned
> @@ -99,7 +100,7 @@ _check_mkfs -f $SCSI_DEBUG_DEV
> _check_mkfs -s size=4096 $SCSI_DEBUG_DEV
> # with 4k sector specified should fall back to logical sector size with force
> _check_mkfs -s size=4096 -f $SCSI_DEBUG_DEV
> -) | tee -a $seq.full
> +) | tee -a $seqres.full
> _put_scsi_debug_dev
>
> # === hard 4k physical / 4k logical
> @@ -111,7 +112,7 @@ SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 4096 0 128`
> _check_mkfs -b size=2048 $SCSI_DEBUG_DEV
> # sector size smaller than physical sector size should fail
> _check_mkfs -s size=512 $SCSI_DEBUG_DEV
> -) | tee -a $seq.full
> +) | tee -a $seqres.full
> _put_scsi_debug_dev
>
> status=0
> diff --git a/tests/xfs/281 b/tests/xfs/281
> index 2af3533..7aae2a5 100755
> --- a/tests/xfs/281
> +++ b/tests/xfs/281
> @@ -23,6 +23,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> diff --git a/tests/xfs/282 b/tests/xfs/282
> index 4938408..0680b9c 100755
> --- a/tests/xfs/282
> +++ b/tests/xfs/282
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -45,13 +46,13 @@ _require_legacy_v2_format
> _create_dumpdir_fill
> # ensure file/dir timestamps precede dump timestamp
> sleep 2
> -src/bstat $SCRATCH_MNT >>$here/$seq.full
> +src/bstat $SCRATCH_MNT >>$here/$seqres.full
>
> echo "*** Level 0 dump, format 2"
> _do_dump_file -f $tmp.l0 -K
>
> _append_dumpdir_fill
> -src/bstat $SCRATCH_MNT >>$here/$seq.full
> +src/bstat $SCRATCH_MNT >>$here/$seqres.full
>
> echo "*** Level 1 dump, current format"
> _do_dump_file -l 1 -f $tmp.l1
> diff --git a/tests/xfs/283 b/tests/xfs/283
> index d1ce8ad..75ee26e 100755
> --- a/tests/xfs/283
> +++ b/tests/xfs/283
> @@ -25,6 +25,7 @@
> #
>
> seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> echo "QA output created by $seq"
>
> here=`pwd`
> @@ -45,13 +46,13 @@ _require_legacy_v2_format
> _create_dumpdir_fill
> # ensure file/dir timestamps precede dump timestamp
> sleep 2
> -src/bstat $SCRATCH_MNT >>$here/$seq.full
> +src/bstat $SCRATCH_MNT >>$here/$seqres.full
>
> echo "*** Level 0 dump, current format"
> _do_dump_file -f $tmp.l0
>
> _append_dumpdir_fill
> -src/bstat $SCRATCH_MNT >>$here/$seq.full
> +src/bstat $SCRATCH_MNT >>$here/$seqres.full
>
> echo "*** Level 1 dump, format 2"
> _do_dump_file -l 1 -f $tmp.l1 -K
Quite a lot of tests use $here/$seq.full. This results in
$here/$seqres.full after the sed. $seqres is just a $RESULT_DIR/$seq.
This would break if RESULT_DIR was set to an absolute path instead of
relative path.
This sed command could probably be better for the conversion:
sed -i -e '/^seq=.*$/a seqres=$RESULT_DIR/$seq' -e
's/[^/]seq.full/seqres.full/' -e 's;here/\$seq;RESULT_DIR/\$seq;g'
tests/*/*
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 17/18] xfstests: convert tests to use new results directory
2012-09-05 12:00 ` Boris Ranto
@ 2012-09-05 23:04 ` Dave Chinner
2012-09-06 12:34 ` Boris Ranto
0 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-09-05 23:04 UTC (permalink / raw)
To: Boris Ranto; +Cc: xfs
On Wed, Sep 05, 2012 at 02:00:35PM +0200, Boris Ranto wrote:
> On Thu, 2012-07-26 at 19:28 +1000, Dave Chinner wrote:
> > From: Dave Chinner <dchinner@redhat.com>
> >
> > Essentially the change is simply this. Converting:
> >
> > ... >> $seq.????
> >
> > to:
> >
> > .... >> $RESULT_DIR/$seq.????
> >
> > so that output files are directed to the defined output directory.
> >
> > sed to the rescue:
> >
> > $ sed -i -e '/^seq=.*$/a seqres=$RESULT_DIR/$seq' -e 's/seq.full/seqres.full/' tests/*/*
> >
> > will do most of the work automatically.
.....
> Quite a lot of tests use $here/$seq.full. This results in
> $here/$seqres.full after the sed. $seqres is just a $RESULT_DIR/$seq.
> This would break if RESULT_DIR was set to an absolute path instead of
> relative path.
Yes. As the patch description says it "will do most of the work",
but it doesn't do all of it. Indeed, supporting full paths for
$RESULT_DIR is actually necessary for other reasons, such as
supporting completely external result destinations. To that end, I
have a patch in my current series that does the rest of the
conversion with the appropriate setup changes:
commit 08dbbb1e6a82a4ed04e0622b7ee63957fae7721b
Author: Dave Chinner <dchinner@redhat.com>
Date: Wed Aug 22 16:09:33 2012 +1000
xfstests: RESULTS_DIR needs to be an absolute path
Some tests 'cd <somedir>' and then direct output to $RESULT_DIR,
which fails if the current working directory is not $here.
Regardless, if an external results directory is to be used it needs
to have a full path specified and the use of $here as the base of
the results files is completely incorrect.
Hence change all the $here/$seqres* references to simply be
$seqres*, and instead encode the full path to the results in
$RESULT_DIR.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 17/18] xfstests: convert tests to use new results directory
2012-09-05 23:04 ` Dave Chinner
@ 2012-09-06 12:34 ` Boris Ranto
2012-09-06 23:14 ` Dave Chinner
0 siblings, 1 reply; 49+ messages in thread
From: Boris Ranto @ 2012-09-06 12:34 UTC (permalink / raw)
To: Dave Chinner; +Cc: Boris Ranto, xfs
On Thu, Sep 6, 2012 at 1:04 AM, Dave Chinner <david@fromorbit.com> wrote:
> On Wed, Sep 05, 2012 at 02:00:35PM +0200, Boris Ranto wrote:
>> On Thu, 2012-07-26 at 19:28 +1000, Dave Chinner wrote:
>> > From: Dave Chinner <dchinner@redhat.com>
>> >
>> > Essentially the change is simply this. Converting:
>> >
>> > ... >> $seq.????
>> >
>> > to:
>> >
>> > .... >> $RESULT_DIR/$seq.????
>> >
>> > so that output files are directed to the defined output directory.
>> >
>> > sed to the rescue:
>> >
>> > $ sed -i -e '/^seq=.*$/a seqres=$RESULT_DIR/$seq' -e 's/seq.full/seqres.full/' tests/*/*
>> >
>> > will do most of the work automatically.
> .....
>> Quite a lot of tests use $here/$seq.full. This results in
>> $here/$seqres.full after the sed. $seqres is just a $RESULT_DIR/$seq.
>> This would break if RESULT_DIR was set to an absolute path instead of
>> relative path.
>
> Yes. As the patch description says it "will do most of the work",
> but it doesn't do all of it. Indeed, supporting full paths for
> $RESULT_DIR is actually necessary for other reasons, such as
> supporting completely external result destinations. To that end, I
> have a patch in my current series that does the rest of the
> conversion with the appropriate setup changes:
>
> commit 08dbbb1e6a82a4ed04e0622b7ee63957fae7721b
> Author: Dave Chinner <dchinner@redhat.com>
> Date: Wed Aug 22 16:09:33 2012 +1000
>
> xfstests: RESULTS_DIR needs to be an absolute path
>
>
> Some tests 'cd <somedir>' and then direct output to $RESULT_DIR,
> which fails if the current working directory is not $here.
> Regardless, if an external results directory is to be used it needs
> to have a full path specified and the use of $here as the base of
> the results files is completely incorrect.
>
> Hence change all the $here/$seqres* references to simply be
> $seqres*, and instead encode the full path to the results in
> $RESULT_DIR.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
>
> Cheers,
>
> Dave.
> --
> Dave Chinner
> david@fromorbit.com
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
OK, I just wanted to report the issue.
btw: The installation does not seem to work with the posted patches
(it expects the old '[0-9]??' tests to be in the root directory of
xfstests). Do you have/work on any patch for that?
Regards,
Boris
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 17/18] xfstests: convert tests to use new results directory
2012-09-06 12:34 ` Boris Ranto
@ 2012-09-06 23:14 ` Dave Chinner
2012-09-07 12:47 ` Boris Ranto
0 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2012-09-06 23:14 UTC (permalink / raw)
To: Boris Ranto; +Cc: Boris Ranto, xfs
On Thu, Sep 06, 2012 at 02:34:12PM +0200, Boris Ranto wrote:
> btw: The installation does not seem to work with the posted patches
> (it expects the old '[0-9]??' tests to be in the root directory of
> xfstests). Do you have/work on any patch for that?
I haven't touched the makefiles/install scripts - that's the last
thing I planned to do once all the changes are sorted. Thanks for
reminding me it needs to be done, though. ;)
Cheers
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 17/18] xfstests: convert tests to use new results directory
2012-09-06 23:14 ` Dave Chinner
@ 2012-09-07 12:47 ` Boris Ranto
0 siblings, 0 replies; 49+ messages in thread
From: Boris Ranto @ 2012-09-07 12:47 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs
[-- Attachment #1: Type: text/plain, Size: 779 bytes --]
On Fri, Sep 7, 2012 at 1:14 AM, Dave Chinner <david@fromorbit.com> wrote:
> On Thu, Sep 06, 2012 at 02:34:12PM +0200, Boris Ranto wrote:
>> btw: The installation does not seem to work with the posted patches
>> (it expects the old '[0-9]??' tests to be in the root directory of
>> xfstests). Do you have/work on any patch for that?
>
> I haven't touched the makefiles/install scripts - that's the last
> thing I planned to do once all the changes are sorted. Thanks for
> reminding me it needs to be done, though. ;)
>
OK, so I've made it installable with the attached patch. The patch
will most probably need to be modified later but now, it might be
useful for someone who wants to test your patch series.
-Boris
> Cheers
>
> Dave.
> --
> Dave Chinner
> david@fromorbit.com
[-- Attachment #2: 0001-Fix-the-installation-script.patch --]
[-- Type: application/octet-stream, Size: 11352 bytes --]
From b7ff319edc704d528703f535c2c51a354ceab713 Mon Sep 17 00:00:00 2001
From: Boris Ranto <ranto.boris@gmail.com>
Date: Fri, 7 Sep 2012 14:25:42 +0200
Subject: [PATCH] Fix the installation script
This patch will recursively call Makefiles of tests subdirectories.
All the [0-9]??{,.*} files are installed and all the group files are installed
---
Makefile | 9 ++-----
tests/Makefile | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
tests/btrfs/Makefile | 27 +++++++++++++++++++++++++
tests/ext4/Makefile | 27 +++++++++++++++++++++++++
tests/generic/Makefile | 27 +++++++++++++++++++++++++
tests/shared/Makefile | 27 +++++++++++++++++++++++++
tests/udf/Makefile | 27 +++++++++++++++++++++++++
tests/xfs/Makefile | 27 +++++++++++++++++++++++++
8 files changed, 215 insertions(+), 6 deletions(-)
create mode 100644 tests/Makefile
create mode 100644 tests/btrfs/Makefile
create mode 100644 tests/ext4/Makefile
create mode 100644 tests/generic/Makefile
create mode 100644 tests/shared/Makefile
create mode 100644 tests/udf/Makefile
create mode 100644 tests/xfs/Makefile
diff --git a/Makefile b/Makefile
index 1490e21..235e8ec 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,6 @@ ifeq ($(HAVE_BUILDDEFS), yes)
include $(TOPDIR)/include/builddefs
endif
-TESTS = $(shell sed -n -e '/^[0-9][0-9][0-9]*/s/ .*//p' group)
CONFIGURE = configure include/builddefs include/config.h
LSRCFILES = configure configure.in aclocal.m4 README VERSION
LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \
@@ -48,13 +47,14 @@ LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \
LIB_SUBDIRS = include lib
TOOL_SUBDIRS = ltp src m4
+TESTS_SUBDIRS = tests
ifeq ($(HAVE_DMAPI), true)
TOOL_SUBDIRS += dmapi
endif
-SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
+SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) $(TESTS_SUBDIRS)
-default: include/builddefs $(DMAPI_MAKEFILE) $(TESTS)
+default: include/builddefs $(DMAPI_MAKEFILE)
ifeq ($(HAVE_BUILDDEFS), no)
$(Q)$(MAKE) $(MAKEOPTS) $@
else
@@ -87,11 +87,8 @@ depend: include/builddefs $(addsuffix -depend,$(SUBDIRS))
install: default $(addsuffix -install,$(SUBDIRS))
$(INSTALL) -m 755 -d $(PKG_LIB_DIR)
$(INSTALL) -m 755 check $(PKG_LIB_DIR)
- $(INSTALL) -m 755 [0-9]?? $(PKG_LIB_DIR)
- $(INSTALL) -m 755 run.* $(PKG_LIB_DIR)
$(INSTALL) -m 644 group $(PKG_LIB_DIR)
$(INSTALL) -m 644 randomize.awk $(PKG_LIB_DIR)
- $(INSTALL) -m 644 [0-9]??.* $(PKG_LIB_DIR)
$(INSTALL) -m 644 common* $(PKG_LIB_DIR)
# Nothing.
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 0000000..0d374f4
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2012 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; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will 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 to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+
+TOPDIR = ..
+include $(TOPDIR)/include/builddefs
+
+ifeq ("$(origin V)", "command line")
+ BUILD_VERBOSE = $(V)
+endif
+ifndef BUILD_VERBOSE
+ BUILD_VERBOSE = 0
+endif
+
+ifeq ($(BUILD_VERBOSE),1)
+ Q =
+else
+ Q = @
+endif
+
+MAKEOPTS = --no-print-directory Q=$(Q)
+
+SUBDIRS = btrfs ext4 generic shared udf xfs
+
+# Nothing
+all:
+
+# Just call everything important
+install: dir $(addsuffix -install,$(SUBDIRS))
+
+dir:
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR)/tests
+
+%-install:
+ $(MAKE) $(MAKEOPTS) -C $* install
diff --git a/tests/btrfs/Makefile b/tests/btrfs/Makefile
new file mode 100644
index 0000000..8d1f9f2
--- /dev/null
+++ b/tests/btrfs/Makefile
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2012 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; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will 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 to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+
+TOPDIR=../..
+include $(TOPDIR)/include/builddefs
+
+install:
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR)/tests/btrfs
+ $(INSTALL) -m 755 [0-9]?? $(PKG_LIB_DIR)/tests/btrfs
+ $(INSTALL) -m 755 [0-9]??.* $(PKG_LIB_DIR)/tests/btrfs
+ $(INSTALL) -m 755 group $(PKG_LIB_DIR)/tests/btrfs
diff --git a/tests/ext4/Makefile b/tests/ext4/Makefile
new file mode 100644
index 0000000..3a27425
--- /dev/null
+++ b/tests/ext4/Makefile
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 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; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will 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 to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+
+TOPDIR=../../
+include $(TOPDIR)/include/builddefs
+
+install:
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR)/tests/ext4
+ $(INSTALL) -m 755 [0-9]?? $(PKG_LIB_DIR)/tests/ext4
+ $(INSTALL) -m 755 [0-9]??.* $(PKG_LIB_DIR)/tests/ext4
+ $(INSTALL) -m 755 group $(PKG_LIB_DIR)/tests/ext4
diff --git a/tests/generic/Makefile b/tests/generic/Makefile
new file mode 100644
index 0000000..6529393
--- /dev/null
+++ b/tests/generic/Makefile
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 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; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will 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 to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+
+TOPDIR=../../
+include $(TOPDIR)/include/builddefs
+
+install:
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR)/tests/generic
+ $(INSTALL) -m 755 [0-9]?? $(PKG_LIB_DIR)/tests/generic
+ $(INSTALL) -m 755 [0-9]??.* $(PKG_LIB_DIR)/tests/generic
+ $(INSTALL) -m 755 group $(PKG_LIB_DIR)/tests/generic
diff --git a/tests/shared/Makefile b/tests/shared/Makefile
new file mode 100644
index 0000000..432ba7c
--- /dev/null
+++ b/tests/shared/Makefile
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 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; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will 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 to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+
+TOPDIR=../../
+include $(TOPDIR)/include/builddefs
+
+install:
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR)/tests/shared
+ $(INSTALL) -m 755 [0-9]?? $(PKG_LIB_DIR)/tests/shared
+ $(INSTALL) -m 755 [0-9]??.* $(PKG_LIB_DIR)/tests/shared
+ $(INSTALL) -m 755 group $(PKG_LIB_DIR)/tests/shared
diff --git a/tests/udf/Makefile b/tests/udf/Makefile
new file mode 100644
index 0000000..b34a144
--- /dev/null
+++ b/tests/udf/Makefile
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 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; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will 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 to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+
+TOPDIR=../../
+include $(TOPDIR)/include/builddefs
+
+install:
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR)/tests/udf
+ $(INSTALL) -m 755 [0-9]?? $(PKG_LIB_DIR)/tests/udf
+ $(INSTALL) -m 755 [0-9]??.* $(PKG_LIB_DIR)/tests/udf
+ $(INSTALL) -m 755 group $(PKG_LIB_DIR)/tests/udf
diff --git a/tests/xfs/Makefile b/tests/xfs/Makefile
new file mode 100644
index 0000000..dc4778f
--- /dev/null
+++ b/tests/xfs/Makefile
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 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; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will 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 to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+
+TOPDIR=../../
+include $(TOPDIR)/include/builddefs
+
+install:
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR)/tests/xfs
+ $(INSTALL) -m 755 [0-9]?? $(PKG_LIB_DIR)/tests/xfs
+ $(INSTALL) -m 755 [0-9]??.* $(PKG_LIB_DIR)/tests/xfs
+ $(INSTALL) -m 755 group $(PKG_LIB_DIR)/tests/xfs
--
1.7.1
[-- Attachment #3: Type: text/plain, Size: 121 bytes --]
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2012-08-23 17:00 ` Ben Myers
2012-08-24 4:07 ` Dave Chinner
@ 2013-02-25 15:50 ` Eric Sandeen
2013-02-25 21:52 ` Dave Chinner
1 sibling, 1 reply; 49+ messages in thread
From: Eric Sandeen @ 2013-02-25 15:50 UTC (permalink / raw)
To: Ben Myers; +Cc: Theodore Tso, Mark Tinguely, xfs
On 8/23/12 12:00 PM, Ben Myers wrote:
> Dave,
>
> On Thu, Aug 23, 2012 at 09:42:19AM +1000, Dave Chinner wrote:
>> On Wed, Aug 22, 2012 at 02:16:42PM -0500, Ben Myers wrote:
>>> On Wed, Aug 22, 2012 at 08:09:26AM +1000, Dave Chinner wrote:
>>>> On Tue, Aug 21, 2012 at 11:33:37AM -0500, Ben Myers wrote:
>>>>> On Tue, Aug 21, 2012 at 08:43:06AM +1000, Dave Chinner wrote:
>>>>>> On Mon, Aug 20, 2012 at 04:27:25PM -0500, Mark Tinguely wrote:
>>>>>>> On 07/26/12 04:27, Dave Chinner wrote:
>>>>>>>> Alt-Subject: Games with Sed, Grep and Awk.
>>>>>>>>
>>>>>>>> This series is based on top of the large filesystem test series.
>>>>>>>>
>>>>>>>> This moves all the tests into a ./tests subdirectory, and sorts them into
>>>>>>>> classes of related tests. Those are:
>>>>>>>>
>>>>>>>> tests/generic: valid for all filesystems
>>>>>>>> tests/shared: valid for a limited number of filesystems
>>>>>>>> tests/xfs: xfs specific tests
>>>>>>>> tests/btrfs btrfs specific tests
>>>>>>>> tests/ext4 ext4 specific tests
>>>>>>>> tests/udf udf specific tests
>>>>>>>
>>>>>>> The SGI XFS group talked about your proposed changes to xfstests and
>>>>>>> the response is very positive.
>>>>>>>
>>>>>>> The couple concerns are:
>>>>>>>
>>>>>>> 1) There is a consensus in the group that the benchmark framework
>>>>>>> should remain until there is a common benchmark available.
>>>>>>>
>>>>>>> Could the benchmark infrastructure be placed into its own directory
>>>>>>> until a new common benchmark framework has been adopted?
>>>>>>
>>>>>> Keeping it just complicates things. The benchmark infrastructure
>>>>>> is bitrotted and was largely just a hack tacked on to the side of
>>>>>> the regression test suite.
>>>>>>
>>>>>> For it to be useful in an automated test environment, it would need
>>>>>> to be re-implemented from scratch with reliable recording of results
>>>>>> and the ability to determine if a result is unusual or not. None of
>>>>>> this exists - it's just a framework to run a couple of benchmarks
>>>>>> and dump some output to stdout using the xfstests machine config
>>>>>> files....
>>>>>>
>>>>>> I have tried integrating other benchmarks into xfstests a while back
>>>>>> (e.g. compile bench, fsmark, etc) and using the results for some
>>>>>> kind of meaningful performance regression test. I rapidly came to
>>>>>> the conclusion that the infrastructure was not up to scratch and
>>>>>> that my simple handwritten standalone test scripts to iterate
>>>>>> through benchmarks and capture results was much easier to use and
>>>>>> modify than to jump through the weird bench infrastructure hoops.
>>>>>>
>>>>>> So, no, I don't think it's worth keeping at all.
>>>>>
>>>>> You've already made it clear that you feel the current bench implementation is
>>>>> not worth keeping. Once a suitable replacement for the bench infrastructure
>>>>> has been implemented we can remove the old one. Until then we prefer to keep
>>>>> what we have in the tree.
>>>>
>>>> That's not how the process works
>>>
>>> That is exactly how the process works. You posted an RFC and Mark and the XFS
>>> team at SGI walked through your patch set. Mark subsequently posted the
>>> commentary in reply to your RFC. Cruft or not, the removal of a feature goes
>>> through the same review process as everything else.
>>
>> Sure, but you need to justify your arguments for keeping something
>> with evidence and logic - handwaving about wanting something is, and
>> always has been, insufficient justification. That's the part of the
>> process I'm talking about - that statements of need require
>> evidence, especially when you agreed to the removal at LSF in San
>> Fransisco a few months ago. My arguments at the time were:
>>
>> a) nobody is actually using it,
>> b) it has effectively been unmaintained since 2003
>> c) it has no regression analysis or detection capability
>> d) it shares *very little* of xfstests
>> e) it gets in the way of cleaning up xfstests
>> f) there are far better workload generators that are being
>> actively maintained.
>>
>> And AFAIA, nothing has changed in the past few months.
>
> "In this case, SGI would like to keep the benchmark capability in xfstests in
> order have a better chance of catching performance regressions." There has
> been a been performance regression in the past few months (and there will be
> more in the future), we have had performance regressions internally too, and
> this has brought the value of having benchmarks in xfstests into sharp focus.
"xfs has had performance regressions; xfstests contains bitrotted perf code"
But that's not a justification for keeping bitrotted code.
I think you finally answered the basic question Dave asked, and we learned
that SGI is not using the code which he proposes removing.
<snip>
> I understand that bench is bitrotted, but it still has some value even today.
Not if nobody uses it. If it really had value it would be in use.
> Phil has agreed to take this on as a project so the bitrot will be addressed.
How's that been going in the 6 months since this patchset stalled?
Can we get it moving again? Ext4 folks would like to see these changes
proceed as well. What issues remain, if any?
Thanks,
-Eric
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2013-02-25 15:50 ` Eric Sandeen
@ 2013-02-25 21:52 ` Dave Chinner
2013-02-26 0:27 ` Theodore Ts'o
0 siblings, 1 reply; 49+ messages in thread
From: Dave Chinner @ 2013-02-25 21:52 UTC (permalink / raw)
To: Eric Sandeen; +Cc: Ben Myers, Theodore Tso, Mark Tinguely, xfs
On Mon, Feb 25, 2013 at 09:50:12AM -0600, Eric Sandeen wrote:
> On 8/23/12 12:00 PM, Ben Myers wrote:
> > On Thu, Aug 23, 2012 at 09:42:19AM +1000, Dave Chinner wrote:
> >> Sure, but you need to justify your arguments for keeping something
> >> with evidence and logic - handwaving about wanting something is, and
> >> always has been, insufficient justification. That's the part of the
> >> process I'm talking about - that statements of need require
> >> evidence, especially when you agreed to the removal at LSF in San
> >> Fransisco a few months ago. My arguments at the time were:
> >>
> >> a) nobody is actually using it,
> >> b) it has effectively been unmaintained since 2003
> >> c) it has no regression analysis or detection capability
> >> d) it shares *very little* of xfstests
> >> e) it gets in the way of cleaning up xfstests
> >> f) there are far better workload generators that are being
> >> actively maintained.
> >>
> >> And AFAIA, nothing has changed in the past few months.
> >
> > "In this case, SGI would like to keep the benchmark capability in xfstests in
> > order have a better chance of catching performance regressions." There has
> > been a been performance regression in the past few months (and there will be
> > more in the future), we have had performance regressions internally too, and
> > this has brought the value of having benchmarks in xfstests into sharp focus.
>
> "xfs has had performance regressions; xfstests contains bitrotted perf code"
>
> But that's not a justification for keeping bitrotted code.
>
> I think you finally answered the basic question Dave asked, and we learned
> that SGI is not using the code which he proposes removing.
>
> <snip>
>
> > I understand that bench is bitrotted, but it still has some value even today.
>
> Not if nobody uses it. If it really had value it would be in use.
>
> > Phil has agreed to take this on as a project so the bitrot will be addressed.
>
> How's that been going in the 6 months since this patchset stalled?
>
> Can we get it moving again? Ext4 folks would like to see these changes
> proceed as well. What issues remain, if any?
AFAIC, none. But it will take me some time to rebase the patchsets
on a current TOT as there are a bunch more tests and infrastructure
changes since then, and I currently have my plate full.
Eric (or anyone else), seeing as I'm not going to get back to this
for a while yet, I'm happy for you to take over this patchset (and
the --largefs patch set it is based on and rebase them on a current
tree...
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2013-02-25 21:52 ` Dave Chinner
@ 2013-02-26 0:27 ` Theodore Ts'o
2013-02-26 3:18 ` Dave Chinner
2013-02-26 3:22 ` Ben Myers
0 siblings, 2 replies; 49+ messages in thread
From: Theodore Ts'o @ 2013-02-26 0:27 UTC (permalink / raw)
To: Dave Chinner; +Cc: Ben Myers, Eric Sandeen, Mark Tinguely, xfs
If the SGI folks are still resistant to removing the bitrotted
performance tests, I have a much simpler patch which we've been using
inside Google for a while now which allows for alphanumeric tests
"numbers". This allows us to use tests such as "g001", "g002", etc.,
without having to worry about test number collisions fom upstream.
That would also be useful for ext4 since we could keep a fork of
xfstests with e001, e002, e003, etc., while we wait for the tests to
be reviewed for inclusing in the SGI tree.
I hadn't bothered submitting it since it was clear Dave's changes was
better, but the advantage of the hack we've been using inside Google
is that it's a much less intrusive patch.
The reason why I'm interested in having e001, e002, etc., patches is
that at the moment we've got a number of people using private xfstests
repositories and reporting regressions based on them. They are using
numbers such as "301", which is very confusing since they aren't
upstream and there's a chance the test may get renumbered by the time
it does go upstream.
The advantage of using a named-based system, or using patch numbers
such as e001, g001, etc., is that it makes it a lot easier to keep
track of tests that haven't made it upstream to the xfstests git
repository.
Cheers,
- Ted
P.S. I'm happy to review Dmitry's patches if it will help, but I
wasn't sure whether you were looking for someone more experienced with
the xfstests code base to review them.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2013-02-26 0:27 ` Theodore Ts'o
@ 2013-02-26 3:18 ` Dave Chinner
2013-02-26 3:22 ` Ben Myers
1 sibling, 0 replies; 49+ messages in thread
From: Dave Chinner @ 2013-02-26 3:18 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: Ben Myers, Eric Sandeen, Mark Tinguely, xfs
On Mon, Feb 25, 2013 at 07:27:43PM -0500, Theodore Ts'o wrote:
> If the SGI folks are still resistant to removing the bitrotted
> performance tests, I have a much simpler patch which we've been using
> inside Google for a while now which allows for alphanumeric tests
> "numbers". This allows us to use tests such as "g001", "g002", etc.,
> without having to worry about test number collisions fom upstream.
I hope it's not going to be an issue. We need the tests to be split
up into subdirectories more than we need the bitrotted perf code. If
it remains a blocking issue (i.e. the community wants to take
xfstests in a direction SGI doesn't agree with), then I'll seriously
consider taking xfstests development back to the kernel.org trees
just like Christoph did last time SGI dropped the community ball...
> That would also be useful for ext4 since we could keep a fork of
> xfstests with e001, e002, e003, etc., while we wait for the tests to
> be reviewed for inclusing in the SGI tree.
>
> I hadn't bothered submitting it since it was clear Dave's changes was
> better, but the advantage of the hack we've been using inside Google
> is that it's a much less intrusive patch.
I agreed that it is useful and less intrusive, but it doesn't really
help solve any of the problems we really need to solve. e.g like
arbitrary test names, separating results from test source so it's
easy to archive/data mine results from multiple test runs, distro
specific test avoidance, etc.
> The reason why I'm interested in having e001, e002, etc., patches is
> that at the moment we've got a number of people using private xfstests
> repositories and reporting regressions based on them. They are using
> numbers such as "301", which is very confusing since they aren't
> upstream and there's a chance the test may get renumbered by the time
> it does go upstream.
>
> The advantage of using a named-based system, or using patch numbers
> such as e001, g001, etc., is that it makes it a lot easier to keep
> track of tests that haven't made it upstream to the xfstests git
> repository.
*nod*. That's precisely why this patchset is more important for the
wider xfstests community than keeping the bitrotted benchmarking
code....
> P.S. I'm happy to review Dmitry's patches if it will help, but I
> wasn't sure whether you were looking for someone more experienced with
> the xfstests code base to review them.
I've already reviewed them as to how they fit into xfstests, and
Dimitry has quickly addressed all the issues I raised. All
that remains is testing to make sure that there are no brown paper
bag bugs that we've missed and that it works properly in more than
one developer's environment.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [RFC] [PATCH 0/18] xfstests: move tests out of top level
2013-02-26 0:27 ` Theodore Ts'o
2013-02-26 3:18 ` Dave Chinner
@ 2013-02-26 3:22 ` Ben Myers
1 sibling, 0 replies; 49+ messages in thread
From: Ben Myers @ 2013-02-26 3:22 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: Eric Sandeen, Mark Tinguely, xfs
Hi Ted,
On Mon, Feb 25, 2013 at 07:27:43PM -0500, Theodore Ts'o wrote:
> If the SGI folks are still resistant to removing the bitrotted
> performance tests,
I have no objection to removing the bitrotted performance tests, so long
as we can come to an agreement on a replacement.
> I have a much simpler patch which we've been using
> inside Google for a while now which allows for alphanumeric tests
> "numbers". This allows us to use tests such as "g001", "g002", etc.,
> without having to worry about test number collisions fom upstream.
>
> That would also be useful for ext4 since we could keep a fork of
> xfstests with e001, e002, e003, etc., while we wait for the tests to
> be reviewed for inclusing in the SGI tree.
Few of the xfs geeks are well versed on ext4. Could members of the ext4
crew extend Reviewed-bys on ext4 relevant patches? I think that could
go a long way toward speeding things up, although it doesn't resolve the
renumbering issue.
> I hadn't bothered submitting it since it was clear Dave's changes was
> better, but the advantage of the hack we've been using inside Google
> is that it's a much less intrusive patch.
>
> The reason why I'm interested in having e001, e002, etc., patches is
> that at the moment we've got a number of people using private xfstests
> repositories and reporting regressions based on them. They are using
> numbers such as "301", which is very confusing since they aren't
> upstream and there's a chance the test may get renumbered by the time
> it does go upstream.
>
> The advantage of using a named-based system, or using patch numbers
> such as e001, g001, etc., is that it makes it a lot easier to keep
> track of tests that haven't made it upstream to the xfstests git
> repository.
Ew. The renumbering issue has been inconvenient for xfs geeks too. I'm
all for changing to a name-based system. Doing so is not mutually
exclusive with having a performance test capability in xfstests.
I think the biggest challenge right now is to get Dave's series to apply
again to today's tree. But if you'd like to post your patch, I'd be
happy to look at it.
> Cheers,
>
> - Ted
>
> P.S. I'm happy to review Dmitry's patches if it will help, but I
> wasn't sure whether you were looking for someone more experienced with
> the xfstests code base to review them.
Please do. Reviews by ext4/btrfs experts are welcome. So are ext4 and
btrfs specific tests.
Thanks,
Ben
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 49+ messages in thread
end of thread, other threads:[~2013-02-26 3:22 UTC | newest]
Thread overview: 49+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-26 9:27 [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
2012-07-26 9:27 ` [PATCH 01/18] xfstests: remove remake script Dave Chinner
2012-08-28 19:50 ` Christoph Hellwig
2012-07-26 9:27 ` [PATCH 02/18] xfstests: remove bench infrastructure Dave Chinner
2012-07-26 9:27 ` [PATCH 03/18] xfstests: kill useless test owner fields Dave Chinner
2012-08-28 19:51 ` Christoph Hellwig
2012-07-26 9:27 ` [PATCH 04/18] xfstests: remove stale machine configs Dave Chinner
2012-08-28 19:51 ` Christoph Hellwig
2012-07-26 9:27 ` [PATCH 05/18] xfstests: fold common into check Dave Chinner
2012-08-28 19:52 ` Christoph Hellwig
2012-07-26 9:28 ` [PATCH 06/18] xfstests: clean up and simply check CLI option parsing Dave Chinner
2012-08-28 19:52 ` Christoph Hellwig
2012-07-26 9:28 ` [PATCH 07/18] xfstests: kill hangcheck stuff from check Dave Chinner
2012-08-28 19:53 ` Christoph Hellwig
2012-07-26 9:28 ` [PATCH 08/18] xfstests: remove test expunge file support Dave Chinner
2012-08-28 19:54 ` Christoph Hellwig
2012-07-26 9:28 ` [PATCH 09/18] xfstests: remove undocumented TESTS_REMAINING_LOG Dave Chinner
2012-08-28 19:54 ` Christoph Hellwig
2012-07-26 9:28 ` [PATCH 10/18] xfstests: include test subdirectory support Dave Chinner
2012-07-26 9:28 ` [PATCH 11/18] xfstests: move generic tests out of top level dir Dave Chinner
2012-07-26 9:28 ` [PATCH 12/18] xfstests: move xfs specific tests out of top directory Dave Chinner
2012-07-26 9:28 ` [PATCH 13/18] xfstests: move remaining tests out of top level directory Dave Chinner
2012-07-26 9:28 ` [PATCH 14/18] xfstests: rework CLI individual test specification Dave Chinner
2012-07-26 9:28 ` [PATCH 15/18] xfstests: make exclude groups aware of multiple subdirectories Dave Chinner
2012-07-26 9:28 ` [PATCH 16/18] xfstests: Introduce a results directory Dave Chinner
2012-07-26 9:28 ` [PATCH 17/18] xfstests: convert tests to use new " Dave Chinner
2012-09-05 12:00 ` Boris Ranto
2012-09-05 23:04 ` Dave Chinner
2012-09-06 12:34 ` Boris Ranto
2012-09-06 23:14 ` Dave Chinner
2012-09-07 12:47 ` Boris Ranto
2012-07-26 9:28 ` [PATCH 18/18] xfstests: fix _link_out_file callers Dave Chinner
2012-08-14 21:39 ` [RFC] [PATCH 0/18] xfstests: move tests out of top level Dave Chinner
2012-08-15 17:23 ` Mark Tinguely
2012-08-20 21:27 ` Mark Tinguely
2012-08-20 22:43 ` Dave Chinner
2012-08-21 16:33 ` Ben Myers
2012-08-21 22:09 ` Dave Chinner
2012-08-22 19:16 ` Ben Myers
2012-08-22 23:42 ` Dave Chinner
2012-08-23 17:00 ` Ben Myers
2012-08-24 4:07 ` Dave Chinner
2012-08-28 17:43 ` Ben Myers
2012-08-28 18:02 ` Christoph Hellwig
2013-02-25 15:50 ` Eric Sandeen
2013-02-25 21:52 ` Dave Chinner
2013-02-26 0:27 ` Theodore Ts'o
2013-02-26 3:18 ` Dave Chinner
2013-02-26 3:22 ` Ben Myers
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.