From: Darrick J. Wong <djwong@kernel.org>
Date: Wed, 12 May 2021 02:02:08 +0000 (-0700)
Subject: common: always pass -f to $DUMP_COMPRESSOR
X-Git-Tag: v2022.05.01~403
X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=0df636ef78dc9cfa2df25c66b84c10aa6495ba4c

common: always pass -f to $DUMP_COMPRESSOR

If the test runner gave us the name of a program to use to compress
dumps, always pass -f to overwrite older compressed images, like the
documentation says we do. This prevents the test suite from stalling on
"foo.md.gz exists, overwrite?" prompts.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---

diff --git a/common/rc b/common/rc
index 919028ef..b18cf61e 100644
--- a/common/rc
+++ b/common/rc
@@ -628,7 +628,7 @@ _ext4_metadump()
 	test -n "$E2IMAGE_PROG" || _fail "e2image not installed"
 	$E2IMAGE_PROG -Q "$device" "$dumpfile"
 	[ "$compressopt" = "compress" ] && [ -n "$DUMP_COMPRESSOR" ] &&
-		$DUMP_COMPRESSOR "$dumpfile" &>> "$seqres.full"
+		$DUMP_COMPRESSOR -f "$dumpfile" &>> "$seqres.full"
 }
 
 _test_mkfs()
diff --git a/common/xfs b/common/xfs
index 0ec5b03c..725819bd 100644
--- a/common/xfs
+++ b/common/xfs
@@ -478,7 +478,7 @@ _xfs_metadump() {
 	$XFS_METADUMP_PROG $options "$device" "$metadump"
 	res=$?
 	[ "$compressopt" = "compress" ] && [ -n "$DUMP_COMPRESSOR" ] &&
-		$DUMP_COMPRESSOR "$metadump" &> /dev/null
+		$DUMP_COMPRESSOR -f "$metadump" &> /dev/null
 	return $res
 }