From bae90c989cb020d17a24919ec84c0b8dd2fae2da Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 4 Jun 2014 23:15:33 +0000 Subject: libgo: Merge from revision 18783:00cce3a34d7e of master library. This revision was committed January 7, 2014. The next revision deleted runtime/mfinal.c. That will be done in a subsequent merge. This merge changes type descriptors to add a zero field, pointing to a zero value for that type. This is implemented as a common variable. * go-gcc.cc (Gcc_backend::implicit_variable): Add is_common and alignment parameters. Permit init parameter to be NULL. From-SVN: r211249 --- libgo/go/runtime/pprof/pprof_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libgo/go/runtime/pprof') diff --git a/libgo/go/runtime/pprof/pprof_test.go b/libgo/go/runtime/pprof/pprof_test.go index 52d63b2..e556ca1 100644 --- a/libgo/go/runtime/pprof/pprof_test.go +++ b/libgo/go/runtime/pprof/pprof_test.go @@ -33,6 +33,10 @@ func TestCPUProfile(t *testing.T) { } func TestCPUProfileMultithreaded(t *testing.T) { + // TODO(brainman): delete when issue 6986 is fixed. + if runtime.GOOS == "windows" && runtime.GOARCH == "amd64" { + t.Skip("skipping broken test on windows-amd64-race") + } buf := make([]byte, 100000) defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(2)) testCPUProfile(t, []string{"crc32.update"}, func() { @@ -244,6 +248,10 @@ func TestGoroutineSwitch(t *testing.T) { // Test that profiling of division operations is okay, especially on ARM. See issue 6681. func TestMathBigDivide(t *testing.T) { + // TODO(brainman): delete when issue 6986 is fixed. + if runtime.GOOS == "windows" && runtime.GOARCH == "amd64" { + t.Skip("skipping broken test on windows-amd64-race") + } testCPUProfile(t, nil, func() { t := time.After(5 * time.Second) pi := new(big.Int) -- cgit v1.1