diff --git a/src/d8/d8.cc b/src/d8/d8.cc index 55e3b8dff5..f540b932b0 100644 --- a/src/d8/d8.cc +++ b/src/d8/d8.cc @@ -70,10 +70,6 @@ #include "src/utils/utils.h" #include "src/web-snapshot/web-snapshot.h" -#if V8_OS_POSIX -#include -#endif // V8_OS_POSIX - #ifdef V8_FUZZILLI #include "src/d8/cov.h" #endif // V8_FUZZILLI @@ -5519,33 +5515,9 @@ bool HasFlagThatRequiresSharedIsolate() { return i::FLAG_shared_string_table || i::FLAG_harmony_struct; } -#ifdef V8_OS_POSIX -void d8_sigterm_handler(int signal) { - // Dump stacktraces when terminating d8 instances with SIGTERM. - // SIGKILL is not intercepted. - if (signal == SIGTERM) { - FATAL("d8: Received SIGTERM signal (likely due to a TIMEOUT)\n"); - } else { - UNREACHABLE(); - } -} -#endif // V8_OS_POSIX - -void d8_install_sigterm_handler() { -#ifdef V8_OS_POSIX - struct sigaction sa; - sa.sa_handler = d8_sigterm_handler; - sigemptyset(&sa.sa_mask); - if (sigaction(SIGTERM, &sa, NULL) == -1) { - FATAL("Could not install SIGTERM handler"); - } -#endif // V8_OS_POSIX -} - } // namespace int Shell::Main(int argc, char* argv[]) { - d8_install_sigterm_handler(); v8::base::EnsureConsoleOutput(); if (!SetOptions(argc, argv)) return 1; diff --git a/tools/testrunner/local/command.py b/tools/testrunner/local/command.py index 976d1b8860..9a5f11bcb5 100644 --- a/tools/testrunner/local/command.py +++ b/tools/testrunner/local/command.py @@ -200,11 +200,6 @@ class PosixCommand(BaseCommand): def _kill_process(self, process): # Kill the whole process group (PID == GPID after setsid). - # First try a soft term to allow some feedback - os.killpg(process.pid, signal.SIGTERM) - # Give the process some time to cleanly terminate. - time.sleep(0.1) - # Forcefully kill processes. os.killpg(process.pid, signal.SIGKILL)