Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pkg/test: append .exe to bin name on Windows 

Change-Id: I3de5f33768dffafd79cbe973e3e0435b0614bd9e
This commit is contained in:
mpl 2018-05-17 21:07:57 +02:00
parent 7815d546e4
commit 079024338d
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/test/world.go
View File

@ -29,6 +29,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"runtime"
"strings" "strings"
"sync/atomic" "sync/atomic"
"testing" "testing"
@ -172,7 +173,7 @@ func (w *World) Help() ([]byte, error) {
if err := w.Build(); err != nil { if err := w.Build(); err != nil {
return nil, err return nil, err
} }
pkdbin := filepath.Join(w.gobin, "perkeepd") pkdbin := w.lookPathGobin("perkeepd")
// Run perkeepd -help. // Run perkeepd -help.
cmd := exec.Command(pkdbin, "-help") cmd := exec.Command(pkdbin, "-help")
return cmd.CombinedOutput() return cmd.CombinedOutput()
@ -185,7 +186,7 @@ func (w *World) Start() error {
} }
// Start perkeepd. // Start perkeepd.
{ {
pkdbin := filepath.Join(w.gobin, "perkeepd") pkdbin := w.lookPathGobin("perkeepd")
w.server = exec.Command( w.server = exec.Command(
pkdbin, pkdbin,
"--openbrowser=false", "--openbrowser=false",
@ -332,7 +333,7 @@ func (w *World) CmdWithEnv(binary string, env []string, args ...string) *exec.Cm
// but pk is never used. (and pk-mount does not even have a -verbose). // but pk is never used. (and pk-mount does not even have a -verbose).
args = append([]string{"-verbose"}, args...) args = append([]string{"-verbose"}, args...)
} }
binary := filepath.Join(w.gobin, binary) binary := w.lookPathGobin(binary)
cmd = exec.Command(binary, args...) cmd = exec.Command(binary, args...)
clientConfigDir := filepath.Join(w.srcRoot, "config", "dev-client-dir") clientConfigDir := filepath.Join(w.srcRoot, "config", "dev-client-dir")
@ -427,5 +428,12 @@ func (w *World) SearchHandlerPath() string { return "/my-search/" }
// ServerBinary returns the location of the perkeepd binary running for this World. // ServerBinary returns the location of the perkeepd binary running for this World.
func (w *World) ServerBinary() string { func (w *World) ServerBinary() string {
return filepath.Join(w.gobin, "perkeepd") return w.lookPathGobin("perkeepd")
}
func (w *World) lookPathGobin(binName string) string {
if runtime.GOOS == "windows" && !strings.HasSuffix(binName, ".exe") {
return filepath.Join(w.gobin, binName+".exe")
}
return filepath.Join(w.gobin, binName)
} }