From 084e388155d4ea60d54e44b90cd10eef660a5b76 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
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/vcs/linux.go  | 4 ++--
 pkg/vcs/testos.go | 7 +++----
 pkg/vcs/vcs.go    | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'pkg/vcs')

diff --git a/pkg/vcs/linux.go b/pkg/vcs/linux.go
index aaca97fe7..b14b75280 100644
--- a/pkg/vcs/linux.go
+++ b/pkg/vcs/linux.go
@@ -88,7 +88,7 @@ func gitReleaseTagToInt(tag string) uint64 {
 	return v1*1e6 + v2*1e3 + v3
 }
 
-func (ctx *linux) EnvForCommit(commit string, kernelConfig []byte) (*BisectEnv, error) {
+func (ctx *linux) EnvForCommit(binDir, commit string, kernelConfig []byte) (*BisectEnv, error) {
 	tagList, err := ctx.previousReleaseTags(commit, true)
 	if err != nil {
 		return nil, err
@@ -98,7 +98,7 @@ func (ctx *linux) EnvForCommit(commit string, kernelConfig []byte) (*BisectEnv,
 		tags[tag] = true
 	}
 	env := &BisectEnv{
-		Compiler:     "gcc-" + linuxCompilerVersion(tags),
+		Compiler:     filepath.Join(binDir, "gcc-"+linuxCompilerVersion(tags), "bin", "gcc"),
 		KernelConfig: linuxDisableConfigs(kernelConfig, tags),
 	}
 	// v4.0 doesn't boot with our config nor with defconfig, it halts on an interrupt in x86_64_start_kernel.
diff --git a/pkg/vcs/testos.go b/pkg/vcs/testos.go
index f30dd0799..611937da7 100644
--- a/pkg/vcs/testos.go
+++ b/pkg/vcs/testos.go
@@ -16,8 +16,7 @@ func newTestos(dir string) *testos {
 func (ctx *testos) PreviousReleaseTags(commit string) ([]string, error) {
 	return ctx.git.previousReleaseTags(commit, false)
 }
-func (ctx *testos) EnvForCommit(commit string, kernelConfig []byte) (*BisectEnv, error) {
-	return &BisectEnv{
-		Compiler: "test-compiler-dont-use",
-	}, nil
+
+func (ctx *testos) EnvForCommit(binDir, commit string, kernelConfig []byte) (*BisectEnv, error) {
+	return &BisectEnv{}, nil
 }
diff --git a/pkg/vcs/vcs.go b/pkg/vcs/vcs.go
index 28264522f..12130d594 100644
--- a/pkg/vcs/vcs.go
+++ b/pkg/vcs/vcs.go
@@ -64,7 +64,7 @@ type Bisecter interface {
 	// PreviousReleaseTags returns list of preceding release tags that are reachable from the given commit.
 	PreviousReleaseTags(commit string) ([]string, error)
 
-	EnvForCommit(commit string, kernelConfig []byte) (*BisectEnv, error)
+	EnvForCommit(binDir, commit string, kernelConfig []byte) (*BisectEnv, error)
 }
 
 type Commit struct {
-- 
cgit mrf-deployment