Skip to content

Commit 8c88f0c

Browse files
committed
cmd/cgo/internal/testcarchive: remove 1-minute timeout
The 1-minute test timeout seems a bit arbitrary. Use internal/testenv.Command, which applies t.Deadline to subcommand. For #67566. Change-Id: If84c96e353bdfaf02c9b123758198e031305ae32 Reviewed-on: https://go-review.googlesource.com/c/go/+/599056 LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent fc51e50 commit 8c88f0c

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

src/cmd/cgo/internal/testcarchive/carchive_test.go

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,22 +1224,14 @@ func TestManyCalls(t *testing.T) {
12241224
}
12251225

12261226
argv := cmdToRun("./testp7")
1227-
cmd = exec.Command(argv[0], argv[1:]...)
1227+
cmd = testenv.Command(t, argv[0], argv[1:]...)
12281228
sb := new(strings.Builder)
12291229
cmd.Stdout = sb
12301230
cmd.Stderr = sb
12311231
if err := cmd.Start(); err != nil {
12321232
t.Fatal(err)
12331233
}
12341234

1235-
timer := time.AfterFunc(time.Minute,
1236-
func() {
1237-
t.Error("test program timed out")
1238-
cmd.Process.Kill()
1239-
},
1240-
)
1241-
defer timer.Stop()
1242-
12431235
err = cmd.Wait()
12441236
t.Logf("%v\n%s", cmd.Args, sb)
12451237
if err != nil {
@@ -1284,22 +1276,14 @@ func TestPreemption(t *testing.T) {
12841276
}
12851277

12861278
argv := cmdToRun("./testp8")
1287-
cmd = exec.Command(argv[0], argv[1:]...)
1279+
cmd = testenv.Command(t, argv[0], argv[1:]...)
12881280
sb := new(strings.Builder)
12891281
cmd.Stdout = sb
12901282
cmd.Stderr = sb
12911283
if err := cmd.Start(); err != nil {
12921284
t.Fatal(err)
12931285
}
12941286

1295-
timer := time.AfterFunc(time.Minute,
1296-
func() {
1297-
t.Error("test program timed out")
1298-
cmd.Process.Kill()
1299-
},
1300-
)
1301-
defer timer.Stop()
1302-
13031287
err = cmd.Wait()
13041288
t.Logf("%v\n%s", cmd.Args, sb)
13051289
if err != nil {

0 commit comments

Comments
 (0)