]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
xfstests: 075 112 redirect stderr of fsx to /dev/null too
authorEryu Guan <guaneryu@gmail.com>
Sun, 30 Oct 2011 02:25:55 +0000 (10:25 +0800)
committerChristoph Hellwig <hch@lst.de>
Wed, 2 Nov 2011 21:04:41 +0000 (21:04 +0000)
In commit c18bf42de9d5d5fa05025754df1ff63f2147bd12 a warning message
will be printed to stderr if filesystem doesn't support fallocate(2).
The warning message will fail these tests though fsx returns SUCCESS.

FSTYP         -- ext3
PLATFORM      -- Linux/i686 debian-dev 3.1.0+
MKFS_OPTIONS  -- /dev/sda3
MOUNT_OPTIONS -- -o acl,user_xattr /dev/sda3 /mnt/sda3

075 12s ... - output mismatch (see 075.out.bad)
--- 075.out     2011-10-28 21:35:41.872573530 +0800
+++ 075.out.bad 2011-10-30 10:31:02.607058029 +0800
@@ -4,6 +4,9 @@
 -----------------------------------------------
 fsx.0 : -d -N numops -S 0
 -----------------------------------------------
+fsx: main: filesystem does not support fallocate, disabling
+: Operation not supported

So redirect stderr of fsx to /dev/null too.

Signed-off-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
075
112

diff --git a/075 b/075
index 0f0a6ed254d8f7948e2bc273ada5ceb1257891b9..87d273fb7dec327df8bf168f71b3f44f4efe1f99 100755 (executable)
--- a/075
+++ b/075
@@ -77,7 +77,7 @@ _do_test()
 
     # This cd and use of -P gets full debug on $here (not TEST_DEV)
     cd $out
-    if ! $here/ltp/fsx $_param -P $here $seq.$_n >/dev/null
+    if ! $here/ltp/fsx $_param -P $here $seq.$_n &>/dev/null
     then
        echo "    fsx ($_param) failed, $? - compare $seq.$_n.{good,bad,fsxlog}"
        mv $out/$seq.$_n $here/$seq.$_n.full
diff --git a/112 b/112
index 557350ac3e932d14793cab1f9261f3ba2af238f5..763b17a20721045de0fc74d62164836839ee52d9 100755 (executable)
--- a/112
+++ b/112
@@ -77,7 +77,7 @@ _do_test()
 
     # This cd and use of -P gets full debug on $here (not TEST_DEV)
     cd $out
-    if ! $here/ltp/fsx $_param -P $here $seq.$_n >/dev/null
+    if ! $here/ltp/fsx $_param -P $here $seq.$_n &>/dev/null
     then
        echo "    fsx ($_param) returned $? - see $seq.$_n.full"
        mv $seq.$_n.fsxlog $here/$seq.$_n.full