From: Bryan C. Mills <bcmills@google.com>
Date: Tue, 15 Nov 2022 15:47:46 +0000 (-0500)
Subject: cmd/pprof: use testenv.Command instead of exec.Command in tests
X-Git-Tag: go1.20rc1~240
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ddf78189d47ff97afb76d3b4e47edbf3eb0ee11c;p=gostls13.git

cmd/pprof: use testenv.Command instead of exec.Command in tests

testenv.Command sets a default timeout based on the test's deadline
and sends SIGQUIT (where supported) in case of a hang.

Change-Id: Iabd114dd23b85da524e7ea8415f2bbf2c54b380f
Reviewed-on: https://go-review.googlesource.com/c/go/+/450709
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Bryan Mills <bcmills@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
---

diff --git a/src/cmd/pprof/pprof_test.go b/src/cmd/pprof/pprof_test.go
index ed6a9386d5..353781ac04 100644
--- a/src/cmd/pprof/pprof_test.go
+++ b/src/cmd/pprof/pprof_test.go
@@ -7,7 +7,6 @@ package main
 import (
 	"internal/testenv"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -91,7 +90,7 @@ func TestDisasm(t *testing.T) {
 
 	tmpdir := t.TempDir()
 	cpuExe := filepath.Join(tmpdir, "cpu.exe")
-	cmd := exec.Command(testenv.GoToolPath(t), "build", "-o", cpuExe, "cpu.go")
+	cmd := testenv.Command(t, testenv.GoToolPath(t), "build", "-o", cpuExe, "cpu.go")
 	cmd.Dir = "testdata/"
 	out, err := cmd.CombinedOutput()
 	if err != nil {
@@ -99,19 +98,19 @@ func TestDisasm(t *testing.T) {
 	}
 
 	profile := filepath.Join(tmpdir, "cpu.pprof")
-	cmd = exec.Command(cpuExe, "-output", profile)
+	cmd = testenv.Command(t, cpuExe, "-output", profile)
 	out, err = cmd.CombinedOutput()
 	if err != nil {
 		t.Fatalf("cpu failed: %v\n%s", err, out)
 	}
 
-	cmd = exec.Command(pprofPath(t), "-disasm", "main.main", cpuExe, profile)
+	cmd = testenv.Command(t, pprofPath(t), "-disasm", "main.main", cpuExe, profile)
 	out, err = cmd.CombinedOutput()
 	if err != nil {
 		t.Errorf("pprof -disasm failed: %v\n%s", err, out)
 
 		// Try to print out profile content for debugging.
-		cmd = exec.Command(pprofPath(t), "-raw", cpuExe, profile)
+		cmd = testenv.Command(t, pprofPath(t), "-raw", cpuExe, profile)
 		out, err = cmd.CombinedOutput()
 		if err != nil {
 			t.Logf("pprof -raw failed: %v\n%s", err, out)