All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 19/25] xfstests: fix _link_out_file callers
Date: Fri, 15 Mar 2013 23:28:03 +1100	[thread overview]
Message-ID: <1363350489-22257-20-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1363350489-22257-1-git-send-email-david@fromorbit.com>

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/generic/097 |    7 ++++---
 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/071     |    7 ++++---
 tests/xfs/082     |    9 +++++----
 tests/xfs/096     |    7 ++++---
 tests/xfs/146     |    3 ++-
 18 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/common.rc b/common.rc
index ba275fc..78dbda8 100644
--- a/common.rc
+++ b/common.rc
@@ -1760,19 +1760,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 $2
+	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/generic/097 b/tests/generic/097
index 084aa1c..510477b 100755
--- a/tests/generic/097
+++ b/tests/generic/097
@@ -27,6 +27,7 @@
 #-----------------------------------------------------------------------
 #
 
+seqfull=$0
 seq=`basename $0`
 seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
@@ -63,11 +64,11 @@ _umount_and_mount()
 
 # link correct .out file
 # This is done bacause udf and xfs print attrs in different orders.
-rm -rf $seq.out
+rm -rf $seqfull.out
 if [ "$FSTYP" == "xfs" ]; then
-    ln -s $seq.out.xfs $seq.out
+    ln -s $seq.out.xfs $seqfull.out
 else
-    ln -s $seq.out.udf $seq.out
+    ln -s $seq.out.udf $seqfull.out
 fi
 
 # real QA test starts here
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 b7044b3..0f9a545 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/071 b/tests/xfs/071
index b22dd6d..cc0dd20 100755
--- a/tests/xfs/071
+++ b/tests/xfs/071
@@ -21,6 +21,7 @@
 #-----------------------------------------------------------------------
 #
 
+seqfull=$0
 seq=`basename $0`
 seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
@@ -44,11 +45,11 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 bitsperlong=`src/feature -w`
 # link correct .out file
-rm -f $seq.out
+rm -f $seqfull.out
 if [ "$bitsperlong" -eq 32 ]; then
-	ln -s $seq.out.32 $seq.out
+	ln -s $seq.out.32 $seqfull.out
 else
-	ln -s $seq.out.64 $seq.out
+	ln -s $seq.out.64 $seqfull.out
 fi
 
 _filter_io()
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/096 b/tests/xfs/096
index d09c067..42673c5 100755
--- a/tests/xfs/096
+++ b/tests/xfs/096
@@ -23,6 +23,7 @@
 #-----------------------------------------------------------------------
 #
 
+seqfull=$0
 seq=`basename $0`
 seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
@@ -99,11 +100,11 @@ _require_scratch
 _require_v2log
 
 # choose .out file based on internal/external log
-rm -f $seq.out
+rm -f $seqfull.out
 if [ "$USE_EXTERNAL" = yes ]; then
-	ln -s $seq.external $seq.out
+	ln -s $seq.external $seqfull.out
 else
-	ln -s $seq.internal $seq.out
+	ln -s $seq.internal $seqfull.out
 fi
 
 # maximum log record size
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.4

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  parent reply	other threads:[~2013-03-15 12:28 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-15 12:27 [PATCH 00/25] xfstests: xfstests: move tests out of top level Dave Chinner
2013-03-15 12:27 ` [PATCH 01/25] xfstests: remove remake script Dave Chinner
2013-03-22 16:51   ` Phil White
2013-03-15 12:27 ` [PATCH 02/25] xfstests: remove bench infrastructure Dave Chinner
2013-03-15 19:36   ` Phil White
2013-03-19 22:31     ` Dave Chinner
2013-03-21 23:52       ` Phil White
2013-03-22  7:37         ` Dave Chinner
2013-03-22 16:22           ` Troy McCorkell
2013-03-26 20:26             ` Troy McCorkell
2013-03-22 16:53   ` Phil White
2013-03-15 12:27 ` [PATCH 03/25] xfstests: kill useless test owner fields Dave Chinner
2013-03-22 16:57   ` Phil White
2013-03-15 12:27 ` [PATCH 04/25] xfstests: remove stale machine configs Dave Chinner
2013-03-22 17:02   ` Phil White
2013-03-15 12:27 ` [PATCH 05/25] xfstests: fold common into check Dave Chinner
2013-03-23 10:18   ` Phil White
2013-03-15 12:27 ` [PATCH 06/25] xfstests: clean up and simply check CLI option parsing Dave Chinner
2013-03-23 10:19   ` Phil White
2013-03-15 12:27 ` [PATCH 07/25] xfstests: kill hangcheck stuff from check Dave Chinner
2013-03-23 10:19   ` Phil White
2013-03-15 12:27 ` [PATCH 08/25] xfstests: remove test expunge file support Dave Chinner
2013-03-23 10:19   ` Phil White
2013-03-15 12:27 ` [PATCH 09/25] xfstests: remove undocumented TESTS_REMAINING_LOG Dave Chinner
2013-03-23 10:20   ` Phil White
2013-03-15 12:27 ` [PATCH 10/25] xfstests: include test subdirectory support Dave Chinner
2013-03-23 10:20   ` Phil White
2013-03-15 12:27 ` [PATCH 11/25] xfstests: remove 285.full and 286.full Dave Chinner
2013-03-23 10:20   ` Phil White
2013-03-15 12:27 ` [PATCH 12/25] xfstests: move generic tests out of top level dir Dave Chinner
2013-03-23 10:22   ` Phil White
2013-03-15 12:27 ` [PATCH 13/25] xfstests: move xfs specific tests out of top directory Dave Chinner
2013-03-23 10:22   ` Phil White
2013-03-15 12:27 ` [PATCH 14/25] xfstests: move remaining tests out of top level directory Dave Chinner
2013-03-23 10:23   ` Phil White
2013-03-15 12:27 ` [PATCH 15/25] xfstests: rework CLI individual test specification Dave Chinner
2013-03-23 10:23   ` Phil White
2013-03-15 12:28 ` [PATCH 16/25] xfstests: make exclude groups aware of multiple subdirectories Dave Chinner
2013-03-23 10:23   ` Phil White
2013-03-15 12:28 ` [PATCH 17/25] xfstests: Introduce a results directory Dave Chinner
2013-03-23 10:23   ` Phil White
2013-03-15 12:28 ` [PATCH 18/25] xfstests: convert tests to use new " Dave Chinner
2013-03-23 10:24   ` Phil White
2013-03-15 12:28 ` Dave Chinner [this message]
2013-03-23 10:24   ` [PATCH 19/25] xfstests: fix _link_out_file callers Phil White
2013-03-15 12:28 ` [PATCH 20/25] xfstests: introduce a common directory Dave Chinner
2013-03-23 10:24   ` Phil White
2013-03-15 12:28 ` [PATCH 21/25] xfstests: Reintroduce configurable test expunging Dave Chinner
2013-03-23 10:24   ` Phil White
2013-03-15 12:28 ` [PATCH 22/25] xfstests: RESULTS_DIR needs to be an absolute path Dave Chinner
2013-03-23 10:24   ` Phil White
2013-03-15 12:28 ` [PATCH 23/25] xfstests: Decomplicate quota setup in 050 Dave Chinner
2013-03-23 10:24   ` Phil White
2013-03-15 12:28 ` [PATCH 24/25] xfstests: clean up test 262 output file use Dave Chinner
2013-03-23 10:24   ` Phil White
2013-03-15 12:28 ` [PATCH 25/25] xfstests: use _notrun for tape checks Dave Chinner
2013-03-23 10:24   ` Phil White
2013-03-27 10:51 ` [PATCH 00/25] xfstests: xfstests: move tests out of top level Rich Johnston
2013-03-27 10:51 ` Rich Johnston

Reply instructions:

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

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

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

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

  git send-email \
    --in-reply-to=1363350489-22257-20-git-send-email-david@fromorbit.com \
    --to=david@fromorbit.com \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

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

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is 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.