34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From: Simon McVittie <smcv@debian.org>
|
|
Date: Thu, 1 Dec 2016 11:25:33 +0000
|
|
Subject: Terminate individual tests after 10 minutes
|
|
|
|
While using the Automake parallel test harness, if a test hangs for
|
|
long enough for an external watchdog to kill the entire build process
|
|
(as happens in Debian sbuild after 150 minutes with no activity on
|
|
stdout/stderr), the logs will not be shown. If we make an individual
|
|
test time out sooner, logs are more likely to be shown.
|
|
|
|
We use SIGABRT so that the process(es) under test will dump core,
|
|
allowing the point at which ostree is blocking to be analyzed.
|
|
After 1 minute, if any have not died, we kill them again with SIGKILL.
|
|
|
|
Signed-off-by: Simon McVittie <smcv@debian.org>
|
|
Forwarded: https://github.com/ostreedev/ostree/pull/607
|
|
---
|
|
buildutil/tap-test | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/buildutil/tap-test b/buildutil/tap-test
|
|
index c8da31e..4adee45 100755
|
|
--- a/buildutil/tap-test
|
|
+++ b/buildutil/tap-test
|
|
@@ -19,7 +19,7 @@ function skip_cleanup() {
|
|
echo "Skipping cleanup of ${tempdir}"
|
|
}
|
|
cd ${tempdir}
|
|
-${srcd}/${bn} -k --tap
|
|
+timeout --kill-after=60 --signal=ABRT 600 ${srcd}/${bn} -k --tap
|
|
rc=$?
|
|
case "${TEST_SKIP_CLEANUP:-}" in
|
|
no|"") cleanup ;;
|