Skip to content

Commit dda42b0

Browse files
KimMachineGunKimMachineGun
committed
test: revert changes in test directory
1 parent 0522430 commit dda42b0

22 files changed

+73
-52
lines changed

Diff for: ‎test/const7.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ package main
1111
import (
1212
"bytes"
1313
"fmt"
14+
"io/ioutil"
1415
"log"
1516
"os"
1617
"os/exec"
@@ -62,7 +63,7 @@ func main() {
6263
return
6364
}
6465

65-
dir, err := os.MkdirTemp("", "const7_")
66+
dir, err := ioutil.TempDir("", "const7_")
6667
if err != nil {
6768
log.Fatalf("creating temp dir: %v\n", err)
6869
}

Diff for: ‎test/fixedbugs/bug302.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package main
99

1010
import (
1111
"fmt"
12+
"io/ioutil"
1213
"os"
1314
"os/exec"
1415
"path/filepath"
@@ -19,7 +20,7 @@ var tmpDir string
1920
func main() {
2021
fb, err := filepath.Abs("fixedbugs")
2122
if err == nil {
22-
tmpDir, err = os.MkdirTemp("", "bug302")
23+
tmpDir, err = ioutil.TempDir("", "bug302")
2324
}
2425
if err != nil {
2526
fmt.Println(err)

Diff for: ‎test/fixedbugs/bug369.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ package main
1111

1212
import (
1313
"fmt"
14+
"io/ioutil"
1415
"os"
1516
"os/exec"
1617
"path/filepath"
@@ -20,7 +21,7 @@ func main() {
2021
err := os.Chdir(filepath.Join(".", "fixedbugs", "bug369.dir"))
2122
check(err)
2223

23-
tmpDir, err := os.MkdirTemp("", "bug369")
24+
tmpDir, err := ioutil.TempDir("", "bug369")
2425
check(err)
2526
defer os.RemoveAll(tmpDir)
2627

Diff for: ‎test/fixedbugs/issue11771.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ package main
1212
import (
1313
"bytes"
1414
"fmt"
15+
"io/ioutil"
1516
"log"
1617
"os"
1718
"os/exec"
@@ -24,7 +25,7 @@ func main() {
2425
return
2526
}
2627

27-
dir, err := os.MkdirTemp("", "go-issue11771")
28+
dir, err := ioutil.TempDir("", "go-issue11771")
2829
if err != nil {
2930
log.Fatalf("creating temp dir: %v\n", err)
3031
}
@@ -47,7 +48,7 @@ func x() {
4748
}
4849
`)
4950

50-
if err := os.WriteFile(filepath.Join(dir, "x.go"), buf.Bytes(), 0666); err != nil {
51+
if err := ioutil.WriteFile(filepath.Join(dir, "x.go"), buf.Bytes(), 0666); err != nil {
5152
log.Fatal(err)
5253
}
5354

Diff for: ‎test/fixedbugs/issue13268.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
package main
1515

1616
import (
17+
"io/ioutil"
1718
"log"
1819
"os"
1920
"os/exec"
@@ -22,7 +23,7 @@ import (
2223

2324
func main() {
2425
// create source
25-
f, err := os.CreateTemp("", "issue13268-")
26+
f, err := ioutil.TempFile("", "issue13268-")
2627
if err != nil {
2728
log.Fatalf("could not create source file: %v", err)
2829
}

Diff for: ‎test/fixedbugs/issue16037_run.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"bytes"
1212
"fmt"
1313
"html/template"
14+
"io/ioutil"
1415
"log"
1516
"os"
1617
"os/exec"
@@ -52,13 +53,13 @@ func main() {
5253
log.Fatal(err)
5354
}
5455

55-
dir, err := os.MkdirTemp("", "issue16037-")
56+
dir, err := ioutil.TempDir("", "issue16037-")
5657
if err != nil {
5758
log.Fatal(err)
5859
}
5960
defer os.RemoveAll(dir)
6061
path := filepath.Join(dir, "ridiculous_number_of_fields.go")
61-
if err := os.WriteFile(path, buf.Bytes(), 0664); err != nil {
62+
if err := ioutil.WriteFile(path, buf.Bytes(), 0664); err != nil {
6263
log.Fatal(err)
6364
}
6465

Diff for: ‎test/fixedbugs/issue19658.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ package main
1111
import (
1212
"bytes"
1313
"fmt"
14+
"io/ioutil"
1415
"log"
1516
"os"
1617
"os/exec"
@@ -34,7 +35,7 @@ func main() {
3435
`
3536

3637
func main() {
37-
tempDir, err := os.MkdirTemp("", "")
38+
tempDir, err := ioutil.TempDir("", "")
3839
if err != nil {
3940
log.Fatal(err)
4041
}
@@ -69,7 +70,7 @@ func main() {
6970
b := bytes.Buffer{}
7071
fmt.Fprintf(&b, fn, tc.Type, tc.Input)
7172

72-
err = os.WriteFile(tmpFile, b.Bytes(), 0644)
73+
err = ioutil.WriteFile(tmpFile, b.Bytes(), 0644)
7374
if err != nil {
7475
log.Fatal(err)
7576
}

Diff for: ‎test/fixedbugs/issue21317.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ package main
1313

1414
import (
1515
"fmt"
16+
"io/ioutil"
1617
"log"
1718
"os"
1819
"os/exec"
1920
"strings"
2021
)
2122

2223
func main() {
23-
f, err := os.CreateTemp("", "issue21317.go")
24+
f, err := ioutil.TempFile("", "issue21317.go")
2425
if err != nil {
2526
log.Fatal(err)
2627
}

Diff for: ‎test/fixedbugs/issue21576.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ package main
1414
import (
1515
"bytes"
1616
"context"
17+
"io/ioutil"
1718
"log"
1819
"os"
1920
"os/exec"
@@ -33,14 +34,14 @@ func main() {
3334
`
3435

3536
func main() {
36-
dir, err := os.MkdirTemp("", "21576")
37+
dir, err := ioutil.TempDir("", "21576")
3738
if err != nil {
3839
log.Fatal(err)
3940
}
4041
defer os.RemoveAll(dir)
4142

4243
file := filepath.Join(dir, "main.go")
43-
if err := os.WriteFile(file, []byte(prog), 0655); err != nil {
44+
if err := ioutil.WriteFile(file, []byte(prog), 0655); err != nil {
4445
log.Fatalf("Write error %v", err)
4546
}
4647

Diff for: ‎test/fixedbugs/issue22660.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ package main
1010
import (
1111
"bytes"
1212
"fmt"
13+
"io/ioutil"
1314
"log"
1415
"os"
1516
"os/exec"
@@ -18,7 +19,7 @@ import (
1819
)
1920

2021
func main() {
21-
f, err := os.CreateTemp("", "issue22660.go")
22+
f, err := ioutil.TempFile("", "issue22660.go")
2223
if err != nil {
2324
log.Fatal(err)
2425
}
@@ -30,7 +31,7 @@ func main() {
3031
var src bytes.Buffer
3132
fmt.Fprintf(&src, "//line %s:1\n", filepath.Join(path, "foo.go"))
3233

33-
if err := os.WriteFile(f.Name(), src.Bytes(), 0660); err != nil {
34+
if err := ioutil.WriteFile(f.Name(), src.Bytes(), 0660); err != nil {
3435
log.Fatal(err)
3536
}
3637

Diff for: ‎test/fixedbugs/issue22662b.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package main
1111

1212
import (
13+
"io/ioutil"
1314
"log"
1415
"os"
1516
"os/exec"
@@ -35,15 +36,15 @@ var tests = []struct {
3536
}
3637

3738
func main() {
38-
f, err := os.CreateTemp("", "issue22662b.go")
39+
f, err := ioutil.TempFile("", "issue22662b.go")
3940
if err != nil {
4041
log.Fatal(err)
4142
}
4243
f.Close()
4344
defer os.Remove(f.Name())
4445

4546
for _, test := range tests {
46-
if err := os.WriteFile(f.Name(), []byte(test.src), 0660); err != nil {
47+
if err := ioutil.WriteFile(f.Name(), []byte(test.src), 0660); err != nil {
4748
log.Fatal(err)
4849
}
4950

Diff for: ‎test/fixedbugs/issue26411.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ package main
1414
import (
1515
"bytes"
1616
"fmt"
17+
"io/ioutil"
1718
"log"
1819
"os"
1920
"os/exec"
@@ -22,7 +23,7 @@ import (
2223
)
2324

2425
func main() {
25-
tmpdir, err := os.MkdirTemp("", "issue26411")
26+
tmpdir, err := ioutil.TempDir("", "issue26411")
2627
if err != nil {
2728
log.Fatalf("Failed to create temporary directory: %v", err)
2829
}
@@ -70,7 +71,7 @@ bar :
7071

7172
for i, test := range tests {
7273
filename := filepath.Join(tmpdir, fmt.Sprintf("%d.go", i))
73-
if err := os.WriteFile(filename, []byte(test.code), 0644); err != nil {
74+
if err := ioutil.WriteFile(filename, []byte(test.code), 0644); err != nil {
7475
log.Printf("#%d: failed to create file %s", i, filename)
7576
continue
7677
}

Diff for: ‎test/fixedbugs/issue30908.dir/b.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package b
66

77
import (
8-
"os"
8+
"io/ioutil"
99

1010
"./a"
1111
)
@@ -27,7 +27,7 @@ func ReadValues(data []byte) (vals map[string]interface{}, err error) {
2727
// of the output param.
2828
func CallReadValues(filename string) (map[string]interface{}, error) {
2929
defer func() { G++ }()
30-
data, err := os.ReadFile(filename)
30+
data, err := ioutil.ReadFile(filename)
3131
if err != nil {
3232
return map[string]interface{}{}, err
3333
}

Diff for: ‎test/fixedbugs/issue33555.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ package main
1111
import (
1212
"bytes"
1313
"fmt"
14+
"io/ioutil"
1415
"os"
1516
"os/exec"
1617
"path/filepath"
@@ -55,14 +56,14 @@ func test() error {
5556
}
5657
fmt.Fprintf(&buf, fnlast, count)
5758

58-
dir, err := os.MkdirTemp("", "issue33555")
59+
dir, err := ioutil.TempDir("", "issue33555")
5960
if err != nil {
6061
return err
6162
}
6263
defer os.RemoveAll(dir)
6364

6465
fn := filepath.Join(dir, "x.go")
65-
if err := os.WriteFile(fn, buf.Bytes(), 0644); err != nil {
66+
if err := ioutil.WriteFile(fn, buf.Bytes(), 0644); err != nil {
6667
return err
6768
}
6869

Diff for: ‎test/fixedbugs/issue36437.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ package main
1818

1919
import (
2020
"fmt"
21+
"io/ioutil"
2122
"os"
2223
"os/exec"
2324
"regexp"
2425
)
2526

2627
func main() {
27-
tmpDir, err := os.MkdirTemp("", "issue36437")
28+
tmpDir, err := ioutil.TempDir("", "issue36437")
2829
if err != nil {
2930
panic(err)
3031
}

Diff for: ‎test/fixedbugs/issue9355.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package main
99

1010
import (
1111
"fmt"
12+
"io/ioutil"
1213
"os"
1314
"os/exec"
1415
"path/filepath"
@@ -19,7 +20,7 @@ func main() {
1920
err := os.Chdir(filepath.Join("fixedbugs", "issue9355.dir"))
2021
check(err)
2122

22-
f, err := os.CreateTemp("", "issue9355-*.o")
23+
f, err := ioutil.TempFile("", "issue9355-*.o")
2324
if err != nil {
2425
fmt.Println(err)
2526
os.Exit(1)

Diff for: ‎test/linkmain_run.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ package main
1111

1212
import (
1313
"fmt"
14+
"io/ioutil"
1415
"os"
1516
"os/exec"
1617
"path/filepath"
@@ -51,7 +52,7 @@ func runFail(cmdline ...string) {
5152

5253
func main() {
5354
var err error
54-
tmpDir, err = os.MkdirTemp("", "")
55+
tmpDir, err = ioutil.TempDir("", "")
5556
if err != nil {
5657
fmt.Println(err)
5758
os.Exit(1)

Diff for: ‎test/linkobj.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ package main
1111

1212
import (
1313
"fmt"
14+
"io/ioutil"
1415
"log"
1516
"os"
1617
"os/exec"
@@ -20,7 +21,7 @@ import (
2021
var pwd, tmpdir string
2122

2223
func main() {
23-
dir, err := os.MkdirTemp("", "go-test-linkobj-")
24+
dir, err := ioutil.TempDir("", "go-test-linkobj-")
2425
if err != nil {
2526
log.Fatal(err)
2627
}
@@ -121,18 +122,18 @@ func runFail(args ...string) string {
121122
}
122123

123124
func cp(src, dst string) {
124-
data, err := os.ReadFile(src)
125+
data, err := ioutil.ReadFile(src)
125126
if err != nil {
126127
fatalf("%v", err)
127128
}
128-
err = os.WriteFile(dst, data, 0666)
129+
err = ioutil.WriteFile(dst, data, 0666)
129130
if err != nil {
130131
fatalf("%v", err)
131132
}
132133
}
133134

134135
func writeFile(name, data string) {
135-
err := os.WriteFile(name, []byte(data), 0666)
136+
err := ioutil.WriteFile(name, []byte(data), 0666)
136137
if err != nil {
137138
fatalf("%v", err)
138139
}

0 commit comments

Comments
 (0)