From a3572b99f258a2028df6b0591c2ae42796754bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sat, 13 Jul 2019 12:09:44 +0200
Subject: [PATCH] Tools.Standalone.test_pike: Do not close stdin.
Potential fix for testsuite hanging on exit.
Fixes [PIKE-196].
---
lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike b/lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike
index dc68b532d1..17dcbae454 100755
--- a/lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike
+++ b/lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike
@@ -262,7 +262,11 @@ class Watchdog
WATCHDOG_MSG ("Error reading stdin pipe: %s\n",
strerror (stdin->errno()));
}
- _exit(EXIT_OK);
+ if (!timeout_phase) {
+ _exit(EXIT_OK);
+ } else {
+ _exit(EXIT_WATCHDOG_FAILED);
+ }
}
void check_parent_pid()
@@ -303,7 +307,6 @@ class Watchdog
}
WATCHDOG_MSG ("%s: Sending SIGABRT to %d.\n", ts, watched_pid);
kill(watched_pid, signum("SIGABRT"));
- stdin->close();
timeout_phase = 1;
call_out (timeout, 60);
break;
--
GitLab