syscall: use testing.T.Context

Change-Id: I62763878d51598bf1ae0a4e75441e1d3a4b86aa3
Reviewed-on: https://go-review.googlesource.com/c/go/+/656955
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>

diff --git a/src/syscall/syscall_linux_test.go b/src/syscall/syscall_linux_test.go
index c719be5222829a058700654a1a8a1009c159c9cf..df096a0b47b81fcf5ce1db7858caad67b68e3d8e 100644 (file)
--- a/src/syscall/syscall_linux_test.go
+++ b/src/syscall/syscall_linux_test.go
@@ -5,7 +5,6 @@
 package syscall_test
 
 import (
-       "context"
        "fmt"
        "internal/testenv"
        "io"
@@ -734,9 +733,6 @@ func TestPrlimitFileLimit(t *testing.T) {
                t.Fatal(err)
        }
 
-       ctx, cancel := context.WithCancel(context.Background())
-       defer cancel()
-
        exe, err := os.Executable()
        if err != nil {
                t.Fatal(err)
@@ -759,7 +755,7 @@ func TestPrlimitFileLimit(t *testing.T) {
        var output strings.Builder
 
        const arg = "-test.run=^TestPrlimitFileLimit$"
-       cmd := testenv.CommandContext(t, ctx, exe, arg, "-test.v")
+       cmd := testenv.CommandContext(t, t.Context(), exe, arg, "-test.v")
        cmd = testenv.CleanCmdEnv(cmd)
        cmd.Env = append(cmd.Env, "GO_WANT_HELPER_PROCESS=prlimit1")
        cmd.ExtraFiles = []*os.File{r1, w2}
@@ -846,16 +842,13 @@ func testPrlimitFileLimitHelper1(t *testing.T) {
        // Start the grandchild, which should see the rlimit
        // set by the prlimit called by the parent.
 
-       ctx, cancel := context.WithCancel(context.Background())
-       defer cancel()
-
        exe, err := os.Executable()
        if err != nil {
                t.Fatal(err)
        }
 
        const arg = "-test.run=^TestPrlimitFileLimit$"
-       cmd := testenv.CommandContext(t, ctx, exe, arg, "-test.v")
+       cmd := testenv.CommandContext(t, t.Context(), exe, arg, "-test.v")
        cmd = testenv.CleanCmdEnv(cmd)
        cmd.Env = append(cmd.Env, "GO_WANT_HELPER_PROCESS=prlimit2")
        t.Logf("running %s %s", exe, arg)