]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go: revert TestScript/build_trimpath to use ioutil.ReadFile
authorBryan C. Mills <bcmills@google.com>
Thu, 28 Jan 2021 16:14:23 +0000 (11:14 -0500)
committerBryan C. Mills <bcmills@google.com>
Thu, 28 Jan 2021 16:35:06 +0000 (16:35 +0000)
This call was changed to os.ReadFile in CL 266365, but the test also
builds that source file using gccgo if present, and released versions
of gccgo do not yet support ioutil.ReadFile.

Manually tested with gccgo gccgo 10.2.1 (see #35786).

Fixes #43974.
Updates #42026.

Change-Id: Ic4ca0848d3ca324e2ab10fd14ad867f21e0898e3
Reviewed-on: https://go-review.googlesource.com/c/go/+/287613
Trust: Bryan C. Mills <bcmills@google.com>
Run-TryBot: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Jay Conrod <jayconrod@google.com>
TryBot-Result: Go Bot <gobot@golang.org>

src/cmd/go/testdata/script/build_trimpath.txt

index e1ea0a48b2acfec72a585b6d31cb05718dc9c42b..2c3bee8fdc7a925bb9bd9bdcee078a36b0ed9581 100644 (file)
@@ -121,6 +121,7 @@ package main
 import (
        "bytes"
        "fmt"
+       "io/ioutil"
        "log"
        "os"
        "os/exec"
@@ -130,7 +131,7 @@ import (
 
 func main() {
        exe := os.Args[1]
-       data, err := os.ReadFile(exe)
+       data, err := ioutil.ReadFile(exe)
        if err != nil {
                log.Fatal(err)
        }