Update .gitignore and integration test for new build locations.

pull/42/head
dlorenc 2016-05-04 14:31:32 -07:00
parent 5f529ecbc1
commit 081a1851dd
2 changed files with 9 additions and 2 deletions

1
.gitignore vendored
View File

@ -24,3 +24,4 @@ _testmain.go
*.prof
/out
/.gopath

View File

@ -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())
}