From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-patches@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH 02/11] Cygwin: testsuite: Add a simple timeout mechanism
Date: Thu, 13 Jul 2023 12:38:55 +0100 [thread overview]
Message-ID: <20230713113904.1752-3-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20230713113904.1752-1-jon.turney@dronecode.org.uk>
Astonishingly, we don't have this already, so tests which hang just stop
the testsuite dead in it's tracks...
---
winsup/testsuite/cygrun.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/winsup/testsuite/cygrun.c b/winsup/testsuite/cygrun.c
index e6c4aa705..925b5513f 100644
--- a/winsup/testsuite/cygrun.c
+++ b/winsup/testsuite/cygrun.c
@@ -20,6 +20,7 @@ main (int argc, char **argv)
{
STARTUPINFO sa;
PROCESS_INFORMATION pi;
+ DWORD res;
DWORD ec = 1;
char *p;
@@ -42,9 +43,21 @@ main (int argc, char **argv)
exit (1);
}
- WaitForSingleObject (pi.hProcess, INFINITE);
+ res = WaitForSingleObject (pi.hProcess, 60 * 1000);
- GetExitCodeProcess (pi.hProcess, &ec);
+ if (res == WAIT_TIMEOUT)
+ {
+ char cmd[1024];
+ // there is no simple API to kill a Windows process tree
+ sprintf(cmd, "taskkill /f /t /pid %lu", GetProcessId(pi.hProcess));
+ system(cmd);
+ fprintf (stderr, "Timeout\n");
+ ec = 124;
+ }
+ else
+ {
+ GetExitCodeProcess (pi.hProcess, &ec);
+ }
CloseHandle (pi.hProcess);
CloseHandle (pi.hThread);
--
2.39.0
next prev parent reply other threads:[~2023-07-13 11:40 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-13 11:38 [PATCH 00/11] More testsuite fixes Jon Turney
2023-07-13 11:38 ` [PATCH 01/11] Cygwin: testsuite: Setup test prereqs in 'installation' the tests run in Jon Turney
2023-07-13 11:38 ` Jon Turney [this message]
2023-07-13 11:38 ` [PATCH 03/11] Cygwin: testsuite: Remove const from writable string in fcntl07b Jon Turney
2023-07-13 11:38 ` [PATCH 04/11] Cygwin: testsuite: Skip devdsp test when no audio devices present Jon Turney
2023-07-13 11:38 ` [PATCH 05/11] Cygwin: testsuite: Just log result of second open of /dev/dsp Jon Turney
2023-07-13 11:38 ` [PATCH 06/11] Cygwin: testsuite: Also check direct call in systemcall Jon Turney
2023-07-13 11:39 ` [PATCH 07/11] Cygwin: testsuite: Fix for limited thread priority values Jon Turney
2023-07-13 11:39 ` [PATCH 08/11] Cygwin: testsuite: Busy-wait in cancel3 and cancel5 Jon Turney
2023-07-13 11:43 ` Jon Turney
2023-07-13 18:16 ` Corinna Vinschen
2023-07-13 18:37 ` Corinna Vinschen
2023-07-13 18:53 ` Corinna Vinschen
2023-07-14 13:04 ` Jon Turney
2023-07-14 18:57 ` Corinna Vinschen
2023-07-17 11:05 ` Corinna Vinschen
2023-07-17 11:51 ` Jon Turney
2023-07-17 14:21 ` Corinna Vinschen
2023-07-17 15:41 ` Corinna Vinschen
2023-07-17 18:23 ` Corinna Vinschen
2023-07-18 11:20 ` Jon Turney
2023-07-18 12:09 ` Corinna Vinschen
2023-07-18 15:52 ` Jon Turney
2023-07-17 11:51 ` Jon Turney
2023-07-17 14:04 ` Corinna Vinschen
2023-07-17 14:22 ` Corinna Vinschen
2023-07-13 11:39 ` [PATCH 09/11] Cygwin: testsuite: Fix a buffer overflow in symlink01 Jon Turney
2023-07-13 18:17 ` Corinna Vinschen
2023-07-14 13:04 ` Jon Turney
2023-07-13 11:39 ` [PATCH 10/11] Cygwin: testsuite: Minor fixes to umask03 Jon Turney
2023-07-13 18:18 ` Corinna Vinschen
2023-07-13 11:39 ` [PATCH 11/11] Cygwin: testsuite: Drop Adminstrator privileges while running tests Jon Turney
2023-07-13 18:05 ` [PATCH 00/11] More testsuite fixes Corinna Vinschen
2023-07-17 11:58 ` Jon Turney
2023-07-17 14:02 ` Corinna Vinschen
2023-07-18 13:37 ` Jon Turney
2023-07-18 14:52 ` Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230713113904.1752-3-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=cygwin-patches@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).