[dev.fuzz] all: merge master into dev.fuzz

Change-Id: I5d8c8329ccc9d747bd81ade6b1cb7cb8ae2e94b2

1 files changed, 2 insertions, 4 deletions

diff --git a/src/os/exec_unix.go b/src/os/exec_unix.go
index 7759a2d2ea..a1703a1259 100644
--- a/src/os/exec_unix.go
+++ b/src/os/exec_unix.go
@@ -59,8 +59,6 @@ func (p *Process) wait() (ps *ProcessState, err error) {
 	return ps, nil
 }
 
-var errFinished = errors.New("os: process already finished")
-
 func (p *Process) signal(sig Signal) error {
 	if p.Pid == -1 {
 		return errors.New("os: process already released")
@@ -71,7 +69,7 @@ func (p *Process) signal(sig Signal) error {
 	p.sigMu.RLock()
 	defer p.sigMu.RUnlock()
 	if p.done() {
-		return errFinished
+		return ErrProcessDone
 	}
 	s, ok := sig.(syscall.Signal)
 	if !ok {
@@ -79,7 +77,7 @@ func (p *Process) signal(sig Signal) error {
 	}
 	if e := syscall.Kill(p.Pid, s); e != nil {
 		if e == syscall.ESRCH {
-			return errFinished
+			return ErrProcessDone
 		}
 		return e
 	}