All of lore.kernel.org
 help / color / mirror / Atom feed
From: Theodore Ts'o <tytso@mit.edu>
To: xfs@oss.sgi.com
Cc: Christoph Hellwig <hch@infradead.org>,
	Ext4 Developers List <linux-ext4@vger.kernel.org>,
	Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH 1/3] generic/004: fix filtering of expected error message
Date: Sat, 12 Apr 2014 18:55:15 -0400	[thread overview]
Message-ID: <1397343317-14669-2-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1397343317-14669-1-git-send-email-tytso@mit.edu>

The failure message goes to stderr, so we need to redirect stderr to
stdout before running sed.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Christoph Hellwig <hch@infradead.org>
---
 tests/generic/004     | 2 +-
 tests/generic/004.out | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/generic/004 b/tests/generic/004
index 406c29e..23ca349 100755
--- a/tests/generic/004
+++ b/tests/generic/004
@@ -58,7 +58,7 @@ $XFS_IO_PROG -T \
 rm ${testfile}
 
 # test creating a r/o tmpfile.  Should fail
-$XFS_IO_PROG -Tr ${TEST_DIR} -c "close" | _filter_test_dir
+$XFS_IO_PROG -Tr ${TEST_DIR} -c "close" 2>&1 | _filter_test_dir
 
 # success, all done
 status=0
diff --git a/tests/generic/004.out b/tests/generic/004.out
index b85c11c..527b2c2 100644
--- a/tests/generic/004.out
+++ b/tests/generic/004.out
@@ -3,4 +3,4 @@ wrote 4096/4096 bytes at offset 0
 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 read 4096/4096 bytes at offset 0
 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-/mnt/test: Invalid argument
+TEST_DIR: Invalid argument
-- 
1.9.0

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

  reply	other threads:[~2014-04-12 22:55 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-12 22:55 [PATCH] ext4: add a new spinlock i_raw_lock to protect the ext4's raw inode Theodore Ts'o
2014-04-12 22:55 ` Theodore Ts'o [this message]
2014-04-13  4:06   ` [PATCH 1/3] generic/004: fix filtering of expected error message Eric Sandeen
2014-04-13  4:06     ` Eric Sandeen
2014-04-12 22:55 ` [PATCH 2/3] generic/022: update expected output after the test was renamed Theodore Ts'o
2014-04-12 22:55   ` Theodore Ts'o
2014-04-13  4:07   ` Eric Sandeen
2014-04-13  4:07     ` Eric Sandeen
2014-04-12 22:55 ` [PATCH 3/3] generic/237: fix filtering for expected failure message Theodore Ts'o
2014-04-13  8:17   ` Christoph Hellwig
2014-04-13 12:43     ` Theodore Ts'o
2014-04-14  0:14   ` Dave Chinner
2014-04-15  2:08     ` Theodore Ts'o
2014-04-15  2:08       ` Theodore Ts'o
2014-04-12 23:03 ` [PATCH] ext4: add a new spinlock i_raw_lock to protect the ext4's raw inode Theodore Ts'o
2014-04-12 23:03   ` Theodore Ts'o

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=1397343317-14669-2-git-send-email-tytso@mit.edu \
    --to=tytso@mit.edu \
    --cc=hch@infradead.org \
    --cc=linux-ext4@vger.kernel.org \
    --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.