diff options
| author | Florent Revest <revest@chromium.org> | 2024-10-02 16:02:12 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2024-10-14 19:43:42 +0000 |
| commit | 484e362fcff09b8b74162eefd0c3bfd67e829d94 (patch) | |
| tree | 7db4c1f87a6c37073084a6b806978495297f6d25 /tools | |
| parent | 2e5c6a5c1c62461b69c6f50a123885b9910fce04 (diff) | |
pkg/build: use the build environment in clean() calls
This unifies the build() and clean() interfaces such that if a custom
compiler or make binary is provided in the manager or bisection config,
they can be taken into account by the clean() interface.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syz-testbuild/testbuild.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/syz-testbuild/testbuild.go b/tools/syz-testbuild/testbuild.go index b7d4af6fc..919ee0c67 100644 --- a/tools/syz-testbuild/testbuild.go +++ b/tools/syz-testbuild/testbuild.go @@ -30,7 +30,6 @@ import ( "os" "runtime" - "github.com/google/syzkaller/pkg/build" "github.com/google/syzkaller/pkg/instance" "github.com/google/syzkaller/pkg/mgrconfig" "github.com/google/syzkaller/pkg/osutil" @@ -131,10 +130,7 @@ func test(repo vcs.Repo, bisecter vcs.Bisecter, kernelConfig []byte, env instanc tool.Fail(err) } log.Printf("testing: %v %v using %v", com.Hash, com.Title, bisectEnv.Compiler) - if err := build.Clean(*flagOS, *flagArch, vmType, *flagKernelSrc); err != nil { - tool.Fail(err) - } - _, _, err = env.BuildKernel(&instance.BuildKernelConfig{ + buildCfg := &instance.BuildKernelConfig{ CompilerBin: bisectEnv.Compiler, LinkerBin: linker, CcacheBin: ccache, @@ -142,7 +138,11 @@ func test(repo vcs.Repo, bisecter vcs.Bisecter, kernelConfig []byte, env instanc CmdlineFile: *flagKernelCmdline, SysctlFile: *flagKernelSysctl, KernelConfig: bisectEnv.KernelConfig, - }) + } + if err := env.CleanKernel(buildCfg); err != nil { + tool.Fail(err) + } + _, _, err = env.BuildKernel(buildCfg) if err != nil { var verr *osutil.VerboseError if errors.As(err, &verr) { |