github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25696 from rmmh/showbuildlog

Browse Source 
Show hack/build-go.sh output during e2e tests.
This commit is contained in:
Alex Robinson 2016-05-27 16:17:08 -07:00
commit baaf1b628a
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 { if err != nil {
glog.Fatalf("Failed to locate kubernetes root directory %v.", err) 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 { 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

@ -62,9 +62,12 @@ func CreateTestArchive() string {
if err != nil { if err != nil {
glog.Fatalf("Failed to locate test/e2e_node directory %v.", err) 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 { 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") ginkgoTest := filepath.Join(testDir, "e2e_node.test")
if _, err := os.Stat(ginkgoTest); err != nil { if _, err := os.Stat(ginkgoTest); err != nil {
@ -94,7 +97,7 @@ func CreateTestArchive() string {
defer os.RemoveAll(tardir) defer os.RemoveAll(tardir)
// Copy binaries // 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 { if err != nil {
glog.Fatalf("Failed to copy e2e_node.test %v.", err) glog.Fatalf("Failed to copy e2e_node.test %v.", err)
} }