iotests: Clean up after 192

[Qemu-devel] [PATCH] iotests: Clean up after 192

Max Reitz posted 1 patch 6 years, 6 months ago

Download mbox

Test asan passed

Test docker-mingw@fedora passed

Test docker-clang@ubuntu passed

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190508125548.10458-1-mreitz@redhat.com

Maintainers: Max Reitz <mreitz@redhat.com>, Kevin Wolf <kwolf@redhat.com>

tests/qemu-iotests/192 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] iotests: Clean up after 192

Posted by Max Reitz 6 years, 6 months ago

This patch makes 192 clean up the qemu command FIFOs, the qemu PID file,
and the NBD socket file.

Reported by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/192 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
index 158086f9d2..37bd975eec 100755
--- a/tests/qemu-iotests/192
+++ b/tests/qemu-iotests/192
@@ -29,7 +29,9 @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
+    _cleanup_qemu
+    rm -f "$TEST_DIR/nbd"
+    _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
-- 
2.20.1

Re: [Qemu-devel] [PATCH] iotests: Clean up after 192

Posted by Thomas Huth 6 years, 6 months ago

On 08/05/2019 14.55, Max Reitz wrote:
> This patch makes 192 clean up the qemu command FIFOs, the qemu PID file,
> and the NBD socket file.
> 
> Reported by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  tests/qemu-iotests/192 | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
> index 158086f9d2..37bd975eec 100755
> --- a/tests/qemu-iotests/192
> +++ b/tests/qemu-iotests/192
> @@ -29,7 +29,9 @@ status=1	# failure is the default!
>  
>  _cleanup()
>  {
> -	_cleanup_test_img
> +    _cleanup_qemu
> +    rm -f "$TEST_DIR/nbd"
> +    _cleanup_test_img
>  }
>  trap "_cleanup; exit \$status" 0 1 2 3 15

Thanks a lot! ... but Kevin was a little bit faster already:

https://lists.gnu.org/archive/html/qemu-devel/2019-05/msg01732.html

 Thomas

Re: [Qemu-devel] [PATCH] iotests: Clean up after 192

Posted by Max Reitz 6 years, 6 months ago

On 08.05.19 15:00, Thomas Huth wrote:
> On 08/05/2019 14.55, Max Reitz wrote:
>> This patch makes 192 clean up the qemu command FIFOs, the qemu PID file,
>> and the NBD socket file.
>>
>> Reported by: Thomas Huth <thuth@redhat.com>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>>  tests/qemu-iotests/192 | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
>> index 158086f9d2..37bd975eec 100755
>> --- a/tests/qemu-iotests/192
>> +++ b/tests/qemu-iotests/192
>> @@ -29,7 +29,9 @@ status=1	# failure is the default!
>>  
>>  _cleanup()
>>  {
>> -	_cleanup_test_img
>> +    _cleanup_qemu
>> +    rm -f "$TEST_DIR/nbd"
>> +    _cleanup_test_img
>>  }
>>  trap "_cleanup; exit \$status" 0 1 2 3 15
> 
> Thanks a lot! ... but Kevin was a little bit faster already:
> 
> https://lists.gnu.org/archive/html/qemu-devel/2019-05/msg01732.html

Dang.  At least it looks basically the same, so that’s good. O:-)

Max