aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pkg/bisect/bisect_test.go21
-rw-r--r--pkg/compiler/const_file_test.go6
-rw-r--r--pkg/cover/report_test.go7
-rw-r--r--pkg/host/machine_info_linux_test.go8
-rw-r--r--pkg/osutil/fileutil_test.go8
-rw-r--r--pkg/osutil/osutil_test.go7
-rw-r--r--pkg/vcs/git_repo_test.go19
-rw-r--r--syz-hub/state/state_test.go15
-rw-r--r--syz-verifier/utils_test.go11
-rw-r--r--vm/vm_test.go8
10 files changed, 15 insertions, 95 deletions
diff --git a/pkg/bisect/bisect_test.go b/pkg/bisect/bisect_test.go
index 7a05afb36..eebe48e37 100644
--- a/pkg/bisect/bisect_test.go
+++ b/pkg/bisect/bisect_test.go
@@ -5,8 +5,6 @@ package bisect
import (
"fmt"
- "io/ioutil"
- "os"
"strconv"
"testing"
@@ -84,10 +82,7 @@ func (env *testEnv) headCommit() int {
}
func createTestRepo(t *testing.T) string {
- baseDir, err := ioutil.TempDir("", "syz-bisect-test")
- if err != nil {
- t.Fatal(err)
- }
+ baseDir := t.TempDir()
repo := vcs.CreateTestRepo(t, baseDir, "")
if !repo.SupportsBisection() {
t.Skip("bisection is unsupported by git (probably too old version)")
@@ -432,17 +427,17 @@ func TestBisectionResults(t *testing.T) {
// Creating new repos takes majority of the test time,
// so we reuse them across tests.
repoCache := make(chan string, len(bisectionTests))
- t.Run("group", func(t *testing.T) {
+ t.Run("group", func(tt *testing.T) {
for _, test := range bisectionTests {
test := test
- t.Run(test.name, func(t *testing.T) {
+ tt.Run(test.name, func(t *testing.T) {
t.Parallel()
checkTest(t, test)
repoDir := ""
select {
case repoDir = <-repoCache:
default:
- repoDir = createTestRepo(t)
+ repoDir = createTestRepo(tt)
}
defer func() {
repoCache <- repoDir
@@ -485,14 +480,6 @@ func TestBisectionResults(t *testing.T) {
})
}
})
- for {
- select {
- case dir := <-repoCache:
- os.RemoveAll(dir)
- default:
- return
- }
- }
}
func checkTest(t *testing.T, test BisectionTest) {
diff --git a/pkg/compiler/const_file_test.go b/pkg/compiler/const_file_test.go
index 51858a790..b38d0795d 100644
--- a/pkg/compiler/const_file_test.go
+++ b/pkg/compiler/const_file_test.go
@@ -109,11 +109,7 @@ CONST5_SOME_UNDEFINED2 = 100, arch3:???
}
}
{
- dir, err := ioutil.TempDir("", "syz-const")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(dir)
+ dir := t.TempDir()
for name, arch := range arches {
file := filepath.Join(dir, "consts_"+name+".const")
if err := ioutil.WriteFile(file, []byte(arch.oldFormat), 0600); err != nil {
diff --git a/pkg/cover/report_test.go b/pkg/cover/report_test.go
index 298086530..a08fe9d1c 100644
--- a/pkg/cover/report_test.go
+++ b/pkg/cover/report_test.go
@@ -11,7 +11,6 @@ package cover
import (
"bytes"
"encoding/csv"
- "io/ioutil"
"os"
"path/filepath"
"reflect"
@@ -249,11 +248,7 @@ func buildTestBinary(t *testing.T, target *targets.Target, test Test, dir string
}
func generateReport(t *testing.T, target *targets.Target, test Test) ([]byte, []byte, error) {
- dir, err := ioutil.TempDir("", "syz-cover-test")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(dir)
+ dir := t.TempDir()
bin := buildTestBinary(t, target, test, dir)
subsystem := []mgrconfig.Subsystem{
{
diff --git a/pkg/host/machine_info_linux_test.go b/pkg/host/machine_info_linux_test.go
index fdb3f3011..755b792f7 100644
--- a/pkg/host/machine_info_linux_test.go
+++ b/pkg/host/machine_info_linux_test.go
@@ -7,8 +7,6 @@ import (
"bufio"
"bytes"
"fmt"
- "io/ioutil"
- "os"
"path/filepath"
"runtime"
"strings"
@@ -385,11 +383,7 @@ power management:
}
func TestGetGlobsInfo(t *testing.T) {
- dir, err := ioutil.TempDir("", "syz-host-globstest")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(dir)
+ dir := t.TempDir()
if err := osutil.MkdirAll(filepath.Join(dir, "a", "b", "c", "d")); err != nil {
t.Fatal(err)
}
diff --git a/pkg/osutil/fileutil_test.go b/pkg/osutil/fileutil_test.go
index 62e07bc8f..20d02ea22 100644
--- a/pkg/osutil/fileutil_test.go
+++ b/pkg/osutil/fileutil_test.go
@@ -5,8 +5,6 @@ package osutil
import (
"fmt"
- "io/ioutil"
- "os"
"path/filepath"
"strconv"
"sync"
@@ -16,11 +14,7 @@ import (
func TestProcessTempDir(t *testing.T) {
for try := 0; try < 10; try++ {
func() {
- tmp, err := ioutil.TempDir("", "syz")
- if err != nil {
- t.Fatalf("failed to create a temp dir: %v", err)
- }
- defer os.RemoveAll(tmp)
+ tmp := t.TempDir()
const P = 16
// Pre-create half of the instances with stale pid.
var dirs []string
diff --git a/pkg/osutil/osutil_test.go b/pkg/osutil/osutil_test.go
index 168e7ba36..713a62c14 100644
--- a/pkg/osutil/osutil_test.go
+++ b/pkg/osutil/osutil_test.go
@@ -5,7 +5,6 @@ package osutil
import (
"fmt"
- "io/ioutil"
"os"
"path/filepath"
"strings"
@@ -81,11 +80,7 @@ func TestCopyFiles(t *testing.T) {
t.Run(fnName, func(t *testing.T) {
for i, test := range tests {
t.Run(fmt.Sprint(i), func(t *testing.T) {
- dir, err := ioutil.TempDir("", "syz-osutil-test")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(dir)
+ dir := t.TempDir()
src := filepath.Join(dir, "src")
dst := filepath.Join(dir, "dst")
for _, file := range test.files {
diff --git a/pkg/vcs/git_repo_test.go b/pkg/vcs/git_repo_test.go
index 41564fda6..adf222629 100644
--- a/pkg/vcs/git_repo_test.go
+++ b/pkg/vcs/git_repo_test.go
@@ -5,7 +5,6 @@ package vcs
import (
"fmt"
- "io/ioutil"
"os"
"path/filepath"
"sort"
@@ -22,11 +21,7 @@ func init() {
func TestGitRepo(t *testing.T) {
t.Parallel()
- baseDir, err := ioutil.TempDir("", "syz-git-test")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(baseDir)
+ baseDir := t.TempDir()
repo1 := CreateTestRepo(t, baseDir, "repo1")
repo2 := CreateTestRepo(t, baseDir, "repo2")
repo := newGit(filepath.Join(baseDir, "repo"), nil, nil)
@@ -140,11 +135,7 @@ func TestGitRepo(t *testing.T) {
func TestMetadata(t *testing.T) {
t.Parallel()
- repoDir, err := ioutil.TempDir("", "syz-git-test")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(repoDir)
+ repoDir := t.TempDir()
repo := MakeTestRepo(t, repoDir)
prevHash := ""
for i, test := range metadataTests {
@@ -329,11 +320,7 @@ Comment out an assertion that's now bogus and add a comment.
func TestBisect(t *testing.T) {
t.Parallel()
- repoDir, err := ioutil.TempDir("", "syz-git-test")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(repoDir)
+ repoDir := t.TempDir()
repo := MakeTestRepo(t, repoDir)
var commits []string
for i := 0; i < 5; i++ {
diff --git a/syz-hub/state/state_test.go b/syz-hub/state/state_test.go
index 8db7a30f6..ad90d6aaf 100644
--- a/syz-hub/state/state_test.go
+++ b/syz-hub/state/state_test.go
@@ -4,8 +4,6 @@
package state
import (
- "io/ioutil"
- "os"
"sort"
"testing"
@@ -21,22 +19,14 @@ type TestState struct {
func MakeTestState(t *testing.T) *TestState {
t.Parallel()
- dir, err := ioutil.TempDir("", "syz-hub-state-test")
- if err != nil {
- t.Fatalf("failed to create temp dir: %v", err)
- }
+ dir := t.TempDir()
state, err := Make(dir)
if err != nil {
- os.RemoveAll(dir)
t.Fatalf("failed to make state: %v", err)
}
return &TestState{t, dir, state}
}
-func (ts *TestState) Close() {
- os.RemoveAll(ts.dir)
-}
-
func (ts *TestState) Reload() {
ts.state.Flush()
state, err := Make(ts.dir)
@@ -86,7 +76,6 @@ func (ts *TestState) PendingRepro(name string) []byte {
func TestBasic(t *testing.T) {
st := MakeTestState(t)
- defer st.Close()
if _, _, _, err := st.state.Sync("foo", nil, nil); err == nil {
t.Fatalf("synced with unconnected manager")
@@ -98,7 +87,6 @@ func TestBasic(t *testing.T) {
func TestRepro(t *testing.T) {
st := MakeTestState(t)
- defer st.Close()
st.Connect("foo", "", false, []string{"open", "read", "write"}, nil)
st.Connect("bar", "", false, []string{"open", "read", "close"}, nil)
@@ -137,7 +125,6 @@ func TestRepro(t *testing.T) {
func TestDomain(t *testing.T) {
st := MakeTestState(t)
- defer st.Close()
st.Connect("client0", "", false, []string{"open"}, nil)
st.Connect("client1", "domain1", false, []string{"open"}, nil)
diff --git a/syz-verifier/utils_test.go b/syz-verifier/utils_test.go
index ffd255894..04888ec5e 100644
--- a/syz-verifier/utils_test.go
+++ b/syz-verifier/utils_test.go
@@ -4,8 +4,6 @@
package main
import (
- "io/ioutil"
- "os"
"testing"
"github.com/google/syzkaller/pkg/ipc"
@@ -46,14 +44,7 @@ func getTestProgram(t *testing.T) *prog.Prog {
}
func makeTestResultDirectory(t *testing.T) string {
- dir, err := ioutil.TempDir("", "syz-verifier")
- if err != nil {
- t.Fatalf("failed to create results directory: %v", err)
- }
- t.Cleanup(func() {
- os.RemoveAll(dir)
- })
- return osutil.Abs(dir)
+ return osutil.Abs(t.TempDir())
}
func makeExecResult(pool int, errnos []int, flags ...int) *ExecResult {
diff --git a/vm/vm_test.go b/vm/vm_test.go
index ec87aeee3..83c3f51eb 100644
--- a/vm/vm_test.go
+++ b/vm/vm_test.go
@@ -6,8 +6,6 @@ package vm
import (
"bytes"
"fmt"
- "io/ioutil"
- "os"
"testing"
"time"
@@ -333,11 +331,7 @@ func TestMonitorExecution(t *testing.T) {
}
func testMonitorExecution(t *testing.T, test *Test) {
- dir, err := ioutil.TempDir("", "syz-vm-test")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(dir)
+ dir := t.TempDir()
cfg := &mgrconfig.Config{
Derived: mgrconfig.Derived{
TargetOS: targets.Linux,
generated by ggit (джигит) mrf-deployment (git 2.46.0) at 2026-03-11 20:07:48 +0000