gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Portability fix ... use internal bash features to implement timeout rather

Browse source 
that the external 'timeout' program which if not generally available.
This commit is contained in:
rfm 2025-03-09 17:21:23 +00:00
parent 96febdc8eb
commit 199b1eb071
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
TestFramework/gnustep-tests.in
View file

@ -442,6 +442,30 @@ build_test ()
return 0
}
# Function to run a test case with a timeout by starting it in the background
# and having a subshell monitor it and kill it if it runs too long.
# If the test completes before the timeout, the waiting subshell is killed.
# The result of the function is the exit status of the test case.
with_timeout()
{
timeout="$1"; cmd="$2";
(
eval "$cmd" &
child=$!
trap -- "" SIGTERM
(
sleep $timeout
kill $child 2> /dev/null
) &
waiter=$!
wait $child
result=$?
kill -9 $waiter
$?=$result
)
}
run_test ()
{
# Remove the extension, if there is one. If there is no extension, add
@ -482,13 +506,13 @@ run_test ()
# Env.sh is deprecated ... we should only use TestInfo to setup for a test
if test -r ./Env.sh
then
( . ./Env.sh; time timeout $GSTESTTIMEOUT $RUN_CMD )
( . ./Env.sh; time with_timeout $GSTESTTIMEOUT $RUN_CMD )
else
if test -r ./make-check.env
then
( . ./make-check.env; . ./TestInfo > /dev/null 2>&1; time timeout $GSTESTTIMEOUT $RUN_CMD )
( . ./make-check.env; . ./TestInfo > /dev/null 2>&1; time with_timeout $GSTESTTIMEOUT $RUN_CMD )
else
( . ./TestInfo > /dev/null 2>&1; time timeout $GSTESTTIMEOUT $RUN_CMD )
( . ./TestInfo > /dev/null 2>&1; time with_timeout $GSTESTTIMEOUT $RUN_CMD )
fi
fi