From: Michael R Sweet <msweet@msweet.org>
Date: Fri, 6 Jun 2025 13:31:57 +0000 (-0400)
Subject: Use timeout command on Linux to limit test run time.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e2302561c3a2885858055f78f977fb192ce20bc;p=thirdparty%2Fcups.git

Use timeout command on Linux to limit test run time.
---

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 39b53c3e45..6214e5c845 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -3,7 +3,7 @@
 # Perform the complete set of IPP compliance tests specified in the
 # CUPS Software Test Plan.
 #
-# Copyright © 2020-2023 by OpenPrinting
+# Copyright © 2020-2025 by OpenPrinting
 # Copyright © 2007-2021 by Apple Inc.
 # Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
@@ -672,11 +672,33 @@ export LC_MESSAGES
 # Start the server; run as foreground daemon in the background...
 #
 
+if test "x$VALGRIND" != x; then
+	# Wrap cupsd with Valgrind
+	WRAPPER="$VALGRIND"
+elif test "x$testtype" = x0; then
+	# Don't limit run time...
+	WRAPPER=""
+elif test -x /usr/bin/timeout; then
+	# Limit run time to 5 minutes
+	echo "Limiting run time to 5 minutes..."
+	echo ""
+
+	WRAPPER="/usr/bin/timeout --foreground 5m"
+else
+	# No timeout command, just try limiting CPU time...
+	echo "Limiting CPU time to 5 minutes (300 seconds):"
+	echo "    limit -t 300"
+	echo ""
+
+	limit -t 300
+	WRAPPER=""
+fi
+
 echo "Starting scheduler:"
-echo "    $runcups $VALGRIND ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &"
+echo "    $runcups $WRAPPER ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &"
 echo ""
 
-$runcups $VALGRIND ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &
+$runcups $WRAPPER ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &
 
 cupsd=$!