From: Austin Clements <austin@google.com>
Date: Tue, 17 Feb 2015 20:01:43 +0000 (-0500)
Subject: runtime: fix runtime-gdb_test on arm
X-Git-Tag: go1.5beta1~1965
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1ab55a3f047502d8d59616c823facb7cd3ded487;p=gostls13.git

runtime: fix runtime-gdb_test on arm

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>
---

diff --git a/src/runtime/runtime-gdb_test.go b/src/runtime/runtime-gdb_test.go
index a946749f47..a926f5fb85 100644
--- a/src/runtime/runtime-gdb_test.go
+++ b/src/runtime/runtime-gdb_test.go
@@ -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)
 	}