Skip to content
Snippets Groups Projects
Commit c19e5887 authored by Cherry Mui's avatar Cherry Mui Committed by Carlos Amedee
Browse files

[release-branch.go1.22] 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.
Fixes #70124.

Change-Id: If84c96e353bdfaf02c9b123758198e031305ae32
Reviewed-on: https://go-review.googlesource.com/c/go/+/599056


LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: default avatarDmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: default avatarDmitri Shuralyov <dmitshur@google.com>
(cherry picked from commit 8c88f0c7)
Reviewed-on: https://go-review.googlesource.com/c/go/+/623595


Reviewed-by: default avatarCherry Mui <cherryyz@google.com>
parent e3fd4ba7
No related branches found
No related tags found
No related merge requests found
...@@ -1224,7 +1224,7 @@ func TestManyCalls(t *testing.T) { ...@@ -1224,7 +1224,7 @@ func TestManyCalls(t *testing.T) {
} }
argv := cmdToRun("./testp7") argv := cmdToRun("./testp7")
cmd = exec.Command(argv[0], argv[1:]...) cmd = testenv.Command(t, argv[0], argv[1:]...)
sb := new(strings.Builder) sb := new(strings.Builder)
cmd.Stdout = sb cmd.Stdout = sb
cmd.Stderr = sb cmd.Stderr = sb
...@@ -1232,14 +1232,6 @@ func TestManyCalls(t *testing.T) { ...@@ -1232,14 +1232,6 @@ func TestManyCalls(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
timer := time.AfterFunc(time.Minute,
func() {
t.Error("test program timed out")
cmd.Process.Kill()
},
)
defer timer.Stop()
err = cmd.Wait() err = cmd.Wait()
t.Logf("%v\n%s", cmd.Args, sb) t.Logf("%v\n%s", cmd.Args, sb)
if err != nil { if err != nil {
...@@ -1284,7 +1276,7 @@ func TestPreemption(t *testing.T) { ...@@ -1284,7 +1276,7 @@ func TestPreemption(t *testing.T) {
} }
argv := cmdToRun("./testp8") argv := cmdToRun("./testp8")
cmd = exec.Command(argv[0], argv[1:]...) cmd = testenv.Command(t, argv[0], argv[1:]...)
sb := new(strings.Builder) sb := new(strings.Builder)
cmd.Stdout = sb cmd.Stdout = sb
cmd.Stderr = sb cmd.Stderr = sb
...@@ -1292,14 +1284,6 @@ func TestPreemption(t *testing.T) { ...@@ -1292,14 +1284,6 @@ func TestPreemption(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
timer := time.AfterFunc(time.Minute,
func() {
t.Error("test program timed out")
cmd.Process.Kill()
},
)
defer timer.Stop()
err = cmd.Wait() err = cmd.Wait()
t.Logf("%v\n%s", cmd.Args, sb) t.Logf("%v\n%s", cmd.Args, sb)
if err != nil { if err != nil {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment