syz-ci: fix arch passed to build.Clean

google · Jul 17, 2018 · 6d5bd5b · 6d5bd5b
1 parent 570df9b
commit 6d5bd5b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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 {