PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dlv_test: fix test on macOS for new Makefile

Browse Source
This commit is contained in:
aarzilli 2017-03-27 13:14:20 +02:00 committed by Derek Parker
parent 905d3d9962
commit 329bc7e69d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/dlv/dlv_test.go
View File

@ -49,18 +49,22 @@ func goEnv(name string) string {
func TestBuild(t *testing.T) { func TestBuild(t *testing.T) {
const listenAddr = "localhost:40573" const listenAddr = "localhost:40573"
makefilepath := filepath.Join(goEnv("GOPATH"), "src", "github.com", "derekparker", "delve", "Makefile")
t.Logf("makefile: %q", makefilepath)
var err error var err error
for _, make := range []string{"make", "mingw32-make"} { makedir := filepath.Join(goEnv("GOPATH"), "src", "github.com", "derekparker", "delve")
err = exec.Command(make, "-f", makefilepath, "build").Run() for _, makeProgram := range []string{"make", "mingw32-make"} {
var out []byte
cmd := exec.Command(makeProgram, "build")
cmd.Dir = makedir
out, err = cmd.CombinedOutput()
if err == nil { if err == nil {
break break
} else {
t.Logf("makefile error %s (%s): %v", makeProgram, makedir, err)
t.Logf("output %s", string(out))
} }
} }
assertNoError(err, t, "make") assertNoError(err, t, "make")
wd, _ := os.Getwd() dlvbin := filepath.Join(makedir, "dlv")
dlvbin := filepath.Join(wd, "dlv")
defer os.Remove(dlvbin) defer os.Remove(dlvbin)
fixtures := protest.FindFixturesDir() fixtures := protest.FindFixturesDir()