diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2019-10-22 15:41:03 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-10-22 15:41:03 +0200 |
| commit | 084e388155d4ea60d54e44b90cd10eef660a5b76 (patch) | |
| tree | 5a072ff66df7d401257da468a8529b172ab9b285 /tools/syz-testbuild/testbuild.go | |
| parent | a2bdbd8c37841cc507a2ad59f25d90d6467e5858 (diff) | |
pkg/vcs: make EnvForCommit return full compiler path
All callers of EnvForCommit need the compiler path,
so move this logic into EnvForCommit to avoid duplication.
Also simplifies tests because test impl can now return
an empty compiler (which should be unused).
Diffstat (limited to 'tools/syz-testbuild/testbuild.go')
| -rw-r--r-- | tools/syz-testbuild/testbuild.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/syz-testbuild/testbuild.go b/tools/syz-testbuild/testbuild.go index 120a465c3..7a82ce468 100644 --- a/tools/syz-testbuild/testbuild.go +++ b/tools/syz-testbuild/testbuild.go @@ -28,7 +28,6 @@ import ( "io/ioutil" "log" "os" - "path/filepath" "runtime" "github.com/google/syzkaller/pkg/build" @@ -121,16 +120,15 @@ func main() { } func test(repo vcs.Repo, bisecter vcs.Bisecter, kernelConfig []byte, env instance.BuilderTester, com *vcs.Commit) { - bisectEnv, err := bisecter.EnvForCommit(com.Hash, kernelConfig) + bisectEnv, err := bisecter.EnvForCommit(*flagBisectBin, com.Hash, kernelConfig) if err != nil { fail(err) } log.Printf("testing: %v %v using %v", com.Hash, com.Title, bisectEnv.Compiler) - compiler := filepath.Join(*flagBisectBin, bisectEnv.Compiler, "bin", "gcc") if err := build.Clean(*flagOS, *flagArch, vmType, *flagKernelSrc); err != nil { fail(err) } - _, err = env.BuildKernel(compiler, *flagUserspace, *flagKernelCmdline, *flagKernelSysctl, bisectEnv.KernelConfig) + _, err = env.BuildKernel(bisectEnv.Compiler, *flagUserspace, *flagKernelCmdline, *flagKernelSysctl, bisectEnv.KernelConfig) if err != nil { if verr, ok := err.(*osutil.VerboseError); ok { log.Printf("BUILD BROKEN: %v", verr.Title) |