[PATCH 02/11] Cygwin: testsuite: Add a simple timeout mechanism
Jon Turney
jon.turney@dronecode.org.uk
Thu Jul 13 11:38:55 GMT 2023
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
More information about the Cygwin-patches
mailing list