github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Show hack/build-go.sh and ginkgo build output during e2e tests. 

This makes it easier to diagnose slow builds.
pull/6/head
Ryan Hitchman 2016-05-16 16:11:18 -07:00
parent 9625926852
commit 0974b959be
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e_node/e2e_build.go
View File

@ -36,9 +36,12 @@ func buildGo() {
if err != nil {
glog.Fatalf("Failed to locate kubernetes root directory %v.", err)
}
out, err := exec.Command(filepath.Join(k8sRoot, "hack/build-go.sh")).CombinedOutput()
cmd := exec.Command(filepath.Join(k8sRoot, "hack/build-go.sh"))
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err = cmd.Run()
if err != nil {
glog.Fatalf("Failed to build go packages %v. Output:\n%s", err, out)
glog.Fatalf("Failed to build go packages %v\n", err)
}
}

9
test/e2e_node/e2e_remote.go
View File

@ -60,9 +60,12 @@ func CreateTestArchive() string {
if err != nil {
glog.Fatalf("Failed to locate test/e2e_node directory %v.", err)
}
out, err := exec.Command("ginkgo", "build", testDir).CombinedOutput()
cmd := exec.Command("ginkgo", "build", testDir)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err = cmd.Run()
if err != nil {
glog.Fatalf("Failed to build e2e tests under %s %v. Output:\n%s", testDir, err, out)
glog.Fatalf("Failed to build e2e tests under %s %v\n", testDir, err)
}
ginkgoTest := filepath.Join(testDir, "e2e_node.test")
if _, err := os.Stat(ginkgoTest); err != nil {
@ -92,7 +95,7 @@ func CreateTestArchive() string {
defer os.RemoveAll(tardir)
// Copy binaries
out, err = exec.Command("cp", ginkgoTest, filepath.Join(tardir, "e2e_node.test")).CombinedOutput()
out, err := exec.Command("cp", ginkgoTest, filepath.Join(tardir, "e2e_node.test")).CombinedOutput()
if err != nil {
glog.Fatalf("Failed to copy e2e_node.test %v.", err)
}