test: drop explicitly checking exit code

The tests are run with `set -e`. So the test will exit in case of a
failure and `$?` will always be `0`. So drop the check for `$?`.

diff --git a/test/TEST-60-NFS/test.sh b/test/TEST-60-NFS/test.sh
index 0868bd0491b2ddcf424c1060b6bbfbddcc6f4f36..f19e073542fff232144997cc6e17a8b6d06e297d 100755 (executable)
--- a/test/TEST-60-NFS/test.sh
+++ b/test/TEST-60-NFS/test.sh
@@ -70,9 +70,8 @@ client_test() {
         -append "$TEST_KERNEL_CMDLINE $cmdline ro" \
         -initrd "$TESTDIR"/initramfs.testing
 
-    # shellcheck disable=SC2181
-    if [[ $? -ne 0 ]] || ! test_marker_check nfs-OK; then
-        echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
+    if ! test_marker_check nfs-OK; then
+        echo "CLIENT TEST END: $test_name [FAILED - MISSING MARKER]"
         return 1
     fi
 

diff --git a/test/TEST-70-ISCSI/test.sh b/test/TEST-70-ISCSI/test.sh
index aba9c11d30764a03a77d5ecacf10ae8277d1b22e..7e748e32411396282f281054d1e071fd912ca773 100755 (executable)
--- a/test/TEST-70-ISCSI/test.sh
+++ b/test/TEST-70-ISCSI/test.sh
@@ -61,9 +61,8 @@ run_client() {
         -append "$TEST_KERNEL_CMDLINE $*" \
         -initrd "$TESTDIR"/initramfs.testing
 
-    # shellcheck disable=SC2181
-    if [[ $? -ne 0 ]] || ! test_marker_check iscsi-OK; then
-        echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
+    if ! test_marker_check iscsi-OK; then
+        echo "CLIENT TEST END: $test_name [FAILED - MISSING MARKER]"
         return 1
     fi
 

diff --git a/test/TEST-72-NBD/test.sh b/test/TEST-72-NBD/test.sh
index 2336f6b4e07775291b8b09be414aff1a7a99589e..d85a8bb8e845c4df55e8b0b5e1e2c5e1adfa8839 100755 (executable)
--- a/test/TEST-72-NBD/test.sh
+++ b/test/TEST-72-NBD/test.sh
@@ -71,9 +71,8 @@ client_test() {
         -append "$cmdline rd.auto ro" \
         -initrd "$TESTDIR"/initramfs.testing
 
-    # shellcheck disable=SC2181
-    if [[ $? -ne 0 ]] || ! test_marker_check nbd-OK; then
-        echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
+    if ! test_marker_check nbd-OK; then
+        echo "CLIENT TEST END: $test_name [FAILED - MISSING MARKER]"
         return 1
     fi