PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proc: disabled TestUnsupportedArch on go1.7

Browse Source 
See: https://github.com/golang/go/issues/16180
This commit is contained in:
aarzilli 2016-07-03 09:02:21 +02:00
parent 80336e57e0
commit da910cc3bd
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
proc/proc_test.go
View File

@ -1847,15 +1847,15 @@ func TestIssue509(t *testing.T) {
func TestUnsupportedArch(t *testing.T) { func TestUnsupportedArch(t *testing.T) {
ver, _ := ParseVersionString(runtime.Version()) ver, _ := ParseVersionString(runtime.Version())
if ver.Major < 0 || !ver.AfterOrEqual(GoVersion{1, 6, -1, 0, 0}) { if ver.Major < 0 || !ver.AfterOrEqual(GoVersion{1, 6, -1, 0, 0}) || ver.AfterOrEqual(GoVersion{1, 7, -1, 0, 0}) {
// cross compile (with -N?) works only on select versions of go // cross compile (with -N?) works only on select versions of go
return return
} }
fixturesDir := protest.FindFixturesDir() fixturesDir := protest.FindFixturesDir()
infile := filepath.Join(fixturesDir, "math.go") infile := filepath.Join(fixturesDir, "math.go")
outfile := filepath.Join(fixturesDir, "_math_debug_386") outfile := filepath.Join(fixturesDir, "_math_debug_386")
cmd := exec.Command("go", "build", "-gcflags=-N -l", "-o", outfile, infile) cmd := exec.Command("go", "build", "-gcflags=-N -l", "-o", outfile, infile)
for _, v := range os.Environ() { for _, v := range os.Environ() {
if !strings.HasPrefix(v, "GOARCH=") { if !strings.HasPrefix(v, "GOARCH=") {
@ -1868,7 +1868,7 @@ func TestUnsupportedArch(t *testing.T) {
t.Fatalf("go build failed: %v: %v", err, string(out)) t.Fatalf("go build failed: %v: %v", err, string(out))
} }
defer os.Remove(outfile) defer os.Remove(outfile)
p, err := Launch([]string{outfile}) p, err := Launch([]string{outfile})
switch err { switch err {
case UnsupportedArchErr: case UnsupportedArchErr:

6
proc/proc_windows.go
View File

@ -337,9 +337,9 @@ func (dbp *Process) findExecutable(path string) (*pe.File, error) {
func openExecutablePath(path string) (*pe.File, error) { func openExecutablePath(path string) (*pe.File, error) {
f, err := os.OpenFile(path, 0, os.ModePerm) f, err := os.OpenFile(path, 0, os.ModePerm)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return pe.NewFile(f) return pe.NewFile(f)
} }

6
proc/stack.go
View File

@ -24,11 +24,11 @@ type Stackframe struct {
// Address of the call instruction for the function above on the call stack. // Address of the call instruction for the function above on the call stack.
Call Location Call Location
// Start address of the stack frame. // Start address of the stack frame.
CFA int64 CFA int64
// Description of the stack frame. // Description of the stack frame.
FDE *frame.FrameDescriptionEntry FDE *frame.FrameDescriptionEntry
// Return address for this stack frame (as read from the stack frame itself). // Return address for this stack frame (as read from the stack frame itself).
Ret uint64 Ret uint64
} }
// Scope returns a new EvalScope using this frame. // Scope returns a new EvalScope using this frame.

2
proc/threads.go
View File

@ -128,7 +128,7 @@ func topframe(g *G, thread *Thread) (Stackframe, error) {
var frames []Stackframe var frames []Stackframe
var err error var err error
if g == nil { if g == nil {
if thread.blocked() { if thread.blocked() {
return Stackframe{}, ThreadBlockedError{} return Stackframe{}, ThreadBlockedError{}
} }