First push with null patch, to get current gitlab runner result in [#42287](https://gitlab.winehq.org/bernhardu/wine/-/pipelines/42287).
-- v2: timeout/tests: Ignore ctrl-c in the parent process.
From: Bernhard Übelacker bernhardu@mailbox.org
Otherwise in the gitlab runner this test cannot finish. --- programs/timeout/tests/timeout.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/programs/timeout/tests/timeout.c b/programs/timeout/tests/timeout.c index bd99eb9e5e1..16bebf69988 100644 --- a/programs/timeout/tests/timeout.c +++ b/programs/timeout/tests/timeout.c @@ -130,10 +130,18 @@ static void _run_timeout_ctrlc(const char *file, int line, const char *option, D exitcode_expected, exitcode); }
+static BOOL WINAPI ctrl_handler(DWORD dwCtrlType) +{ + trace("Received dwCtrlType=%lu\n", dwCtrlType); + return TRUE; +} + static void test_ctrlc(void) { + SetConsoleCtrlHandler(ctrl_handler, TRUE); run_timeout_ctrlc("", STATUS_CONTROL_C_EXIT); run_timeout_ctrlc("/nobreak", 1); + SetConsoleCtrlHandler(ctrl_handler, FALSE); }
START_TEST(timeout)