cmd/internal/obj: 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: Ica1a9985f9abb1935434367c9c8ba28fc50f331d
Reviewed-on: https://go-review.googlesource.com/c/go/+/450699
Auto-Submit: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Run-TryBot: Bryan Mills <bcmills@google.com>

diff --git a/src/cmd/internal/obj/arm64/asm_arm64_test.go b/src/cmd/internal/obj/arm64/asm_arm64_test.go
index b1db336a3326ad5019e5a3a7bcdf02fe59455819..c52717dc19838a4ac3ed8b60c6c8e89677da9ccf 100644 (file)
--- a/src/cmd/internal/obj/arm64/asm_arm64_test.go
+++ b/src/cmd/internal/obj/arm64/asm_arm64_test.go
@@ -9,7 +9,6 @@ import (
        "fmt"
        "internal/testenv"
        "os"
-       "os/exec"
        "path/filepath"
        "regexp"
        "testing"
@@ -45,7 +44,7 @@ func TestLarge(t *testing.T) {
        pattern := `0x0080\s00128\s\(.*\)\tMOVD\t\$3,\sR3`
 
        // assemble generated file
-       cmd := exec.Command(testenv.GoToolPath(t), "tool", "asm", "-S", "-o", filepath.Join(dir, "test.o"), tmpfile)
+       cmd := testenv.Command(t, testenv.GoToolPath(t), "tool", "asm", "-S", "-o", filepath.Join(dir, "test.o"), tmpfile)
        cmd.Env = append(os.Environ(), "GOOS=linux")
        out, err := cmd.CombinedOutput()
        if err != nil {
@@ -60,7 +59,7 @@ func TestLarge(t *testing.T) {
        }
 
        // build generated file
-       cmd = exec.Command(testenv.GoToolPath(t), "tool", "asm", "-o", filepath.Join(dir, "x.o"), tmpfile)
+       cmd = testenv.Command(t, testenv.GoToolPath(t), "tool", "asm", "-o", filepath.Join(dir, "x.o"), tmpfile)
        cmd.Env = append(os.Environ(), "GOOS=linux")
        out, err = cmd.CombinedOutput()
        if err != nil {
@@ -94,7 +93,7 @@ func TestNoRet(t *testing.T) {
        if err := os.WriteFile(tmpfile, []byte("TEXT ·stub(SB),$0-0\nNOP\n"), 0644); err != nil {
                t.Fatal(err)
        }
-       cmd := exec.Command(testenv.GoToolPath(t), "tool", "asm", "-o", filepath.Join(dir, "x.o"), tmpfile)
+       cmd := testenv.Command(t, testenv.GoToolPath(t), "tool", "asm", "-o", filepath.Join(dir, "x.o"), tmpfile)
        cmd.Env = append(os.Environ(), "GOOS=linux")
        if out, err := cmd.CombinedOutput(); err != nil {
                t.Errorf("%v\n%s", err, out)
@@ -132,7 +131,7 @@ func TestPCALIGN(t *testing.T) {
                if err := os.WriteFile(tmpfile, test.code, 0644); err != nil {
                        t.Fatal(err)
                }
-               cmd := exec.Command(testenv.GoToolPath(t), "tool", "asm", "-S", "-o", tmpout, tmpfile)
+               cmd := testenv.Command(t, testenv.GoToolPath(t), "tool", "asm", "-S", "-o", tmpout, tmpfile)
                cmd.Env = append(os.Environ(), "GOOS=linux")
                out, err := cmd.CombinedOutput()
                if err != nil {

diff --git a/src/cmd/internal/obj/objfile_test.go b/src/cmd/internal/obj/objfile_test.go
index 79204c18589371ab6e7bc23441c12b6057ceb64c..9e9905680315796af2fa75e72d32ca4db0c98af0 100644 (file)
--- a/src/cmd/internal/obj/objfile_test.go
+++ b/src/cmd/internal/obj/objfile_test.go
@@ -8,7 +8,6 @@ import (
        "bytes"
        "internal/testenv"
        "os"
-       "os/exec"
        "path/filepath"
        "testing"
        "unsafe"
@@ -111,7 +110,7 @@ func TestSymbolTooLarge(t *testing.T) { // Issue 42054
                t.Fatalf("failed to write source file: %v\n", err)
        }
        obj := filepath.Join(tmpdir, "p.o")
-       cmd := exec.Command(testenv.GoToolPath(t), "tool", "compile", "-p=p", "-o", obj, src)
+       cmd := testenv.Command(t, testenv.GoToolPath(t), "tool", "compile", "-p=p", "-o", obj, src)
        out, err := cmd.CombinedOutput()
        if err == nil {
                t.Fatalf("did not fail\noutput: %s", out)
@@ -137,7 +136,7 @@ func TestNoRefName(t *testing.T) {
 
        // Build the fmt package with norefname. Not rebuilding all packages to save time.
        // Also testing that norefname and non-norefname packages can link together.
-       cmd := exec.Command(testenv.GoToolPath(t), "build", "-gcflags=fmt=-d=norefname", "-o", exe, src)
+       cmd := testenv.Command(t, testenv.GoToolPath(t), "build", "-gcflags=fmt=-d=norefname", "-o", exe, src)
        out, err := cmd.CombinedOutput()
        if err != nil {
                t.Fatalf("build failed: %v, output:\n%s", err, out)

diff --git a/src/cmd/internal/obj/ppc64/asm_test.go b/src/cmd/internal/obj/ppc64/asm_test.go
index ff18a5e46107a49cffa9c4704c3392fc1d15cc00..89fc9ba0efd38f14e77ada3ef6a89be431fe04c8 100644 (file)
--- a/src/cmd/internal/obj/ppc64/asm_test.go
+++ b/src/cmd/internal/obj/ppc64/asm_test.go
@@ -10,7 +10,6 @@ import (
        "internal/testenv"
        "math"
        "os"
-       "os/exec"
        "path/filepath"
        "regexp"
        "strings"
@@ -192,7 +191,7 @@ func TestPfxAlign(t *testing.T) {
                if err != nil {
                        t.Fatalf("can't write output: %v\n", err)
                }
-               cmd := exec.Command(testenv.GoToolPath(t), "tool", "asm", "-S", "-o", filepath.Join(dir, "test.o"), tmpfile)
+               cmd := testenv.Command(t, testenv.GoToolPath(t), "tool", "asm", "-S", "-o", filepath.Join(dir, "test.o"), tmpfile)
                cmd.Env = append(os.Environ(), "GOOS=linux", "GOARCH=ppc64le")
                out, err := cmd.CombinedOutput()
                if err != nil {
@@ -288,7 +287,7 @@ func TestLarge(t *testing.T) {
 
                // Test on all supported ppc64 platforms
                for _, platenv := range platformEnvs {
-                       cmd := exec.Command(testenv.GoToolPath(t), "tool", "asm", "-S", "-o", filepath.Join(dir, "test.o"), tmpfile)
+                       cmd := testenv.Command(t, testenv.GoToolPath(t), "tool", "asm", "-S", "-o", filepath.Join(dir, "test.o"), tmpfile)
                        cmd.Env = append(os.Environ(), platenv...)
                        out, err := cmd.CombinedOutput()
                        if err != nil {
@@ -351,7 +350,7 @@ func TestPCalign(t *testing.T) {
        }
 
        // build generated file without errors and assemble it
-       cmd := exec.Command(testenv.GoToolPath(t), "tool", "asm", "-o", filepath.Join(dir, "x.o"), "-S", tmpfile)
+       cmd := testenv.Command(t, testenv.GoToolPath(t), "tool", "asm", "-o", filepath.Join(dir, "x.o"), "-S", tmpfile)
        cmd.Env = append(os.Environ(), "GOARCH=ppc64le", "GOOS=linux")
        out, err := cmd.CombinedOutput()
        if err != nil {
@@ -391,7 +390,7 @@ func TestPCalign(t *testing.T) {
        }
 
        // build test with errors and check for messages
-       cmd = exec.Command(testenv.GoToolPath(t), "tool", "asm", "-o", filepath.Join(dir, "xi.o"), "-S", tmpfile)
+       cmd = testenv.Command(t, testenv.GoToolPath(t), "tool", "asm", "-o", filepath.Join(dir, "xi.o"), "-S", tmpfile)
        cmd.Env = append(os.Environ(), "GOARCH=ppc64le", "GOOS=linux")
        out, err = cmd.CombinedOutput()
        if !strings.Contains(string(out), "Unexpected alignment") {

diff --git a/src/cmd/internal/obj/riscv/asm_test.go b/src/cmd/internal/obj/riscv/asm_test.go
index c798e98873eed290517c84bacb459f42c609755f..c22428cdc5b816ee3a6dc71dbd5e2c4af261a04a 100644 (file)
--- a/src/cmd/internal/obj/riscv/asm_test.go
+++ b/src/cmd/internal/obj/riscv/asm_test.go
@@ -9,7 +9,6 @@ import (
        "fmt"
        "internal/testenv"
        "os"
-       "os/exec"
        "path/filepath"
        "runtime"
        "testing"
@@ -39,7 +38,7 @@ func TestLargeBranch(t *testing.T) {
        }
 
        // Assemble generated file.
-       cmd := exec.Command(testenv.GoToolPath(t), "tool", "asm", "-o", filepath.Join(dir, "x.o"), tmpfile)
+       cmd := testenv.Command(t, testenv.GoToolPath(t), "tool", "asm", "-o", filepath.Join(dir, "x.o"), tmpfile)
        cmd.Env = append(os.Environ(), "GOARCH=riscv64", "GOOS=linux")
        out, err := cmd.CombinedOutput()
        if err != nil {
@@ -96,7 +95,7 @@ func y()
        }
 
        // Build generated files.
-       cmd := exec.Command(testenv.GoToolPath(t), "build", "-ldflags=-linkmode=internal")
+       cmd := testenv.Command(t, testenv.GoToolPath(t), "build", "-ldflags=-linkmode=internal")
        cmd.Dir = dir
        cmd.Env = append(os.Environ(), "GOARCH=riscv64", "GOOS=linux")
        out, err := cmd.CombinedOutput()
@@ -105,7 +104,7 @@ func y()
        }
 
        if runtime.GOARCH == "riscv64" && testenv.HasCGO() {
-               cmd := exec.Command(testenv.GoToolPath(t), "build", "-ldflags=-linkmode=external")
+               cmd := testenv.Command(t, testenv.GoToolPath(t), "build", "-ldflags=-linkmode=external")
                cmd.Dir = dir
                cmd.Env = append(os.Environ(), "GOARCH=riscv64", "GOOS=linux")
                out, err := cmd.CombinedOutput()
@@ -138,7 +137,7 @@ func TestNoRet(t *testing.T) {
        if err := os.WriteFile(tmpfile, []byte("TEXT ·stub(SB),$0-0\nNOP\n"), 0644); err != nil {
                t.Fatal(err)
        }
-       cmd := exec.Command(testenv.GoToolPath(t), "tool", "asm", "-o", filepath.Join(dir, "x.o"), tmpfile)
+       cmd := testenv.Command(t, testenv.GoToolPath(t), "tool", "asm", "-o", filepath.Join(dir, "x.o"), tmpfile)
        cmd.Env = append(os.Environ(), "GOARCH=riscv64", "GOOS=linux")
        if out, err := cmd.CombinedOutput(); err != nil {
                t.Errorf("%v\n%s", err, out)
@@ -192,7 +191,7 @@ TEXT _stub(SB),$0-0
        if err := os.WriteFile(tmpfile, []byte(asm), 0644); err != nil {
                t.Fatal(err)
        }
-       cmd := exec.Command(testenv.GoToolPath(t), "tool", "asm", "-o", filepath.Join(dir, "x.o"), tmpfile)
+       cmd := testenv.Command(t, testenv.GoToolPath(t), "tool", "asm", "-o", filepath.Join(dir, "x.o"), tmpfile)
        cmd.Env = append(os.Environ(), "GOARCH=riscv64", "GOOS=linux")
        if out, err := cmd.CombinedOutput(); err != nil {
                t.Errorf("%v\n%s", err, out)
@@ -206,7 +205,7 @@ func TestBranch(t *testing.T) {
 
        testenv.MustHaveGoBuild(t)
 
-       cmd := exec.Command(testenv.GoToolPath(t), "test")
+       cmd := testenv.Command(t, testenv.GoToolPath(t), "test")
        cmd.Dir = "testdata/testbranch"
        if out, err := testenv.CleanCmdEnv(cmd).CombinedOutput(); err != nil {
                t.Errorf("Branch test failed: %v\n%s", err, out)

diff --git a/src/cmd/internal/obj/x86/obj6_test.go b/src/cmd/internal/obj/x86/obj6_test.go
index 354454fe24bd3a50a08563734f63c073cc8892d2..d1246be77bd8d1488a350e096b320d324990cc26 100644 (file)
--- a/src/cmd/internal/obj/x86/obj6_test.go
+++ b/src/cmd/internal/obj/x86/obj6_test.go
@@ -10,7 +10,6 @@ import (
        "fmt"
        "internal/testenv"
        "os"
-       "os/exec"
        "path/filepath"
        "regexp"
        "strconv"
@@ -98,7 +97,7 @@ func asmOutput(t *testing.T, s string) []byte {
        if err != nil {
                t.Fatal(err)
        }
-       cmd := exec.Command(
+       cmd := testenv.Command(t,
                testenv.GoToolPath(t), "tool", "asm", "-S", "-dynlink",
                "-o", filepath.Join(tmpdir, "output.6"), tmpfile.Name())
 

diff --git a/src/cmd/internal/obj/x86/pcrelative_test.go b/src/cmd/internal/obj/x86/pcrelative_test.go
index a60000663401c63720a76d5bd06f0fa9e9bebed5..3827100123f26d874a30239bff703111e5006fb6 100644 (file)
--- a/src/cmd/internal/obj/x86/pcrelative_test.go
+++ b/src/cmd/internal/obj/x86/pcrelative_test.go
@@ -9,7 +9,6 @@ import (
        "fmt"
        "internal/testenv"
        "os"
-       "os/exec"
        "path/filepath"
        "testing"
 )
@@ -60,7 +59,7 @@ func objdumpOutput(t *testing.T, mname, source string) []byte {
                t.Fatal(err)
        }
 
-       cmd := exec.Command(
+       cmd := testenv.Command(t,
                testenv.GoToolPath(t), "build", "-o",
                filepath.Join(tmpdir, "output"))
 
@@ -72,7 +71,7 @@ func objdumpOutput(t *testing.T, mname, source string) []byte {
        if err != nil {
                t.Fatalf("error %s output %s", err, out)
        }
-       cmd2 := exec.Command(
+       cmd2 := testenv.Command(t,
                testenv.GoToolPath(t), "tool", "objdump", "-s", "testASM",
                filepath.Join(tmpdir, "output"))
        cmd2.Env = cmd.Env