t_server_null.sh: Fix failure case

The changes for POSIX shell compatibility and parallel make compatibility broke actually failing the test when a subtest fails. Change-Id: I35f7cf84e035bc793d6f0f59e46edf1a2efe0391 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Samuli Seppänen <[email protected]> Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg28815.html Signed-off-by: Gert Doering <[email protected]>
cron2 · Jun 20, 2024 · c9f29e3 · c9f29e3
1 parent babf312
commit c9f29e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/tests/t_server_null.sh b/tests/t_server_null.sh
@@ -64,9 +64,12 @@ else
 fi
 
 "${srcdir}/t_server_null_client.sh"
+retval=$?
 
 # When running make jobs in parallel ("make -j<x> check") we need to ensure
 # that this script does not exit before all --dev null servers are dead and
 # their network interfaces are gone. Otherwise t_client.sh will fail because
 # pre and post ifconfig output does not match.
 wait
+
+exit $retval
diff --git a/tests/t_server_null_client.sh b/tests/t_server_null_client.sh
@@ -130,7 +130,7 @@ do
     eval test_name=\"\$TEST_NAME_$SUF\"
     eval should_pass=\"\$SHOULD_PASS_$SUF\"
 
-    (get_client_test_result "${test_name}" "${should_pass}")
+    get_client_test_result "${test_name}" "${should_pass}"
 done
 
 exit $retval