Skip to contentSkip to conversation

runltp: let each test acquire/release device

PATCH New Jan Stancek 3 participants 4 messages Jul 9, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 runltp: let each test acquire/release device

Problem with runltp creating and using single loop device for all tests is that if one test fails/gets stuck or fails to umount loop device for any reason, then all subsequent tests also fail, because they try to use mounted device.

Don't force same loop device on all tests (unless it is chosen via env. variable DEVICE) and let LTP library try to acquire and release first usable loop device for each test.

Fixes #703

---
 runltp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
runltp +1 -11
index ec0811834862..94e290d6dbb9 100755
@@ -963,17 +963,7 @@ create_block()
 
 set_block_device()
 {
-    if [ -z "$DEVICE" ]; then
-        create_block
-        if [ $? -ne 0 ]; then
-            echo "no block device was specified on commandline."
-            echo "Block device could not be created using loopback device"
-            echo "Tests which require block device are disabled."
-            echo "You can specify it with option -b"
-	else
-            export LTP_DEV=$DEVICE
-        fi
-    else
+    if [ -n "$DEVICE" ]; then
         export LTP_DEV=$DEVICE
     fi
 }
Signature · 1 line
2.18.1
#1 lore raw

PATCH 1/1 runltp: let each test acquire/release device

Hi!

Quoted 28 lines

Problem with runltp creating and using single loop device for all tests is that if one test fails/gets stuck or fails to umount loop device for any reason, then all subsequent tests also fail, because they try to use mounted device.

Don't force same loop device on all tests (unless it is chosen via env. variable DEVICE) and let LTP library try to acquire and release first usable loop device for each test.

Fixes #703

---
 runltp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
runltp +0 -5
index ec0811834862..94e290d6dbb9 100755
@@ -963,17 +963,7 @@ create_block()
 
 set_block_device()
 {
-    if [ -z "$DEVICE" ]; then
-        create_block
-        if [ $? -ne 0 ]; then
-            echo "no block device was specified on commandline."
-            echo "Block device could not be created using loopback device"

runltp create_block() · line 969

Quoted 10 lines
runltp +1 -6
-            echo "Tests which require block device are disabled."
-            echo "You can specify it with option -b"
-	else
-            export LTP_DEV=$DEVICE
-        fi
-    else
+    if [ -n "$DEVICE" ]; then
         export LTP_DEV=$DEVICE
     fi
 }

Shouldn't we remove the create_block() function as well?

Other than that, acked.

Signature · 2 lines
Cyril Hrubis
[email protected]
#2 lore raw

PATCH 1/1 runltp: let each test acquire/release device

----- Original Message -----

Quoted 3 lines

Shouldn't we remove the create_block() function as well?

Other than that, acked.

Pushed with create_block() removed as well.

Thanks,
Jan

#3 lore raw

PATCH 1/1 runltp: let each test acquire/release device

In reply to Jan Stancek
Quoted 20 lines · Jan Stancek

Problem with runltp creating and using single loop device for all tests is that if one test fails/gets stuck or fails to umount loop device for any reason, then all subsequent tests also fail, because they try to use mounted device.

Don't force same loop device on all tests (unless it is chosen via env. variable DEVICE) and let LTP library try to acquire and release first usable loop device for each test.

Fixes #703

---
 runltp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
runltp +0 -0
index ec0811834862..94e290d6dbb9 100755

runltp create_block() · line 966

Quoted 6 lines
runltp +0 -2
@@ -963,17 +963,7 @@ create_block()
 
 set_block_device()
 {
-    if [ -z "$DEVICE" ]; then
-        create_block
 

This is the only place to use create_block function, if we don't need it anymore why not removing the function definition together?

Quoted 21 lines
runltp +1 -9
-        if [ $? -ne 0 ]; then
-            echo "no block device was specified on commandline."
-            echo "Block device could not be created using loopback device"
-            echo "Tests which require block device are disabled."
-            echo "You can specify it with option -b"
-       else
-            export LTP_DEV=$DEVICE
-        fi
-    else
+    if [ -n "$DEVICE" ]; then
         export LTP_DEV=$DEVICE
     fi

}
--
2.18.1

--
Mailing list info: https://lists.linux.it/listinfo/ltp

Signature · 5 lines
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20200709/aa9b56e3/attachment.htm>