1berry/go
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

internal/trace: end test programs with SIGQUIT

Browse Source 
This change switches from using testenv.Command to
testenv.CommandContext which is a little bit friendlier. It also
switches away from using 'go run' to 'go build' and running the
resulting binary explicitly. This helps eliminate any questions about
signal handling and propagation.

For #72740.

Change-Id: Ife8010da89a7bc439e061fe0c9c6b1f5620d90f1
Reviewed-on: https://go-review.googlesource.com/c/go/+/680977
Reviewed-by: Carlos Amedee <carlos@golang.org>
TryBot-Bypass: Michael Knyszek <mknyszek@google.com>
This commit is contained in:
Michael Anthony Knyszek 2025-06-11 21:20:05 +00:00 committed by Michael Knyszek
parent 5a08865de3
commit 934d5f2cf7
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/internal/trace/trace_test.go
View File

@ -582,13 +582,30 @@ func testTraceProg(t *testing.T, progName string, extra func(t *testing.T, trace
testPath := filepath.Join("./testdata/testprog", progName) testPath := filepath.Join("./testdata/testprog", progName)
testName := progName testName := progName
runTest := func(t *testing.T, stress bool, extraGODEBUG string) { runTest := func(t *testing.T, stress bool, extraGODEBUG string) {
// Run the program and capture the trace, which is always written to stdout. // Build the program.
cmd := testenv.Command(t, testenv.GoToolPath(t), "run") binFile, err := os.CreateTemp("", progName)
if race.Enabled { if err != nil {
cmd.Args = append(cmd.Args, "-race") t.Fatalf("failed to create temporary output file: %v", err)
} }
cmd.Args = append(cmd.Args, testPath) bin := binFile.Name()
cmd.Env = append(os.Environ(), "GOEXPERIMENT=rangefunc") binFile.Close()
t.Cleanup(func() {
os.Remove(bin)
})
buildCmd := testenv.CommandContext(t, t.Context(), testenv.GoToolPath(t), "build", "-o", bin)
if race.Enabled {
buildCmd.Args = append(buildCmd.Args, "-race")
}
buildCmd.Args = append(buildCmd.Args, testPath)
buildCmd.Env = append(os.Environ(), "GOEXPERIMENT=rangefunc")
buildOutput, err := buildCmd.CombinedOutput()
if err != nil {
t.Fatalf("failed to build %s: %v: output:\n%s", testPath, err, buildOutput)
}
// Run the program and capture the trace, which is always written to stdout.
cmd := testenv.CommandContext(t, t.Context(), bin)
// Add a stack ownership check. This is cheap enough for testing. // Add a stack ownership check. This is cheap enough for testing.
godebug := "tracecheckstackownership=1" godebug := "tracecheckstackownership=1"
if stress { if stress {