From: Vladimir Zapolskiy Date: Sat, 11 Jul 2020 09:23:19 +0000 (+0300) Subject: generic: reorder output to stderr and stdout from _scratch_mkfs X-Git-Tag: v2022.05.01~756 X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=98c3ec60484a3b5e320aec038b18ae9efae5a0d7 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 Reviewed-by: Zorro Lang Signed-off-by: Eryu Guan --- diff --git a/tests/generic/554 b/tests/generic/554 index eaf1f45a..9a23c0eb 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 41d85b91..e23e97b7 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