From: Bryan C. Mills <bcmills@google.com>
Date: Thu, 28 Jan 2021 16:14:23 +0000 (-0500)
Subject: cmd/go: revert TestScript/build_trimpath to use ioutil.ReadFile
X-Git-Tag: go1.16~1^2~39
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=41bb49b878;p=gostls13.git

cmd/go: revert TestScript/build_trimpath to use ioutil.ReadFile

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>
---

diff --git a/src/cmd/go/testdata/script/build_trimpath.txt b/src/cmd/go/testdata/script/build_trimpath.txt
index e1ea0a48b2..2c3bee8fdc 100644
--- a/src/cmd/go/testdata/script/build_trimpath.txt
+++ b/src/cmd/go/testdata/script/build_trimpath.txt
@@ -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)
 	}