From 48bc529a18de54dddab161d995fc3abd85a670a8 Mon Sep 17 00:00:00 2001 From: Space Meyer Date: Mon, 9 Jan 2023 13:51:24 +0100 Subject: pkg/instance: move BuildKernel() args to struct --- pkg/bisect/bisect.go | 11 +++++++++-- pkg/bisect/bisect_test.go | 7 +++---- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'pkg/bisect') diff --git a/pkg/bisect/bisect.go b/pkg/bisect/bisect.go index ed961f537..28e8c56d0 100644 --- a/pkg/bisect/bisect.go +++ b/pkg/bisect/bisect.go @@ -479,8 +479,15 @@ func (env *env) build() (*vcs.Commit, string, error) { return current, "", fmt.Errorf("kernel clean failed: %v", err) } kern := &env.cfg.Kernel - _, imageDetails, err := env.inst.BuildKernel(bisectEnv.Compiler, env.cfg.Linker, env.cfg.Ccache, kern.Userspace, - kern.Cmdline, kern.Sysctl, bisectEnv.KernelConfig) + _, imageDetails, err := env.inst.BuildKernel(&instance.BuildKernelConfig{ + CompilerBin: bisectEnv.Compiler, + LinkerBin: env.cfg.Linker, + CcacheBin: env.cfg.Ccache, + UserspaceDir: kern.Userspace, + CmdlineFile: kern.Cmdline, + SysctlFile: kern.Sysctl, + KernelConfig: bisectEnv.KernelConfig, + }) if imageDetails.CompilerID != "" { env.log("compiler: %v", imageDetails.CompilerID) } diff --git a/pkg/bisect/bisect_test.go b/pkg/bisect/bisect_test.go index 79bb70400..2d613759b 100644 --- a/pkg/bisect/bisect_test.go +++ b/pkg/bisect/bisect_test.go @@ -32,16 +32,15 @@ func (env *testEnv) BuildSyzkaller(repo, commit string) (string, error) { return "", nil } -func (env *testEnv) BuildKernel(compilerBin, linker, cCache, userspaceDir, cmdlineFile, sysctlFile string, - kernelConfig []byte) (string, build.ImageDetails, error) { +func (env *testEnv) BuildKernel(buildCfg *instance.BuildKernelConfig) (string, build.ImageDetails, error) { commit := env.headCommit() - configHash := hash.String(kernelConfig) + configHash := hash.String(buildCfg.KernelConfig) details := build.ImageDetails{} details.Signature = fmt.Sprintf("%v-%v", commit, configHash) if commit >= env.test.sameBinaryStart && commit <= env.test.sameBinaryEnd { details.Signature = "same-sign-" + configHash } - env.config = string(kernelConfig) + env.config = string(buildCfg.KernelConfig) if env.config == "baseline-fails" { return "", details, fmt.Errorf("failure") } -- cgit mrf-deployment