generic: reorder output to stderr and stdout from _scratch_mkfs

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>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/tests/generic/554 b/tests/generic/554
index eaf1f45a8d15913ff957733573e30a75d771d59f..9a23c0eb729f9da55148aa0715b9c113f50a1d43 100755 (executable)
--- 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 41d85b919553a57087072b4ca65c43e5684dbbaa..e23e97b763f88d2eec0cfde82cbe354411e75e76 100755 (executable)
--- 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