From 329bc7e69dcc11081d87ca72f37cb9db411dc7ca Mon Sep 17 00:00:00 2001
From: aarzilli <alessandro.arzilli@gmail.com>
Date: Mon, 27 Mar 2017 13:14:20 +0200
Subject: [PATCH] dlv_test: fix test on macOS for new Makefile

---
 cmd/dlv/dlv_test.go | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/cmd/dlv/dlv_test.go b/cmd/dlv/dlv_test.go
index 963179e5..9c7bcbec 100644
--- a/cmd/dlv/dlv_test.go
+++ b/cmd/dlv/dlv_test.go
@@ -49,18 +49,22 @@ func goEnv(name string) string {
 
 func TestBuild(t *testing.T) {
 	const listenAddr = "localhost:40573"
-	makefilepath := filepath.Join(goEnv("GOPATH"), "src", "github.com", "derekparker", "delve", "Makefile")
-	t.Logf("makefile: %q", makefilepath)
 	var err error
-	for _, make := range []string{"make", "mingw32-make"} {
-		err = exec.Command(make, "-f", makefilepath, "build").Run()
+	makedir := filepath.Join(goEnv("GOPATH"), "src", "github.com", "derekparker", "delve")
+	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 {
 			break
+		} else {
+			t.Logf("makefile error %s (%s): %v", makeProgram, makedir, err)
+			t.Logf("output %s", string(out))
 		}
 	}
 	assertNoError(err, t, "make")
-	wd, _ := os.Getwd()
-	dlvbin := filepath.Join(wd, "dlv")
+	dlvbin := filepath.Join(makedir, "dlv")
 	defer os.Remove(dlvbin)
 
 	fixtures := protest.FindFixturesDir()