public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] Cygwin: testsuite: Add a simple timeout mechanism
@ 2023-07-14 15:27 Jon Turney
0 siblings, 0 replies; only message in thread
From: Jon Turney @ 2023-07-14 15:27 UTC (permalink / raw)
To: cygwin-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=328258eba44993f05e6238c4c9b2124e2496fb4d
commit 328258eba44993f05e6238c4c9b2124e2496fb4d
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Jul 11 11:17:56 2023 +0100
Cygwin: testsuite: Add a simple timeout mechanism
Astonishingly, we don't have this already, so tests which hang just stop
the testsuite dead in it's tracks...
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Diff:
---
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);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-07-14 15:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-14 15:27 [newlib-cygwin] Cygwin: testsuite: Add a simple timeout mechanism Jon Turney
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).