[LTP] [PATCH 1/1] tst_test.sh: Fix check for $TST_DEVICE

[LTP] [PATCH 1/1] tst_test.sh: Fix check for $TST_DEVICE

[Petr Vorel]

When tst_device acquire call fails, it outputs into stdout,
therefore the content is actually help message.
=> Check for file presence rather than variable not being empty.

Fixes: c5ac5d712 tst_test.sh: Make use of tst_device helper

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Hi,

other option would be to check $?.

BTW found while testing on TMPDIR being tmpfs with small size (300M).
Test lib/newlib_tests/tst_device.c obviously fails.

Kind regards,
Petr
---
 testcases/lib/tst_test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh
index d27b4afd6..799045b03 100644
--- a/testcases/lib/tst_test.sh
+++ b/testcases/lib/tst_test.sh
@@ -364,7 +364,7 @@ tst_run()
 
 		TST_DEVICE=$(tst_device acquire)
 
-		if [ -z "$TST_DEVICE" ]; then
+		if [ ! -b "$TST_DEVICE" ]; then
 			tst_brk TBROK "Failed to acquire device"
 		fi
 
-- 
2.17.1

[LTP] [PATCH 1/1] tst_test.sh: Fix check for $TST_DEVICE

[Jan Stancek]

----- Original Message -----
> When tst_device acquire call fails, it outputs into stdout,
> therefore the content is actually help message.
> => Check for file presence rather than variable not being empty.
> 
> Fixes: c5ac5d712 tst_test.sh: Make use of tst_device helper
> 
> Signed-off-by: Petr Vorel <pvorel@suse.cz>

Good find, ACK

> ---
> Hi,
> 
> other option would be to check $?.

Or both. Attach is very last call to ioctl(), so I think
we can't end up with valid block device and non-zero retcode.

[LTP] [PATCH 1/1] tst_test.sh: Fix check for $TST_DEVICE

[Cyril Hrubis]

Hi!
> When tst_device acquire call fails, it outputs into stdout,
> therefore the content is actually help message.
> => Check for file presence rather than variable not being empty.
> 
> Fixes: c5ac5d712 tst_test.sh: Make use of tst_device helper

Good catch, I guess that it also wouldn't harm if we changed the helper
to print the help message to stderr as well.

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH 1/1] tst_test.sh: Fix check for $TST_DEVICE

[Petr Vorel]

Hi, 
> Hi!
> > When tst_device acquire call fails, it outputs into stdout,
> > therefore the content is actually help message.
> > => Check for file presence rather than variable not being empty.

> > Fixes: c5ac5d712 tst_test.sh: Make use of tst_device helper

> Good catch, I guess that it also wouldn't harm if we changed the helper
> to print the help message to stderr as well.

Pushed, with your Suggested-by:


Kind regards,
Petr

[LTP] [PATCH 1/1] tst_test.sh: Fix check for $TST_DEVICE

[Petr Vorel]

Hi,

> When tst_device acquire call fails, it outputs into stdout,
> therefore the content is actually help message.
> => Check for file presence rather than variable not being empty.

> Fixes: c5ac5d712 tst_test.sh: Make use of tst_device helper

> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
> Hi,

> other option would be to check $?.

> BTW found while testing on TMPDIR being tmpfs with small size (300M).
> Test lib/newlib_tests/tst_device.c obviously fails.

> Kind regards,
> Petr
> ---
>  testcases/lib/tst_test.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

> diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh
> index d27b4afd6..799045b03 100644
> --- a/testcases/lib/tst_test.sh
> +++ b/testcases/lib/tst_test.sh
> @@ -364,7 +364,7 @@ tst_run()

>  		TST_DEVICE=$(tst_device acquire)

> -		if [ -z "$TST_DEVICE" ]; then
> +		if [ ! -b "$TST_DEVICE" ]; then
>  			tst_brk TBROK "Failed to acquire device"
>  		fi
Pushed with Jan's ack and as 
-               if [ -z "$TST_DEVICE" ]; then
+               if [ ! -b "$TST_DEVICE" -o $? -ne 0 ]; then


Kind regards,
Petr