qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 05:30:07 -07:00
Code Releases Activity

runtime: revise TestSetPanicOnFault

Browse Source 
We can't assume all those addresses are unmapped.
But at least one should be.

What we're really testing is that the program doesn't crash.

Fixes #8542.

LGTM=iant
R=golang-codereviews, iant, minux
CC=golang-codereviews
https://golang.org/cl/144120043
This commit is contained in:
Russ Cox 2014-09-18 21:43:09 -04:00
parent 2ed209eaf5
commit 5fdea3430a
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/runtime/runtime_test.go
View File

@ -157,8 +157,8 @@ var faultAddrs = []uint64{
// or else malformed.
0xffffffffffffffff,
0xfffffffffffff001,
// no 0xffffffffffff0001; 0xffff0001 is mapped for 32-bit user space on OS X
// no 0xfffffffffff00001; 0xfff00001 is mapped for 32-bit user space sometimes on Linux
0xffffffffffff0001,
0xfffffffffff00001,
0xffffffffff000001,
0xfffffffff0000001,
0xffffffff00000001,
@ -182,26 +182,33 @@ func TestSetPanicOnFault(t *testing.T) {
old := debug.SetPanicOnFault(true)
defer debug.SetPanicOnFault(old)
nfault := 0
for _, addr := range faultAddrs {
testSetPanicOnFault(t, uintptr(addr))
testSetPanicOnFault(t, uintptr(addr), &nfault)
}
if nfault == 0 {
t.Fatalf("none of the addresses faulted")
}
}
func testSetPanicOnFault(t *testing.T, addr uintptr) {
func testSetPanicOnFault(t *testing.T, addr uintptr, nfault *int) {
if GOOS == "nacl" {
t.Skip("nacl doesn't seem to fault on high addresses")
}
defer func() {
if err := recover(); err == nil {
t.Fatalf("did not find error in recover")
if err := recover(); err != nil {
*nfault++
}
}()
// The read should fault, except that sometimes we hit
// addresses that have had C or kernel pages mapped there
// readable by user code. So just log the content.
// If no addresses fault, we'll fail the test.
var p *int
p = (*int)(unsafe.Pointer(addr))
println(*p)
t.Fatalf("still here - should have faulted on address %#x", addr)
t.Logf("addr %#x: %#x\n", addr, *p)
}
func eqstring_generic(s1, s2 string) bool {