From: Benjamin Drung <benjamin.drung@canonical.com>
Date: Wed, 26 Nov 2025 13:24:38 +0000 (+0100)
Subject: test: drop explicitly checking exit code
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eeea4ddfa1f30e829f6ea984005f23fd3d175ce;p=thirdparty%2Fdracut-ng.git

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 0868bd049..f19e07354 100755
--- 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 aba9c11d3..7e748e324 100755
--- 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 2336f6b4e..d85a8bb8e 100755
--- 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