From cedaf44ea2e8b25b5298bac5f432d90033e5ad6a Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 21 May 2021 16:17:57 +0100 Subject: [PATCH] Ignore SIGURG on Darwin too This extends #2929 to Darwin as well as Linux. Running the example in https://github.com/golang/go/issues/37942 I see lots of: ``` dave@m1 sigurg % uname -ms Darwin arm64 dave@m1 sigurg % go run main.go received urgent I/O condition: 2021-05-21 16:03:03.482211 +0100 BST m=+0.014553751 received urgent I/O condition: 2021-05-21 16:03:03.507171 +0100 BST m=+0.039514459 ``` Signed-off-by: David Scott --- cli/command/container/{signals_linux.go => signals_unix.go} | 2 ++ .../container/{signals_linux_test.go => signals_unix_test.go} | 2 ++ .../container/{signals_notlinux.go => signals_windows.go} | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) rename cli/command/container/{signals_linux.go => signals_unix.go} (86%) rename cli/command/container/{signals_linux_test.go => signals_unix_test.go} (98%) rename cli/command/container/{signals_notlinux.go => signals_windows.go} (82%) diff --git a/cli/command/container/signals_linux.go b/cli/command/container/signals_unix.go similarity index 86% rename from cli/command/container/signals_linux.go rename to cli/command/container/signals_unix.go index 7eeb919850..8db4cfe835 100644 --- a/cli/command/container/signals_linux.go +++ b/cli/command/container/signals_unix.go @@ -1,3 +1,5 @@ +// +build !windows + package container import ( diff --git a/cli/command/container/signals_linux_test.go b/cli/command/container/signals_unix_test.go similarity index 98% rename from cli/command/container/signals_linux_test.go rename to cli/command/container/signals_unix_test.go index 1b2eaff9b3..61ffe64a1c 100644 --- a/cli/command/container/signals_linux_test.go +++ b/cli/command/container/signals_unix_test.go @@ -1,3 +1,5 @@ +// +build !windows + package container import ( diff --git a/cli/command/container/signals_notlinux.go b/cli/command/container/signals_windows.go similarity index 82% rename from cli/command/container/signals_notlinux.go rename to cli/command/container/signals_windows.go index 9e8412f66a..1e51b952fa 100644 --- a/cli/command/container/signals_notlinux.go +++ b/cli/command/container/signals_windows.go @@ -1,5 +1,3 @@ -// +build !linux - package container import "os"