[Qemu-devel] [PATCH for-2.10 3/7] qemu-iotests/141: Fix image cleanup

Kevin Wolf posted 7 patches 8 years, 6 months ago
[Qemu-devel] [PATCH for-2.10 3/7] qemu-iotests/141: Fix image cleanup
Posted by Kevin Wolf 8 years, 6 months ago
qemu-iotests 141 attempted to use brace expansion to remove all images
with a single command. However, for this to work, the braces shouldn't
be quoted.

With this fix, the tests correctly cleans up its scratch images.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/141 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
index 40a3405968..2f9d7b9bc2 100755
--- a/tests/qemu-iotests/141
+++ b/tests/qemu-iotests/141
@@ -31,7 +31,7 @@ _cleanup()
 {
     _cleanup_qemu
     _cleanup_test_img
-    rm -f "$TEST_DIR/{b,m,o}.$IMGFMT"
+    rm -f "$TEST_DIR"/{b,m,o}.$IMGFMT
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
-- 
2.13.3


Re: [Qemu-devel] [PATCH for-2.10 3/7] qemu-iotests/141: Fix image cleanup
Posted by Jeff Cody 8 years, 6 months ago
On Fri, Jul 28, 2017 at 03:14:48PM +0200, Kevin Wolf wrote:
> qemu-iotests 141 attempted to use brace expansion to remove all images
> with a single command. However, for this to work, the braces shouldn't
> be quoted.
> 
> With this fix, the tests correctly cleans up its scratch images.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  tests/qemu-iotests/141 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
> index 40a3405968..2f9d7b9bc2 100755
> --- a/tests/qemu-iotests/141
> +++ b/tests/qemu-iotests/141
> @@ -31,7 +31,7 @@ _cleanup()
>  {
>      _cleanup_qemu
>      _cleanup_test_img
> -    rm -f "$TEST_DIR/{b,m,o}.$IMGFMT"
> +    rm -f "$TEST_DIR"/{b,m,o}.$IMGFMT
>  }
>  trap "_cleanup; exit \$status" 0 1 2 3 15
>  
> -- 
> 2.13.3
> 
> 

Reviewed-by: Jeff Cody <jcody@redhat.com>