@@ -966,7 +966,7 @@ func (st *buildStatus) distTestList() (names []string, remoteErr, err error) {
966
966
args = append (args , "--compile-only" )
967
967
}
968
968
var buf bytes.Buffer
969
- remoteErr , err = st .bc .Exec (st .ctx , "go/bin/go" , buildlet.ExecOpts {
969
+ remoteErr , err = st .bc .Exec (st .ctx , "./ go/bin/go" , buildlet.ExecOpts {
970
970
Output : & buf ,
971
971
ExtraEnv : append (st .conf .Env (), "GOROOT=" + goroot ),
972
972
OnStartExec : func () { st .LogEventTime ("discovering_tests" ) },
@@ -1138,7 +1138,7 @@ func (st *buildStatus) runSubrepoTests() (remoteErr, err error) {
1138
1138
1139
1139
var remoteErrors []error
1140
1140
for _ , tr := range testRuns {
1141
- rErr , err := st .bc .Exec (st .ctx , "go/bin/go" , buildlet.ExecOpts {
1141
+ rErr , err := st .bc .Exec (st .ctx , "./ go/bin/go" , buildlet.ExecOpts {
1142
1142
Debug : true , // make buildlet print extra debug in output for failures
1143
1143
Output : st ,
1144
1144
Dir : tr .Dir ,
@@ -1329,7 +1329,7 @@ func (st *buildStatus) runBenchmarkTests() (remoteErr, err error) {
1329
1329
"GOPROXY=" + moduleProxy (), // GKE value but will be ignored/overwritten by reverse buildlets
1330
1330
)
1331
1331
env = append (env , st .conf .ModulesEnv (st .SubName )... )
1332
- rErr , err := st .bc .Exec (st .ctx , "go/bin/go" , buildlet.ExecOpts {
1332
+ rErr , err := st .bc .Exec (st .ctx , "./ go/bin/go" , buildlet.ExecOpts {
1333
1333
Debug : true , // make buildlet print extra debug in output for failures
1334
1334
Output : st ,
1335
1335
Dir : "gopath/src/" + repoPath ,
@@ -1676,7 +1676,7 @@ func (st *buildStatus) runTestsOnBuildlet(bc buildlet.Client, tis []*testItem, g
1676
1676
)
1677
1677
env = append (env , st .conf .ModulesEnv ("go" )... )
1678
1678
1679
- remoteErr , err := bc .Exec (ctx , "go/bin/go" , buildlet.ExecOpts {
1679
+ remoteErr , err := bc .Exec (ctx , "./ go/bin/go" , buildlet.ExecOpts {
1680
1680
// We set Dir to "." instead of the default ("go/bin") so when the dist tests
1681
1681
// try to run os/exec.Command("go", "test", ...), the LookPath of "go" doesn't
1682
1682
// return "./go.exe" (which exists in the current directory: "go/bin") and then
0 commit comments