aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2020-10-27 20:05:55 +0100
committerKevin Wolf <kwolf@redhat.com>2020-12-11 17:52:40 +0100
commit7eadb1e59d331563ad6a1c3efd5ce14357de7344 (patch)
tree7e0d97f21eb230d8174bbd91915b5a548cb472b8
parentd2d5310c8e892b8b3e853e762f0d1785257e05e5 (diff)
downloadqemu-7eadb1e59d331563ad6a1c3efd5ce14357de7344.zip
qemu-7eadb1e59d331563ad6a1c3efd5ce14357de7344.tar.gz
qemu-7eadb1e59d331563ad6a1c3efd5ce14357de7344.tar.bz2
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 <mreitz@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20201027190600.192171-16-mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rwxr-xr-xtests/qemu-iotests/2874
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/qemu-iotests/287 b/tests/qemu-iotests/287
index f98a4ca..036cc09 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