fstests.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Vladimir Zapolskiy <vladimir@tuxera.com>
To: Eryu Guan <guaneryu@gmail.com>
Cc: <fstests@vger.kernel.org>
Subject: [PATCH] generic: reorder output to stderr and stdout from _scratch_mkfs
Date: Sat, 11 Jul 2020 12:23:19 +0300	[thread overview]
Message-ID: <20200711092319.14441-1-vladimir@tuxera.com> (raw)

The change fixes false positives from generic/554 and generic/565 tests,
when supplementary output of an mkfs utility to stderr apprears to be mixed
into the test output, which results into non-empty diff with the expected
output found in *.out files.

The change unifies _scratch_mkfs redirections among all generic tests, these
two modified tests are the only ones with the swapped order of output
redirections.

Signed-off-by: Vladimir Zapolskiy <vladimir@tuxera.com>
---
 tests/generic/554 | 2 +-
 tests/generic/565 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/generic/554 b/tests/generic/554
index eaf1f45a8d15..9a23c0eb729f 100755
--- a/tests/generic/554
+++ b/tests/generic/554
@@ -38,7 +38,7 @@ _require_scratch
 _require_xfs_io_command "copy_range"
 _require_scratch_swapfile
 
-_scratch_mkfs 2>&1 >> $seqres.full
+_scratch_mkfs >>$seqres.full 2>&1
 _scratch_mount
 
 rm -f $seqres.full
diff --git a/tests/generic/565 b/tests/generic/565
index 41d85b919553..e23e97b763f8 100755
--- a/tests/generic/565
+++ b/tests/generic/565
@@ -38,7 +38,7 @@ _require_test
 _require_scratch
 _require_xfs_io_command "copy_range"
 
-_scratch_mkfs 2>&1 >> $seqres.full
+_scratch_mkfs >>$seqres.full 2>&1
 _scratch_mount
 
 
-- 
2.25.1


             reply	other threads:[~2020-07-11  9:23 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-11  9:23 Vladimir Zapolskiy [this message]
2020-07-12 11:22 ` [PATCH] generic: reorder output to stderr and stdout from _scratch_mkfs Zorro Lang

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=20200711092319.14441-1-vladimir@tuxera.com \
    --to=vladimir@tuxera.com \
    --cc=fstests@vger.kernel.org \
    --cc=guaneryu@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).