From 5b550f919ff72fa7e3b0ad355d81154fc50af26c Mon Sep 17 00:00:00 2001 From: Liu Hua Date: Sat, 26 Dec 2015 18:31:50 +0000 Subject: [PATCH] update panicwrap package to fix building error on aarch64 platform Linux on aarch64 lacks of dup2, uses dup3 instead Signed-off-by: Liu Hua --- Godeps/Godeps.json | 2 +- .../src/github.com/bugsnag/panicwrap/dup2.go | 11 + .../src/github.com/bugsnag/panicwrap/dup3.go | 11 + .../github.com/bugsnag/panicwrap/monitor.go | 3 +- .../bugsnag/panicwrap/panicwrap_test.go | 360 ------------------ 5 files changed, 24 insertions(+), 363 deletions(-) create mode 100644 Godeps/_workspace/src/github.com/bugsnag/panicwrap/dup2.go create mode 100644 Godeps/_workspace/src/github.com/bugsnag/panicwrap/dup3.go delete mode 100644 Godeps/_workspace/src/github.com/bugsnag/panicwrap/panicwrap_test.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 37f598395..84713b2ea 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -73,7 +73,7 @@ }, { "ImportPath": "github.com/bugsnag/panicwrap", - "Rev": "e5f9854865b9778a45169fc249e99e338d4d6f27" + "Rev": "e2c28503fcd0675329da73bf48b33404db873782" }, { "ImportPath": "github.com/denverdino/aliyungo/oss", diff --git a/Godeps/_workspace/src/github.com/bugsnag/panicwrap/dup2.go b/Godeps/_workspace/src/github.com/bugsnag/panicwrap/dup2.go new file mode 100644 index 000000000..de523c83d --- /dev/null +++ b/Godeps/_workspace/src/github.com/bugsnag/panicwrap/dup2.go @@ -0,0 +1,11 @@ +// +build darwin dragonfly freebsd linux,!arm64 netbsd openbsd + +package panicwrap + +import ( + "syscall" +) + +func dup2(oldfd, newfd int) error { + return syscall.Dup2(oldfd, newfd) +} diff --git a/Godeps/_workspace/src/github.com/bugsnag/panicwrap/dup3.go b/Godeps/_workspace/src/github.com/bugsnag/panicwrap/dup3.go new file mode 100644 index 000000000..9721b36cc --- /dev/null +++ b/Godeps/_workspace/src/github.com/bugsnag/panicwrap/dup3.go @@ -0,0 +1,11 @@ +// +build linux,arm64 + +package panicwrap + +import ( + "syscall" +) + +func dup2(oldfd, newfd int) error { + return syscall.Dup3(oldfd, newfd, 0) +} diff --git a/Godeps/_workspace/src/github.com/bugsnag/panicwrap/monitor.go b/Godeps/_workspace/src/github.com/bugsnag/panicwrap/monitor.go index 1c64a546e..72b418a27 100644 --- a/Godeps/_workspace/src/github.com/bugsnag/panicwrap/monitor.go +++ b/Godeps/_workspace/src/github.com/bugsnag/panicwrap/monitor.go @@ -6,7 +6,6 @@ import ( "github.com/bugsnag/osext" "os" "os/exec" - "syscall" ) func monitor(c *WrapConfig) (int, error) { @@ -54,7 +53,7 @@ func monitor(c *WrapConfig) (int, error) { return -1, err } - err = syscall.Dup2(int(write.Fd()), int(os.Stderr.Fd())) + err = dup2(int(write.Fd()), int(os.Stderr.Fd())) if err != nil { return -1, err } diff --git a/Godeps/_workspace/src/github.com/bugsnag/panicwrap/panicwrap_test.go b/Godeps/_workspace/src/github.com/bugsnag/panicwrap/panicwrap_test.go deleted file mode 100644 index dd1d77f26..000000000 --- a/Godeps/_workspace/src/github.com/bugsnag/panicwrap/panicwrap_test.go +++ /dev/null @@ -1,360 +0,0 @@ -package panicwrap - -import ( - "bytes" - "fmt" - "os" - "os/exec" - "strings" - "testing" - "time" -) - -func helperProcess(s ...string) *exec.Cmd { - cs := []string{"-test.run=TestHelperProcess", "--"} - cs = append(cs, s...) - env := []string{ - "GO_WANT_HELPER_PROCESS=1", - } - - cmd := exec.Command(os.Args[0], cs...) - cmd.Env = append(env, os.Environ()...) - cmd.Stdin = os.Stdin - cmd.Stderr = os.Stderr - cmd.Stdout = os.Stdout - return cmd -} - -// This is executed by `helperProcess` in a separate process in order to -// provider a proper sub-process environment to test some of our functionality. -func TestHelperProcess(*testing.T) { - if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" { - return - } - - // Find the arguments to our helper, which are the arguments past - // the "--" in the command line. - args := os.Args - for len(args) > 0 { - if args[0] == "--" { - args = args[1:] - break - } - - args = args[1:] - } - - if len(args) == 0 { - fmt.Fprintf(os.Stderr, "No command\n") - os.Exit(2) - } - - panicHandler := func(s string) { - fmt.Fprintf(os.Stdout, "wrapped: %d", len(s)) - os.Exit(0) - } - - cmd, args := args[0], args[1:] - switch cmd { - case "no-panic-ordered-output": - exitStatus, err := BasicWrap(panicHandler) - if err != nil { - fmt.Fprintf(os.Stderr, "wrap error: %s", err) - os.Exit(1) - } - - if exitStatus < 0 { - for i := 0; i < 1000; i++ { - os.Stdout.Write([]byte("a")) - os.Stderr.Write([]byte("b")) - } - os.Exit(0) - } - - os.Exit(exitStatus) - case "no-panic-output": - fmt.Fprint(os.Stdout, "i am output") - fmt.Fprint(os.Stderr, "stderr out") - os.Exit(0) - case "panic-boundary": - exitStatus, err := BasicWrap(panicHandler) - - if err != nil { - fmt.Fprintf(os.Stderr, "wrap error: %s", err) - os.Exit(1) - } - - if exitStatus < 0 { - // Simulate a panic but on two boundaries... - fmt.Fprint(os.Stderr, "pan") - os.Stderr.Sync() - time.Sleep(100 * time.Millisecond) - fmt.Fprint(os.Stderr, "ic: oh crap") - os.Exit(2) - } - - os.Exit(exitStatus) - case "panic-long": - exitStatus, err := BasicWrap(panicHandler) - - if err != nil { - fmt.Fprintf(os.Stderr, "wrap error: %s", err) - os.Exit(1) - } - - if exitStatus < 0 { - // Make a fake panic by faking the header and adding a - // bunch of garbage. - fmt.Fprint(os.Stderr, "panic: foo\n\n") - for i := 0; i < 1024; i++ { - fmt.Fprint(os.Stderr, "foobarbaz") - } - - // Sleep so that it dumps the previous data - //time.Sleep(1 * time.Millisecond) - time.Sleep(500 * time.Millisecond) - - // Make a real panic - panic("I AM REAL!") - } - - os.Exit(exitStatus) - case "panic": - hidePanic := false - if args[0] == "hide" { - hidePanic = true - } - - config := &WrapConfig{ - Handler: panicHandler, - HidePanic: hidePanic, - } - - exitStatus, err := Wrap(config) - - if err != nil { - fmt.Fprintf(os.Stderr, "wrap error: %s", err) - os.Exit(1) - } - - if exitStatus < 0 { - panic("uh oh") - } - - os.Exit(exitStatus) - case "wrapped": - child := false - if len(args) > 0 && args[0] == "child" { - child = true - } - config := &WrapConfig{ - Handler: panicHandler, - } - - exitStatus, err := Wrap(config) - if err != nil { - fmt.Fprintf(os.Stderr, "wrap error: %s", err) - os.Exit(1) - } - - if exitStatus < 0 { - if child { - fmt.Printf("%v", Wrapped(config)) - } - os.Exit(0) - } - - if !child { - fmt.Printf("%v", Wrapped(config)) - } - os.Exit(exitStatus) - case "panic-monitor": - - config := &WrapConfig{ - Handler: panicHandler, - HidePanic: true, - Monitor: true, - } - - exitStatus, err := Wrap(config) - - if err != nil { - fmt.Fprintf(os.Stderr, "wrap error: %s", err) - os.Exit(1) - } - - if exitStatus != -1 { - fmt.Fprintf(os.Stderr, "wrap error: %s", err) - os.Exit(1) - } - - panic("uh oh") - - default: - fmt.Fprintf(os.Stderr, "Unknown command: %q\n", cmd) - os.Exit(2) - } -} - -func TestPanicWrap_Output(t *testing.T) { - stderr := new(bytes.Buffer) - stdout := new(bytes.Buffer) - - p := helperProcess("no-panic-output") - p.Stdout = stdout - p.Stderr = stderr - if err := p.Run(); err != nil { - t.Fatalf("err: %s", err) - } - - if !strings.Contains(stdout.String(), "i am output") { - t.Fatalf("didn't forward: %#v", stdout.String()) - } - - if !strings.Contains(stderr.String(), "stderr out") { - t.Fatalf("didn't forward: %#v", stderr.String()) - } -} - -/* -TODO(mitchellh): This property would be nice to gain. -func TestPanicWrap_Output_Order(t *testing.T) { - output := new(bytes.Buffer) - - p := helperProcess("no-panic-ordered-output") - p.Stdout = output - p.Stderr = output - if err := p.Run(); err != nil { - t.Fatalf("err: %s", err) - } - - expectedBuf := new(bytes.Buffer) - for i := 0; i < 1000; i++ { - expectedBuf.WriteString("ab") - } - - actual := strings.TrimSpace(output.String()) - expected := strings.TrimSpace(expectedBuf.String()) - - if actual != expected { - t.Fatalf("bad: %#v", actual) - } -} -*/ - -func TestPanicWrap_panicHide(t *testing.T) { - stdout := new(bytes.Buffer) - stderr := new(bytes.Buffer) - - p := helperProcess("panic", "hide") - p.Stdout = stdout - p.Stderr = stderr - if err := p.Run(); err != nil { - t.Fatalf("err: %s", err) - } - - if !strings.Contains(stdout.String(), "wrapped:") { - t.Fatalf("didn't wrap: %#v", stdout.String()) - } - - if strings.Contains(stderr.String(), "panic:") { - t.Fatalf("shouldn't have panic: %#v", stderr.String()) - } -} - -func TestPanicWrap_panicShow(t *testing.T) { - stdout := new(bytes.Buffer) - stderr := new(bytes.Buffer) - - p := helperProcess("panic", "show") - p.Stdout = stdout - p.Stderr = stderr - if err := p.Run(); err != nil { - t.Fatalf("err: %s", err) - } - - if !strings.Contains(stdout.String(), "wrapped:") { - t.Fatalf("didn't wrap: %#v", stdout.String()) - } - - if !strings.Contains(stderr.String(), "panic:") { - t.Fatalf("should have panic: %#v", stderr.String()) - } -} - -func TestPanicWrap_panicLong(t *testing.T) { - stdout := new(bytes.Buffer) - - p := helperProcess("panic-long") - p.Stdout = stdout - p.Stderr = new(bytes.Buffer) - if err := p.Run(); err != nil { - t.Fatalf("err: %s", err) - } - - if !strings.Contains(stdout.String(), "wrapped:") { - t.Fatalf("didn't wrap: %#v", stdout.String()) - } -} - -func TestPanicWrap_panicBoundary(t *testing.T) { - // TODO(mitchellh): panics are currently lost on boundaries - t.SkipNow() - - stdout := new(bytes.Buffer) - - p := helperProcess("panic-boundary") - p.Stdout = stdout - //p.Stderr = new(bytes.Buffer) - if err := p.Run(); err != nil { - t.Fatalf("err: %s", err) - } - - if !strings.Contains(stdout.String(), "wrapped: 1015") { - t.Fatalf("didn't wrap: %#v", stdout.String()) - } -} - -func TestPanicWrap_monitor(t *testing.T) { - - stdout := new(bytes.Buffer) - - p := helperProcess("panic-monitor") - p.Stdout = stdout - //p.Stderr = new(bytes.Buffer) - if err := p.Run(); err == nil || err.Error() != "exit status 2" { - t.Fatalf("err: %s", err) - } - - if !strings.Contains(stdout.String(), "wrapped:") { - t.Fatalf("didn't wrap: %#v", stdout.String()) - } -} - -func TestWrapped(t *testing.T) { - stdout := new(bytes.Buffer) - - p := helperProcess("wrapped", "child") - p.Stdout = stdout - if err := p.Run(); err != nil { - t.Fatalf("err: %s", err) - } - - if !strings.Contains(stdout.String(), "true") { - t.Fatalf("bad: %#v", stdout.String()) - } -} - -func TestWrapped_parent(t *testing.T) { - stdout := new(bytes.Buffer) - - p := helperProcess("wrapped") - p.Stdout = stdout - if err := p.Run(); err != nil { - t.Fatalf("err: %s", err) - } - - if !strings.Contains(stdout.String(), "false") { - t.Fatalf("bad: %#v", stdout.String()) - } -}