test: revert changes in test directory

test/const7.go

@@ -11,6 +11,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -62,7 +63,7 @@ func main() {
 		return
 	}
 
-	dir, err := os.MkdirTemp("", "const7_")
+	dir, err := ioutil.TempDir("", "const7_")
 	if err != nil {
 		log.Fatalf("creating temp dir: %v\n", err)
 	}

test/fixedbugs/bug302.go

@@ -9,6 +9,7 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -19,7 +20,7 @@ var tmpDir string
 func main() {
 	fb, err := filepath.Abs("fixedbugs")
 	if err == nil {
-		tmpDir, err = os.MkdirTemp("", "bug302")
+		tmpDir, err = ioutil.TempDir("", "bug302")
 	}
 	if err != nil {
 		fmt.Println(err)

test/fixedbugs/bug369.go

@@ -11,6 +11,7 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -20,7 +21,7 @@ func main() {
 	err := os.Chdir(filepath.Join(".", "fixedbugs", "bug369.dir"))
 	check(err)
 
-	tmpDir, err := os.MkdirTemp("", "bug369")
+	tmpDir, err := ioutil.TempDir("", "bug369")
 	check(err)
 	defer os.RemoveAll(tmpDir)
 

test/fixedbugs/issue11771.go

@@ -12,6 +12,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -24,7 +25,7 @@ func main() {
 		return
 	}
 
-	dir, err := os.MkdirTemp("", "go-issue11771")
+	dir, err := ioutil.TempDir("", "go-issue11771")
 	if err != nil {
 		log.Fatalf("creating temp dir: %v\n", err)
 	}
@@ -47,7 +48,7 @@ func x() {
 }
 `)
 
-	if err := os.WriteFile(filepath.Join(dir, "x.go"), buf.Bytes(), 0666); err != nil {
+	if err := ioutil.WriteFile(filepath.Join(dir, "x.go"), buf.Bytes(), 0666); err != nil {
 		log.Fatal(err)
 	}
 

test/fixedbugs/issue13268.go

@@ -14,6 +14,7 @@
 package main
 
 import (
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -22,7 +23,7 @@ import (
 
 func main() {
 	// create source
-	f, err := os.CreateTemp("", "issue13268-")
+	f, err := ioutil.TempFile("", "issue13268-")
 	if err != nil {
 		log.Fatalf("could not create source file: %v", err)
 	}

test/fixedbugs/issue16037_run.go

@@ -11,6 +11,7 @@ import (
 	"bytes"
 	"fmt"
 	"html/template"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -52,13 +53,13 @@ func main() {
 		log.Fatal(err)
 	}
 
-	dir, err := os.MkdirTemp("", "issue16037-")
+	dir, err := ioutil.TempDir("", "issue16037-")
 	if err != nil {
 		log.Fatal(err)
 	}
 	defer os.RemoveAll(dir)
 	path := filepath.Join(dir, "ridiculous_number_of_fields.go")
-	if err := os.WriteFile(path, buf.Bytes(), 0664); err != nil {
+	if err := ioutil.WriteFile(path, buf.Bytes(), 0664); err != nil {
 		log.Fatal(err)
 	}
 

test/fixedbugs/issue19658.go

@@ -11,6 +11,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -34,7 +35,7 @@ func main() {
 `
 
 func main() {
-	tempDir, err := os.MkdirTemp("", "")
+	tempDir, err := ioutil.TempDir("", "")
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -69,7 +70,7 @@ func main() {
 		b := bytes.Buffer{}
 		fmt.Fprintf(&b, fn, tc.Type, tc.Input)
 
-		err = os.WriteFile(tmpFile, b.Bytes(), 0644)
+		err = ioutil.WriteFile(tmpFile, b.Bytes(), 0644)
 		if err != nil {
 			log.Fatal(err)
 		}

test/fixedbugs/issue21317.go

@@ -13,6 +13,7 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -20,7 +21,7 @@ import (
 )
 
 func main() {
-	f, err := os.CreateTemp("", "issue21317.go")
+	f, err := ioutil.TempFile("", "issue21317.go")
 	if err != nil {
 		log.Fatal(err)
 	}

test/fixedbugs/issue21576.go

@@ -14,6 +14,7 @@ package main
 import (
 	"bytes"
 	"context"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -33,14 +34,14 @@ func main() {
 `
 
 func main() {
-	dir, err := os.MkdirTemp("", "21576")
+	dir, err := ioutil.TempDir("", "21576")
 	if err != nil {
 		log.Fatal(err)
 	}
 	defer os.RemoveAll(dir)
 
 	file := filepath.Join(dir, "main.go")
-	if err := os.WriteFile(file, []byte(prog), 0655); err != nil {
+	if err := ioutil.WriteFile(file, []byte(prog), 0655); err != nil {
 		log.Fatalf("Write error %v", err)
 	}
 

test/fixedbugs/issue22660.go

@@ -10,6 +10,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -18,7 +19,7 @@ import (
 )
 
 func main() {
-	f, err := os.CreateTemp("", "issue22660.go")
+	f, err := ioutil.TempFile("", "issue22660.go")
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -30,7 +31,7 @@ func main() {
 	var src bytes.Buffer
 	fmt.Fprintf(&src, "//line %s:1\n", filepath.Join(path, "foo.go"))
 
-	if err := os.WriteFile(f.Name(), src.Bytes(), 0660); err != nil {
+	if err := ioutil.WriteFile(f.Name(), src.Bytes(), 0660); err != nil {
 		log.Fatal(err)
 	}
 

test/fixedbugs/issue22662b.go

@@ -10,6 +10,7 @@
 package main
 
 import (
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -35,7 +36,7 @@ var tests = []struct {
 }
 
 func main() {
-	f, err := os.CreateTemp("", "issue22662b.go")
+	f, err := ioutil.TempFile("", "issue22662b.go")
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -43,7 +44,7 @@ func main() {
 	defer os.Remove(f.Name())
 
 	for _, test := range tests {
-		if err := os.WriteFile(f.Name(), []byte(test.src), 0660); err != nil {
+		if err := ioutil.WriteFile(f.Name(), []byte(test.src), 0660); err != nil {
 			log.Fatal(err)
 		}
 

test/fixedbugs/issue26411.go

@@ -14,6 +14,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -22,7 +23,7 @@ import (
 )
 
 func main() {
-	tmpdir, err := os.MkdirTemp("", "issue26411")
+	tmpdir, err := ioutil.TempDir("", "issue26411")
 	if err != nil {
 		log.Fatalf("Failed to create temporary directory: %v", err)
 	}
@@ -70,7 +71,7 @@ bar            :
 
 	for i, test := range tests {
 		filename := filepath.Join(tmpdir, fmt.Sprintf("%d.go", i))
-		if err := os.WriteFile(filename, []byte(test.code), 0644); err != nil {
+		if err := ioutil.WriteFile(filename, []byte(test.code), 0644); err != nil {
 			log.Printf("#%d: failed to create file %s", i, filename)
 			continue
 		}

test/fixedbugs/issue30908.dir/b.go

@@ -5,7 +5,7 @@
 package b
 
 import (
-	"os"
+	"io/ioutil"
 
 	"./a"
 )
@@ -27,7 +27,7 @@ func ReadValues(data []byte) (vals map[string]interface{}, err error) {
 // of the output param.
 func CallReadValues(filename string) (map[string]interface{}, error) {
 	defer func() { G++ }()
-	data, err := os.ReadFile(filename)
+	data, err := ioutil.ReadFile(filename)
 	if err != nil {
 		return map[string]interface{}{}, err
 	}

test/fixedbugs/issue33555.go

@@ -11,6 +11,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -55,14 +56,14 @@ func test() error {
 	}
 	fmt.Fprintf(&buf, fnlast, count)
 
-	dir, err := os.MkdirTemp("", "issue33555")
+	dir, err := ioutil.TempDir("", "issue33555")
 	if err != nil {
 		return err
 	}
 	defer os.RemoveAll(dir)
 
 	fn := filepath.Join(dir, "x.go")
-	if err := os.WriteFile(fn, buf.Bytes(), 0644); err != nil {
+	if err := ioutil.WriteFile(fn, buf.Bytes(), 0644); err != nil {
 		return err
 	}
 

test/fixedbugs/issue36437.go

@@ -18,13 +18,14 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"regexp"
 )
 
 func main() {
-	tmpDir, err := os.MkdirTemp("", "issue36437")
+	tmpDir, err := ioutil.TempDir("", "issue36437")
 	if err != nil {
 		panic(err)
 	}

test/fixedbugs/issue9355.go

@@ -9,6 +9,7 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -19,7 +20,7 @@ func main() {
 	err := os.Chdir(filepath.Join("fixedbugs", "issue9355.dir"))
 	check(err)
 
-	f, err := os.CreateTemp("", "issue9355-*.o")
+	f, err := ioutil.TempFile("", "issue9355-*.o")
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)

test/linkmain_run.go

@@ -11,6 +11,7 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -51,7 +52,7 @@ func runFail(cmdline ...string) {
 
 func main() {
 	var err error
-	tmpDir, err = os.MkdirTemp("", "")
+	tmpDir, err = ioutil.TempDir("", "")
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)

test/linkobj.go

@@ -11,6 +11,7 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -20,7 +21,7 @@ import (
 var pwd, tmpdir string
 
 func main() {
-	dir, err := os.MkdirTemp("", "go-test-linkobj-")
+	dir, err := ioutil.TempDir("", "go-test-linkobj-")
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -121,18 +122,18 @@ func runFail(args ...string) string {
 }
 
 func cp(src, dst string) {
-	data, err := os.ReadFile(src)
+	data, err := ioutil.ReadFile(src)
 	if err != nil {
 		fatalf("%v", err)
 	}
-	err = os.WriteFile(dst, data, 0666)
+	err = ioutil.WriteFile(dst, data, 0666)
 	if err != nil {
 		fatalf("%v", err)
 	}
 }
 
 func writeFile(name, data string) {
-	err := os.WriteFile(name, []byte(data), 0666)
+	err := ioutil.WriteFile(name, []byte(data), 0666)
 	if err != nil {
 		fatalf("%v", err)
 	}

test/nosplit.go

@@ -10,6 +10,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -200,7 +201,7 @@ func main() {
 		goarch = runtime.GOARCH
 	}
 
-	dir, err := os.MkdirTemp("", "go-test-nosplit")
+	dir, err := ioutil.TempDir("", "go-test-nosplit")
 	if err != nil {
 		bug()
 		fmt.Printf("creating temp dir: %v\n", err)
@@ -209,7 +210,7 @@ func main() {
 	defer os.RemoveAll(dir)
 	os.Setenv("GOPATH", filepath.Join(dir, "_gopath"))
 
-	if err := os.WriteFile(filepath.Join(dir, "go.mod"), []byte("module go-test-nosplit\n"), 0666); err != nil {
+	if err := ioutil.WriteFile(filepath.Join(dir, "go.mod"), []byte("module go-test-nosplit\n"), 0666); err != nil {
 		log.Panic(err)
 	}
 
@@ -350,10 +351,10 @@ TestCases:
 			fmt.Printf("-- asm.s --\n%s", buf.String())
 		}
 
-		if err := os.WriteFile(filepath.Join(dir, "asm.s"), buf.Bytes(), 0666); err != nil {
+		if err := ioutil.WriteFile(filepath.Join(dir, "asm.s"), buf.Bytes(), 0666); err != nil {
 			log.Fatal(err)
 		}
-		if err := os.WriteFile(filepath.Join(dir, "main.go"), gobuf.Bytes(), 0666); err != nil {
+		if err := ioutil.WriteFile(filepath.Join(dir, "main.go"), gobuf.Bytes(), 0666); err != nil {
 			log.Fatal(err)
 		}
 

test/run.go

@@ -15,6 +15,7 @@ import (
 	"hash/fnv"
 	"io"
 	"io/fs"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -312,8 +313,8 @@ func (t *test) goDirName() string {
 	return filepath.Join(t.dir, strings.Replace(t.gofile, ".go", ".dir", -1))
 }
 
-func goDirFiles(longdir string) (filter []os.DirEntry, err error) {
+func goDirFiles(longdir string) (filter []os.FileInfo, err error) {
-	files, dirErr := os.ReadDir(longdir)
+	files, dirErr := ioutil.ReadDir(longdir)
 	if dirErr != nil {
 		return nil, dirErr
 	}
@@ -328,7 +329,7 @@ func goDirFiles(longdir string) (filter []os.DirEntry, err error) {
 var packageRE = regexp.MustCompile(`(?m)^package ([\p{Lu}\p{Ll}\w]+)`)
 
 func getPackageNameFromSource(fn string) (string, error) {
-	data, err := os.ReadFile(fn)
+	data, err := ioutil.ReadFile(fn)
 	if err != nil {
 		return "", err
 	}
@@ -476,7 +477,7 @@ func (t *test) run() {
 		close(t.donec)
 	}()
 
-	srcBytes, err := os.ReadFile(t.goFileName())
+	srcBytes, err := ioutil.ReadFile(t.goFileName())
 	if err != nil {
 		t.err = err
 		return
@@ -599,7 +600,7 @@ func (t *test) run() {
 		defer os.RemoveAll(t.tempDir)
 	}
 
-	err = os.WriteFile(filepath.Join(t.tempDir, t.gofile), srcBytes, 0644)
+	err = ioutil.WriteFile(filepath.Join(t.tempDir, t.gofile), srcBytes, 0644)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -956,7 +957,7 @@ func (t *test) run() {
 		}
 
 		modFile := fmt.Sprintf("module %s\ngo 1.14\n", modName)
-		if err := os.WriteFile(filepath.Join(gopathSrcDir, "go.mod"), []byte(modFile), 0666); err != nil {
+		if err := ioutil.WriteFile(filepath.Join(gopathSrcDir, "go.mod"), []byte(modFile), 0666); err != nil {
 			t.err = err
 			return
 		}
@@ -985,7 +986,7 @@ func (t *test) run() {
 		// Build an executable from all the .go and .s files in a subdirectory.
 		// Run it and verify its output in the buildrundir case.
 		longdir := filepath.Join(cwd, t.goDirName())
-		files, dirErr := os.ReadDir(longdir)
+		files, dirErr := ioutil.ReadDir(longdir)
 		if dirErr != nil {
 			t.err = dirErr
 			break
@@ -1003,7 +1004,7 @@ func (t *test) run() {
 		}
 		if len(asms) > 0 {
 			emptyHdrFile := filepath.Join(t.tempDir, "go_asm.h")
-			if err := os.WriteFile(emptyHdrFile, nil, 0666); err != nil {
+			if err := ioutil.WriteFile(emptyHdrFile, nil, 0666); err != nil {
 				t.err = fmt.Errorf("write empty go_asm.h: %s", err)
 				return
 			}
@@ -1147,7 +1148,7 @@ func (t *test) run() {
 			return
 		}
 		tfile := filepath.Join(t.tempDir, "tmp__.go")
-		if err := os.WriteFile(tfile, out, 0666); err != nil {
+		if err := ioutil.WriteFile(tfile, out, 0666); err != nil {
 			t.err = fmt.Errorf("write tempfile:%s", err)
 			return
 		}
@@ -1178,7 +1179,7 @@ func (t *test) run() {
 			return
 		}
 		tfile := filepath.Join(t.tempDir, "tmp__.go")
-		err = os.WriteFile(tfile, out, 0666)
+		err = ioutil.WriteFile(tfile, out, 0666)
 		if err != nil {
 			t.err = fmt.Errorf("write tempfile:%s", err)
 			return
@@ -1226,7 +1227,7 @@ func (t *test) String() string {
 
 func (t *test) makeTempDir() {
 	var err error
-	t.tempDir, err = os.MkdirTemp("", "")
+	t.tempDir, err = ioutil.TempDir("", "")
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -1243,7 +1244,7 @@ func (t *test) checkExpectedOutput(gotBytes []byte) {
 	filename := filepath.Join(t.dir, t.gofile)
 	filename = filename[:len(filename)-len(".go")]
 	filename += ".out"
-	b, err := os.ReadFile(filename)
+	b, err := ioutil.ReadFile(filename)
 	// File is allowed to be missing (err != nil) in which case output should be empty.
 	got = strings.Replace(got, "\r\n", "\n", -1)
 	if got != string(b) {
@@ -1365,7 +1366,7 @@ func (t *test) errorCheck(outStr string, wantAuto bool, fullshort ...string) (er
 func (t *test) updateErrors(out, file string) {
 	base := path.Base(file)
 	// Read in source file.
-	src, err := os.ReadFile(file)
+	src, err := ioutil.ReadFile(file)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		return
@@ -1422,7 +1423,7 @@ func (t *test) updateErrors(out, file string) {
 		}
 	}
 	// Write new file.
-	err = os.WriteFile(file, []byte(strings.Join(lines, "\n")), 0640)
+	err = ioutil.WriteFile(file, []byte(strings.Join(lines, "\n")), 0640)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		return
@@ -1481,7 +1482,7 @@ var (
 func (t *test) wantedErrors(file, short string) (errs []wantedError) {
 	cache := make(map[string]*regexp.Regexp)
 
-	src, _ := os.ReadFile(file)
+	src, _ := ioutil.ReadFile(file)
 	for i, line := range strings.Split(string(src), "\n") {
 		lineNum := i + 1
 		if strings.Contains(line, "////") {
@@ -1624,7 +1625,7 @@ func (t *test) wantedAsmOpcodes(fn string) asmChecks {
 	ops := make(asmChecks)
 
 	comment := ""
-	src, _ := os.ReadFile(fn)
+	src, _ := ioutil.ReadFile(fn)
 	for i, line := range strings.Split(string(src), "\n") {
 		matches := rxAsmComment.FindStringSubmatch(line)
 		code, cmt := matches[1], matches[2]

test/sinit_run.go

@@ -12,12 +12,13 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 )
 
 func main() {
-	f, err := os.CreateTemp("", "sinit-*.o")
+	f, err := ioutil.TempFile("", "sinit-*.o")
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)

test/winbatch.go

@@ -12,6 +12,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -49,7 +50,7 @@ func main() {
 }
 
 func enforceBatchStrictCRLF(path string) {
-	b, err := os.ReadFile(path)
+	b, err := ioutil.ReadFile(path)
 	if err != nil {
 		log.Fatalln(err)
 	}