]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: fix runtime-gdb_test on arm
authorAustin Clements <austin@google.com>
Tue, 17 Feb 2015 20:01:43 +0000 (15:01 -0500)
committerAustin Clements <austin@google.com>
Tue, 17 Feb 2015 20:10:31 +0000 (20:10 +0000)
Apparently when ARM stops at a GDB breakpoint, it appears to be in
syscall.Syscall.  The "info goroutines" test expected it to be in a
runtime function.  Since this isn't fundamental to the test, simply
tweak the test's regexp to make sure "info goroutines" prints some
running goroutine with an active M, but don't require it to be in any
particular function.

Change-Id: Iba2618b46d3dc49cef62ffb72484b83ea7b0317d
Reviewed-on: https://go-review.googlesource.com/5060
Reviewed-by: Dave Cheney <dave@cheney.net>
src/runtime/runtime-gdb_test.go

index a946749f47651b59cde60b17ee6eb9e08121830a..a926f5fb85f4be7065ab0db76a9d3e1dd63ed69d 100644 (file)
@@ -75,7 +75,7 @@ func TestGdbPython(t *testing.T) {
                blocks[string(subs[1])] = string(subs[2])
        }
 
-       infoGoroutinesRe := regexp.MustCompile(`\d+\s+running\s+runtime`)
+       infoGoroutinesRe := regexp.MustCompile(`\*\s+\d+\s+running\s+`)
        if bl := blocks["info goroutines"]; !infoGoroutinesRe.MatchString(bl) {
                t.Fatalf("info goroutines failed: %s", bl)
        }