Fix test

Author: fmeum

Diff for: src/os/signal/signal.go

@@ -168,8 +168,8 @@ func Notify(c chan<- os.Signal, sig ...os.Signal) {
 	}
 }
 
-// Reset undoes the effect of any prior calls to [Notify] for the provided
-// signals.
+// Reset undoes the effect of any prior calls to [Notify] or [Ignore] for the
+// provided signals.
 // If no signals are provided, all signal handlers will be reset.
 func Reset(sig ...os.Signal) {
 	cancel(sig, disableSignal)

Diff for: src/runtime/os3_plan9.go

@@ -149,7 +149,8 @@ Exit:
 func sigenable(sig uint32) {
 }
 
-func sigdisable(sig uint32) {
+func sigdisable(sig uint32) bool {
+	return false
 }
 
 func sigignore(sig uint32) {

Diff for: src/runtime/os_wasm.go

@@ -142,7 +142,7 @@ func getfp() uintptr { return 0 }
 
 func setProcessCPUProfiler(hz int32) {}
 func setThreadCPUProfiler(hz int32)  {}
-func sigdisable(uint32)              {}
+func sigdisable(uint32) bool         { return false }
 func sigenable(uint32)               {}
 func sigignore(uint32)               {}
 

Diff for: src/runtime/signal_unix.go

@@ -202,23 +202,28 @@ func sigenable(sig uint32) {
 		enableSigChan <- sig
 		<-maskUpdatedChan
 		if atomic.Cas(&handlingSig[sig], 0, 1) {
-			atomic.Storeuintptr(&fwdSig[sig], getsig(sig))
+			h := getsig(sig)
+			if h != _SIG_IGN {
+				atomic.Storeuintptr(&fwdSig[sig], h)
+			}
 			setsig(sig, abi.FuncPCABIInternal(sighandler))
 		}
 	}
 }
 
-// sigdisable disables the Go signal handler for the signal sig.
+// sigdisable resets the signal handler for the signal sig back to the default
+// at program startup or the last custom handler registered by cgo.
 // It is only called while holding the os/signal.handlers lock,
 // via os/signal.disableSignal and signal_disable.
-func sigdisable(sig uint32) {
+// Returns true if the signal is ignored after the change.
+func sigdisable(sig uint32) bool {
 	if sig >= uint32(len(sigtable)) {
-		return
+		return false
 	}
 
 	// SIGPROF is handled specially for profiling.
 	if sig == _SIGPROF {
-		return
+		return false
 	}
 
 	t := &sigtable[sig]
@@ -227,14 +232,27 @@ func sigdisable(sig uint32) {
 		disableSigChan <- sig
 		<-maskUpdatedChan
 
-		// If initsig does not install a signal handler for a
-		// signal, then to go back to the state before Notify
-		// we should remove the one we installed.
-		if !sigInstallGoHandler(sig) {
+		if sigInstallGoHandler(sig) {
+			if atomic.Cas(&handlingSig[sig], 0, 1) {
+				h := getsig(sig)
+				// Preserve custom signal handlers installed with cgo.
+				if h != _SIG_IGN && h != _SIG_DFL {
+					atomic.Storeuintptr(&fwdSig[sig], h)
+				}
+				setsig(sig, abi.FuncPCABIInternal(sighandler))
+			}
+			return false
+		} else {
+			// If initsig does not install a signal handler for a
+			// signal, then to go back to the state before Notify
+			// we should remove the one we installed.
 			atomic.Store(&handlingSig[sig], 0)
-			setsig(sig, atomic.Loaduintptr(&fwdSig[sig]))
+			fs := atomic.Loaduintptr(&fwdSig[sig])
+			setsig(sig, fs)
+			return fs == _SIG_IGN
 		}
 	}
+	return false
 }
 
 // sigignore ignores the signal sig.

Diff for: src/runtime/signal_windows.go

@@ -434,7 +434,8 @@ func initsig(preinit bool) {
 func sigenable(sig uint32) {
 }
 
-func sigdisable(sig uint32) {
+func sigdisable(sig uint32) bool {
+	return false
 }
 
 func sigignore(sig uint32) {

Diff for: src/runtime/sigqueue.go

@@ -230,11 +230,19 @@ func signal_disable(s uint32) {
 	if s >= uint32(len(sig.wanted)*32) {
 		return
 	}
-	sigdisable(s)
+	ignored := sigdisable(s)
 
 	w := sig.wanted[s/32]
 	w &^= 1 << (s & 31)
 	atomic.Store(&sig.wanted[s/32], w)
+
+	i := sig.ignored[s/32]
+	if ignored {
+		i |= 1 << (s & 31)
+	} else {
+		i &^= 1 << (s & 31)
+	}
+	atomic.Store(&sig.ignored[s/32], i)
 }
 
 // Must only be called from a single goroutine at a time.