From: Karel Zak <kzak@redhat.com>
Date: Wed, 6 May 2026 11:29:49 +0000 (+0200)
Subject: tests: add ts_finalize_subtest before return in functions
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=891684dcbaf5e34b95a0a21f4cd91f370ef248d0;p=thirdparty%2Futil-linux.git

tests: add ts_finalize_subtest before return in functions

In helper functions that call ts_skip_subtest and then return
early, add ts_finalize_subtest to properly close the subtest
block before returning.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/ts/chrt/chrt b/tests/ts/chrt/chrt
index f31f54eaf..7a195e35d 100755
--- a/tests/ts/chrt/chrt
+++ b/tests/ts/chrt/chrt
@@ -32,6 +32,7 @@ function skip_policy {
 	$TS_CMD_CHRT --max | grep $1 | grep 'priority' &> /dev/null
 	if [ $? == 1 ]; then
 		ts_skip_subtest "unsupported"
+		ts_finalize_subtest
 		return 1
 	fi
 	return 0
@@ -40,6 +41,7 @@ function skip_policy {
 function skip_kernel_lt {
 	if ts_kernel_ver_lt $1 $2 $3; then
 		ts_skip_subtest "kernel version must be >= $1.$2.$3"
+		ts_finalize_subtest
 		return 1
 	fi
 
@@ -50,6 +52,7 @@ function skip_kernel_ge {
 	ts_kernel_ver_lt $1 $2 $3
 	if [ $? == 1 ]; then
 		ts_skip_subtest "kernel version must be < $1.$2.$3"
+		ts_finalize_subtest
 		return 1
 	fi
 
diff --git a/tests/ts/chrt/chrt-non-root b/tests/ts/chrt/chrt-non-root
index aa107dc3f..e0a17765f 100755
--- a/tests/ts/chrt/chrt-non-root
+++ b/tests/ts/chrt/chrt-non-root
@@ -32,6 +32,7 @@ function skip_policy {
 	$TS_CMD_CHRT --max | grep $1 | grep 'priority' &> /dev/null
 	if [ $? == 1 ]; then
 		ts_skip_subtest "unsupported"
+		ts_finalize_subtest
 		return 1
 	fi
 	return 0
diff --git a/tests/ts/lsfd/mkfds-socketpair b/tests/ts/lsfd/mkfds-socketpair
index accf17a26..95f9b0297 100755
--- a/tests/ts/lsfd/mkfds-socketpair
+++ b/tests/ts/lsfd/mkfds-socketpair
@@ -71,6 +71,7 @@ mkfds_socketpair_stream_endpoint()
     ts_init_subtest "STREAM-ENDPOINT"
     if [ "$QEMU_USER" == "1" ]; then
 	ts_skip_subtest "running under qemu-user emulation"
+	ts_finalize_subtest
 	return
     fi
     {
@@ -93,6 +94,7 @@ mkfds_socketpair_stream_shutdown_state()
     ts_init_subtest "STREAM-SHUTDOWN-STATE"
     if [ "$QEMU_USER" == "1" ]; then
 	ts_skip_subtest "running under qemu-user emulation"
+	ts_finalize_subtest
 	return
     fi
     {
@@ -115,6 +117,7 @@ mkfds_socketpair_stream_endpoint_halfclose()
     ts_init_subtest "STREAM-ENDPOINT-halfclose"
     if [ "$QEMU_USER" == "1" ]; then
 	ts_skip_subtest "running under qemu-user emulation"
+	ts_finalize_subtest
 	return
     fi
     {