提交 da910cc3 编写于 作者: A aarzilli

proc: disabled TestUnsupportedArch on go1.7

See: https://github.com/golang/go/issues/16180
上级 80336e57
......@@ -1847,15 +1847,15 @@ func TestIssue509(t *testing.T) {
func TestUnsupportedArch(t *testing.T) {
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
return
}
fixturesDir := protest.FindFixturesDir()
infile := filepath.Join(fixturesDir, "math.go")
outfile := filepath.Join(fixturesDir, "_math_debug_386")
cmd := exec.Command("go", "build", "-gcflags=-N -l", "-o", outfile, infile)
for _, v := range os.Environ() {
if !strings.HasPrefix(v, "GOARCH=") {
......@@ -1868,7 +1868,7 @@ func TestUnsupportedArch(t *testing.T) {
t.Fatalf("go build failed: %v: %v", err, string(out))
}
defer os.Remove(outfile)
p, err := Launch([]string{outfile})
switch err {
case UnsupportedArchErr:
......
......@@ -337,9 +337,9 @@ func (dbp *Process) findExecutable(path string) (*pe.File, error) {
func openExecutablePath(path string) (*pe.File, error) {
f, err := os.OpenFile(path, 0, os.ModePerm)
if err != nil {
return nil, err
}
if err != nil {
return nil, err
}
return pe.NewFile(f)
}
......
......@@ -24,11 +24,11 @@ type Stackframe struct {
// Address of the call instruction for the function above on the call stack.
Call Location
// Start address of the stack frame.
CFA int64
CFA int64
// Description of the stack frame.
FDE *frame.FrameDescriptionEntry
FDE *frame.FrameDescriptionEntry
// 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.
......
......@@ -128,7 +128,7 @@ func topframe(g *G, thread *Thread) (Stackframe, error) {
var frames []Stackframe
var err error
if g == nil {
if g == nil {
if thread.blocked() {
return Stackframe{}, ThreadBlockedError{}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册