[PATCH] xfs/432: fix this test when external devices are in use

From: "Darrick J. Wong" <djwong@kernel.org>
To: guaneryu@gmail.com, zlang@redhat.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me
Subject: [PATCH] xfs/432: fix this test when external devices are in use
Date: Tue, 26 Jul 2022 12:51:31 -0700	[thread overview]
Message-ID: <YuBFw4dheeSRHVQd@magnolia> (raw)

From: Darrick J. Wong <djwong@kernel.org>

This program exercises metadump and mdrestore being run against the
scratch device.  Therefore, the test must pass external log / rt device
arguments to xfs_repair -n to check the "restored" filesystem.  Fix the
incorrect usage, and report repair failures, since this test has been
silently failing for a while now.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 tests/xfs/432 |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/xfs/432 b/tests/xfs/432
index 86012f0b..5c6744ce 100755
--- a/tests/xfs/432
+++ b/tests/xfs/432
@@ -89,7 +89,16 @@ _scratch_xfs_metadump $metadump_file -w
 xfs_mdrestore $metadump_file $metadump_img
 
 echo "Check restored metadump image"
-$XFS_REPAIR_PROG -n $metadump_img >> $seqres.full 2>&1
+repair_args=('-n')
+[ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
+	repair_args+=('-l' "$SCRATCH_LOGDEV")
+
+[ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_RTDEV" ] && \
+	repair_args+=('-r' "$SCRATCH_RTDEV")
+
+$XFS_REPAIR_PROG "${repair_args[@]}" $metadump_img >> $seqres.full 2>&1
+res=$?
+test $res -ne 0 && echo "xfs_repair on restored fs returned $res?"
 
 # success, all done
 status=0
