From: Max Reitz Date: Tue, 27 Oct 2020 19:05:55 +0000 (+0100) Subject: iotests/287: Clean up subshell test image X-Git-Tag: v6.0.0-rc0~185^2~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7eadb1e59d331563ad6a1c3efd5ce14357de7344;p=thirdparty%2Fqemu.git iotests/287: Clean up subshell test image 287 creates an image in a subshell (thanks to the pipe) to see whether that is possible with compression_type=zstd. If _make_test_img were to modify any global state, this global state would then be lost before we could cleanup the image. When using FUSE as the test protocol, this global state is important, so clean up the image before the state is lost. Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Message-Id: <20201027190600.192171-16-mreitz@redhat.com> Signed-off-by: Kevin Wolf --- diff --git a/tests/qemu-iotests/287 b/tests/qemu-iotests/287 index f98a4cadc12..036cc09e82b 100755 --- a/tests/qemu-iotests/287 +++ b/tests/qemu-iotests/287 @@ -51,8 +51,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 CLUSTER_SIZE=65536 # Check if we can run this test. -if IMGOPTS='compression_type=zstd' _make_test_img 64M | - grep "Invalid parameter 'zstd'"; then +output=$(_make_test_img -o 'compression_type=zstd' 64M; _cleanup_test_img) +if echo "$output" | grep -q "Invalid parameter 'zstd'"; then _notrun "ZSTD is disabled" fi