From 6d5bd5b5eb9c988197c96ebfa3d17ecf5aea6311 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 17 Jul 2018 17:50:45 +0200 Subject: syz-ci: fix arch passed to build.Clean --- pkg/bisect/bisect.go | 4 ++-- syz-ci/jobs.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/bisect/bisect.go b/pkg/bisect/bisect.go index 3e136276e..bd9501084 100644 --- a/pkg/bisect/bisect.go +++ b/pkg/bisect/bisect.go @@ -107,7 +107,7 @@ func (env *env) bisect() (*vcs.Commit, error) { if env.head, err = env.repo.Poll(cfg.Kernel.Repo, cfg.Kernel.Branch); err != nil { return nil, err } - if err := build.Clean(cfg.Manager.TargetOS, cfg.Manager.TargetArch, + if err := build.Clean(cfg.Manager.TargetOS, cfg.Manager.TargetVMArch, cfg.Manager.Type, cfg.Manager.KernelSrc); err != nil { return nil, fmt.Errorf("kernel clean failed: %v", err) } @@ -227,7 +227,7 @@ func (env *env) test() (vcs.BisectResult, error) { } env.log("testing commit %v with %v", current.Hash, compilerID) buildStart := time.Now() - if err := build.Clean(cfg.Manager.TargetOS, cfg.Manager.TargetArch, + if err := build.Clean(cfg.Manager.TargetOS, cfg.Manager.TargetVMArch, cfg.Manager.Type, cfg.Manager.KernelSrc); err != nil { return 0, fmt.Errorf("kernel clean failed: %v", err) } diff --git a/syz-ci/jobs.go b/syz-ci/jobs.go index 5f944ad57..edb47ac62 100644 --- a/syz-ci/jobs.go +++ b/syz-ci/jobs.go @@ -207,7 +207,7 @@ func (jp *JobProcessor) test(job *Job) error { resp.Build.KernelCommitTitle = kernelCommit.Title resp.Build.KernelCommitDate = kernelCommit.Date - if err := build.Clean(mgrcfg.TargetOS, mgrcfg.TargetArch, mgrcfg.Type, kernelDir); err != nil { + if err := build.Clean(mgrcfg.TargetOS, mgrcfg.TargetVMArch, mgrcfg.Type, kernelDir); err != nil { return fmt.Errorf("kernel clean failed: %v", err) } if len(req.Patch) != 0 { -- cgit mrf-deployment