platform: fix mis-managed channels

Author: HouzuoGuo

platform/os_indep.go

@@ -62,7 +62,7 @@ func StartProgram(envVars []string, timeoutSec int, stdout, stderr io.WriteClose
 	defer minuteTicker.Stop()
 	unixSecAtStart := time.Now().Unix()
 	timeLimitExceeded := time.After(time.Duration(timeoutSec) * time.Second)
-	processExitChan := make(chan error, 1)
+	processExitChan := make(chan error)
 	absPath, err := filepath.Abs(program)
 	if err != nil {
 		return fmt.Errorf("failed to determine abs path of the program %q: %w", program, err)
@@ -145,6 +145,6 @@ func StartProgram(envVars []string, timeoutSec int, stdout, stderr io.WriteClose
 // It returns stdout+stderr combined, the maximum size is capped to MaxExternalProgramOutputBytes.
 func InvokeProgram(envVars []string, timeoutSec int, program string, args ...string) (string, error) {
 	outBuf := lalog.NewByteLogWriter(io.Discard, MaxExternalProgramOutputBytes)
-	err := StartProgram(envVars, timeoutSec, outBuf, outBuf, make(chan<- error), make(<-chan struct{}), program, args...)
+	err := StartProgram(envVars, timeoutSec, outBuf, outBuf, make(chan<- error, 1), make(<-chan struct{}), program, args...)
 	return string(outBuf.Retrieve(false)), err
 }

toolbox/app_shell_test.go

@@ -125,9 +125,9 @@ func TestShell_NonWindowsExecute(t *testing.T) {
 		defer os.Remove(tmpFile.Name())
 		start := time.Now()
 		ret := sh.Execute(context.Background(), Command{TimeoutSec: 2, Content: `echo -n abc; sleep 5; rm ` + tmpFile.Name()})
-		if !strings.Contains(ret.Error.Error(), "time limit") ||
+		if !strings.Contains(ret.Error.Error(), "terminated") ||
 			ret.Output != "abc" ||
-			!strings.Contains(ret.ResetCombinedText(), "time limit") || !strings.Contains(ret.ResetCombinedText(), CombinedTextSeparator+"abc") {
+			!strings.Contains(ret.ResetCombinedText(), "terminated") || !strings.Contains(ret.ResetCombinedText(), CombinedTextSeparator+"abc") {
 			t.Fatalf("%v\n%s\n%s\n%s", ret.Error, ret.ErrText(), ret.Output, ret.ResetCombinedText())
 		}
 		if elapsed := time.Since(start); elapsed > 4*time.Second {