[PATCH stalld 26/36] tests/functional: Use timeout for error path in test_force_fifo

Wander Lairson Costa <[email protected]>
Newsgroups org.kernel.vger.linux-rt-users
Message-ID <[email protected]>
The single-threaded FIFO rejection test backgrounds stalld and
sleeps 3 seconds to check if it exited. Run it synchronously
under timeout instead, and treat unexpected success or timeout as
test failures rather than warnings.

Signed-off-by: Wander Lairson Costa <[email protected]>
---
 tests/functional/test_force_fifo.sh | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/tests/functional/test_force_fifo.sh b/tests/functional/test_force_fifo.sh
index 17bc66e..2c21ddd 100755
--- a/tests/functional/test_force_fifo.sh
+++ b/tests/functional/test_force_fifo.sh
@@ -214,22 +214,14 @@ FIFO_SINGLE_LOG="/tmp/stalld_test_force_fifo_single_$$.log"
 CLEANUP_FILES+=("${FIFO_SINGLE_LOG}")
 
 log "Testing single-threaded mode with -F (should exit)"
-${TEST_ROOT}/../stalld -f -v -c "${TEST_CPU}" -t ${threshold} -F > "${FIFO_SINGLE_LOG}" 2>&1 &
-fifo_pid=$!
-sleep 3
-
-if ! kill -0 "${fifo_pid}" 2>/dev/null; then
-    # Process exited - this is expected
-    if grep -qi "error\|single.*thread\|not.*support" "${FIFO_SINGLE_LOG}"; then
-        log "✓ PASS: Single-threaded mode rejected FIFO with error message"
-    else
-        log "✓ PASS: Single-threaded mode with FIFO caused exit (as expected)"
-    fi
+timeout 5 ${TEST_ROOT}/../stalld -f -v -c "${TEST_CPU}" -t ${threshold} -F > "${FIFO_SINGLE_LOG}" 2>&1
+ret=$?
+
+if [ $ret -ne 0 ] && [ $ret -ne 124 ]; then
+    assert_equals "1" "1" "single-threaded mode rejected FIFO"
 else
-    # Process still running - unexpected
-    log "⚠ WARNING: Single-threaded mode accepted FIFO (may have switched to multi-threaded)"
-    kill -TERM "${fifo_pid}" 2>/dev/null
-    wait "${fifo_pid}" 2>/dev/null || true
+    log "✗ FAIL: stalld did not reject -F in single-threaded mode"
+    TEST_FAILED=$((TEST_FAILED + 1))
 fi
 
 #=============================================================================
-- 
2.53.0
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.