tst_test.sh: Add return value to _tst_expect_{fail, pass}
PATCH 1/1 tst_test.sh: Add return value to _tst_expect_{fail, pass}
And use this feature in isofs.sh.
---
Hi,
there'll be probably more uses than just isofs.sh. I can put isofs.sh changes into separate commit.
Kind regards,
Petr
doc/test-writing-guidelines.txt | 8 ++++++++ testcases/kernel/fs/iso9660/isofs.sh | 9 ++------- testcases/lib/tst_test.sh | 4 ++++ 3 files changed, 14 insertions(+), 7 deletions(-)
doc/test-writing-guidelines.txt +8 -0
@@ -2465,6 +2465,14 @@ to that, 'EXPECT_FAIL' always redirects the command's stderr to '/dev/null'. There are also 'EXPECT_PASS_BRK' and 'EXPECT_FAIL_BRK', which works the same way except breaking a test when unexpected action happen. +It's possible to detect whether expected value happened: +[source,sh] +------------------------------------------------------------------------------- +if ! EXPECT_PASS command arg1 2\> /dev/null; then + continue +fi +------------------------------------------------------------------------------- + tst_kvcmp +++++++++
testcases/kernel/fs/iso9660/isofs.sh +2 -7
@@ -56,13 +56,8 @@ do_test() { "-allow-lowercase -allow-multidot -iso-level 3 -f -l -D -J -allow-leading-dots -R" do rm -f isofs.iso - mkisofs -o isofs.iso -quiet $mkisofs_opt $make_file_sys_dir 2> /dev/null - if [ $? -eq 0 ]; then - tst_res TPASS "mkisofs -o isofs.iso -quiet $mkisofs_opt $make_file_sys_dir" - else - tst_res TFAIL "mkisofs -o isofs.iso -quiet $mkisofs_opt $make_file_sys_dir" - continue - fi + EXPECT_PASS mkisofs -o isofs.iso -quiet $mkisofs_opt $make_file_sys_dir 2\> /dev/null \ + || continue for mount_opt in \ "loop" \
testcases/lib/tst_test.sh +4 -0
@@ -146,8 +146,10 @@ _tst_expect_pass() tst_rod "$@" if [ $? -eq 0 ]; then tst_res TPASS "$@ passed as expected" + return 0 else $fnc TFAIL "$@ failed unexpectedly" + return 1 fi }
@@ -160,8 +162,10 @@ _tst_expect_fail() tst_rod "$@" 2> /dev/null if [ $? -ne 0 ]; then tst_res TPASS "$@ failed as expected" + return 0 else $fnc TFAIL "$@ passed unexpectedly" + return 1 fi }
Signature · 1 line
2.24.0
PATCH 1/1 tst_test.sh: Add return value to _tst_expect_{fail, pass}
----- Original Message -----
doc/test-writing-guidelines.txt to that, 'EXPECT_FAIL' always redirects the command's stderr to '/dev/null'. · line 2475
Quoted 8 lines
doc/test-writing-guidelines.txt +8
-0+It's possible to detect whether expected value happened: +[source,sh] +------------------------------------------------------------------------------- +if ! EXPECT_PASS command arg1 2\> /dev/null; then + continue +fi +------------------------------------------------------------------------------- +
Looks useful, ack.
PATCH 1/1 tst_test.sh: Add return value to _tst_expect_{fail, pass}
Hi Jan,
Quoted 11 lines
----- Original Message -----
doc/test-writing-guidelines.txt to that, 'EXPECT_FAIL' always redirects the command's stderr to '/dev/null'. · line 2475
Quoted 8 lines
doc/test-writing-guidelines.txt +8
-0+It's possible to detect whether expected value happened: +[source,sh] +------------------------------------------------------------------------------- +if ! EXPECT_PASS command arg1 2\> /dev/null; then + continue +fi +------------------------------------------------------------------------------- +Looks useful, ack.
Thank you for your review, merged with your ack.
Kind regards,
Petr