Skip to contentSkip to conversation

iotests: Clean up after 192

PATCH In review Max Reitz 2 participants 3 messages May 8, 2019

lore
Share & tools
lore

Max Reitz

author
#0 lore raw

PATCH 1/1 iotests: Clean up after 192

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

Reported by: Thomas Huth <[email protected]>

---
 tests/qemu-iotests/192 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tests/qemu-iotests/192 +3 -1
index 158086f9d2..37bd975eec 100755
@@ -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
 
Signature · 1 line
2.20.1
#1 lore raw
Quoted 14 lines · Max Reitz

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

Reported by: Thomas Huth <[email protected]>

---
 tests/qemu-iotests/192 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tests/qemu-iotests/192 +0 -0
index 158086f9d2..37bd975eec 100755

tests/qemu-iotests/192 status=1 # failure is the default! · line 36

Quoted 9 lines
tests/qemu-iotests/192 +3 -1
@@ -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

author
#2 lore raw
Quoted 27 lines · Thomas Huth
Quoted 14 lines · Max Reitz

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

Reported by: Thomas Huth <[email protected]>

---
 tests/qemu-iotests/192 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tests/qemu-iotests/192 +0 -0
index 158086f9d2..37bd975eec 100755

tests/qemu-iotests/192 status=1 # failure is the default! · line 36

Quoted 9 lines
tests/qemu-iotests/192 +3 -1
@@ -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:

Quoted 1 line

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