From 081a1851dd50fe9d813bc188238fe7fb7875157e Mon Sep 17 00:00:00 2001
From: dlorenc <dlorenc@google.com>
Date: Wed, 4 May 2016 14:31:32 -0700
Subject: [PATCH] Update .gitignore and integration test for new build
 locations.

---
 .gitignore                            |  1 +
 integration/start_stop_delete_test.go | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index db31ab7e32..074442779d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ _testmain.go
 *.prof
 
 /out
+/.gopath
diff --git a/integration/start_stop_delete_test.go b/integration/start_stop_delete_test.go
index 6dbc01395d..dcb398156e 100644
--- a/integration/start_stop_delete_test.go
+++ b/integration/start_stop_delete_test.go
@@ -20,13 +20,14 @@ package integration
 
 import (
 	"flag"
+	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 	"testing"
 )
 
-var binaryPath = flag.String("binary", "../minikube", "path to minikube binary")
+var binaryPath = flag.String("binary", "../out/minikube", "path to minikube binary")
 
 func runCommand(t *testing.T, command string, checkError bool) string {
 	path, _ := filepath.Abs(*binaryPath)
@@ -34,7 +35,7 @@ func runCommand(t *testing.T, command string, checkError bool) string {
 	stdout, err := cmd.Output()
 
 	if checkError && err != nil {
-		t.Fatalf("Error running command: %s %s", command, err)
+		t.Fatalf("Error running command: %s %s. Output: %s", command, err, stdout)
 	}
 	return string(stdout)
 }
@@ -68,3 +69,8 @@ func TestStartStop(t *testing.T) {
 	runCommand(t, "delete", true)
 	checkStatus("Does Not Exist")
 }
+
+func TestMain(m *testing.M) {
+	flag.Parse()
+	os.Exit(m.Run())
+}