summaryrefslogtreecommitdiffstats
path: root/tpl/internal/go_templates/testenv/testenv.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2021-01-29 17:15:42 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2021-02-18 14:11:48 +0100
commitccb822eb5afad210432eb46ec3727e3536a87f58 (patch)
treeaf8976d5b89af36385f0e0ff590239b00dcb5afd /tpl/internal/go_templates/testenv/testenv.go
parent21e9eb18acc2a2f8d8b97f096615b836e65091a2 (diff)
Pull in latest Go template source
Diffstat (limited to 'tpl/internal/go_templates/testenv/testenv.go')
-rw-r--r--tpl/internal/go_templates/testenv/testenv.go8
1 files changed, 3 insertions, 5 deletions
diff --git a/tpl/internal/go_templates/testenv/testenv.go b/tpl/internal/go_templates/testenv/testenv.go
index 5bd91591a..e0a0b4ec6 100644
--- a/tpl/internal/go_templates/testenv/testenv.go
+++ b/tpl/internal/go_templates/testenv/testenv.go
@@ -13,6 +13,7 @@ package testenv
import (
"errors"
"flag"
+ "github.com/gohugoio/hugo/tpl/internal/go_templates/cfg"
"os"
"os/exec"
"path/filepath"
@@ -21,9 +22,6 @@ import (
"strings"
"sync"
"testing"
-
- "github.com/cli/safeexec"
- "github.com/gohugoio/hugo/tpl/internal/go_templates/cfg"
)
// Builder reports the name of the builder running this test
@@ -109,7 +107,7 @@ func GoTool() (string, error) {
if _, err := os.Stat(path); err == nil {
return path, nil
}
- goBin, err := safeexec.LookPath("go" + exeSuffix)
+ goBin, err := exec.LookPath("go" + exeSuffix)
if err != nil {
return "", errors.New("cannot find go tool: " + err.Error())
}
@@ -154,7 +152,7 @@ func MustHaveExecPath(t testing.TB, path string) {
err, found := execPaths.Load(path)
if !found {
- _, err = safeexec.LookPath(path)
+ _, err = exec.LookPath(path)
err, _ = execPaths.LoadOrStore(path, err)
}
if err != nil {