src/os/signal/signal_test.go | 18 ++++++++++++++++++ diff --git a/src/os/signal/signal_test.go b/src/os/signal/signal_test.go index dcfd08f78de4f2cea158805511124e5f3c1c56ab..61a98c1ae272e02f3b93971227419de70961e151 100644 --- a/src/os/signal/signal_test.go +++ b/src/os/signal/signal_test.go @@ -308,6 +308,7 @@ if out, err := exec.Command(os.Args[0], "-test.run=TestDetectNohup", "-check_sighup_ignored").CombinedOutput(); err == nil { t.Errorf("ran test with -check_sighup_ignored and it succeeded: expected failure.\nOutput:\n%s", out) } Stop(c) + // Again, this time with nohup, assuming we can find it. _, err := os.Stat("/usr/bin/nohup") if err != nil { @@ -320,6 +321,13 @@ data, _ := os.ReadFile("nohup.out") os.Remove("nohup.out") if err != nil { + // nohup doesn't work on new LUCI darwin builders due to the + // type of launchd service the test run under. See + // https://go.dev/issue/63875. + if runtime.GOOS == "darwin" && strings.Contains(string(out), "nohup: can't detach from console: Inappropriate ioctl for device") { + t.Skip("Skipping nohup test due to darwin builder limitation. See https://go.dev/issue/63875.") + } + t.Errorf("ran test with -check_sighup_ignored under nohup and it failed: expected success.\nError: %v\nOutput:\n%s%s", err, out, data) } } @@ -498,6 +506,16 @@ } out, err := testenv.Command(t, "nohup", args...).CombinedOutput() if err != nil { + // nohup doesn't work on new LUCI darwin builders due to the + // type of launchd service the test run under. See + // https://go.dev/issue/63875. + if runtime.GOOS == "darwin" && strings.Contains(string(out), "nohup: can't detach from console: Inappropriate ioctl for device") { + // TODO(go.dev/issue/63799): A false-positive in vet reports a + // t.Skip here as invalid. Switch back to t.Skip once fixed. + t.Logf("Skipping nohup test due to darwin builder limitation. See https://go.dev/issue/63875.") + return + } + t.Errorf("ran test with -send_uncaught_sighup=%d under nohup and it failed: expected success.\nError: %v\nOutput:\n%s", i, err, out) } else { t.Logf("ran test with -send_uncaught_sighup=%d under nohup.\nOutput:\n%s", i, out)