From 084e388155d4ea60d54e44b90cd10eef660a5b76 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 22 Oct 2019 15:41:03 +0200 Subject: 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). --- pkg/bisect/bisect.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkg/bisect/bisect.go') diff --git a/pkg/bisect/bisect.go b/pkg/bisect/bisect.go index 904be4b53..afe770965 100644 --- a/pkg/bisect/bisect.go +++ b/pkg/bisect/bisect.go @@ -259,12 +259,11 @@ func (env *env) test() (vcs.BisectResult, *vcs.Commit, *report.Report, error) { if err != nil { return 0, nil, nil, err } - bisectEnv, err := env.bisecter.EnvForCommit(current.Hash, cfg.Kernel.Config) + bisectEnv, err := env.bisecter.EnvForCommit(cfg.BinDir, current.Hash, cfg.Kernel.Config) if err != nil { return 0, nil, nil, err } - compiler := filepath.Join(cfg.BinDir, bisectEnv.Compiler, "bin", "gcc") - compilerID, err := build.CompilerIdentity(compiler) + compilerID, err := build.CompilerIdentity(bisectEnv.Compiler) if err != nil { return 0, nil, nil, err } @@ -274,7 +273,7 @@ func (env *env) test() (vcs.BisectResult, *vcs.Commit, *report.Report, error) { cfg.Manager.Type, cfg.Manager.KernelSrc); err != nil { return 0, nil, nil, fmt.Errorf("kernel clean failed: %v", err) } - _, err = env.inst.BuildKernel(compiler, cfg.Kernel.Userspace, + _, err = env.inst.BuildKernel(bisectEnv.Compiler, cfg.Kernel.Userspace, cfg.Kernel.Cmdline, cfg.Kernel.Sysctl, bisectEnv.KernelConfig) env.buildTime += time.Since(buildStart) if err != nil { -- cgit mrf-deployment