src/runtime/trace/trace_stack_test.go | 2 +- src/runtime/trace/trace_test.go | 33 --------------------------------- diff --git a/src/runtime/trace/trace_stack_test.go b/src/runtime/trace/trace_stack_test.go index 58139ba14463aebef4ffe8b4f6599f25cb382da7..f3baf0bb696dc7b86231e2c74fc3af88296c364d 100644 --- a/src/runtime/trace/trace_stack_test.go +++ b/src/runtime/trace/trace_stack_test.go @@ -21,8 +21,8 @@ // TestTraceSymbolize tests symbolization and that events has proper stacks. // In particular that we strip bottom uninteresting frames like goexit, // top uninteresting frames (runtime guts). func TestTraceSymbolize(t *testing.T) { - skipTraceTestsIfNeeded(t) testenv.MustHaveExec(t) + buf := new(bytes.Buffer) if err := Start(buf); err != nil { t.Fatalf("failed to start tracing: %v", err) diff --git a/src/runtime/trace/trace_test.go b/src/runtime/trace/trace_test.go index 76d3d44ae70d1074d23659924e370d44855631c0..0a8957ffdfefab4bf9d6ac207aaeb821454d7489 100644 --- a/src/runtime/trace/trace_test.go +++ b/src/runtime/trace/trace_test.go @@ -17,27 +17,7 @@ "testing" "time" ) -func skipTraceTestsIfNeeded(t *testing.T) { - switch runtime.GOOS { - case "solaris": - t.Skip("skipping: solaris timer can go backwards (https://golang.org/issue/8976)") - case "darwin": - switch runtime.GOARCH { - case "arm", "arm64": - // TODO(rsc): What does this have to do with the trace tests? - // There is no forking here. - t.Skipf("skipping on %s/%s, cannot fork", runtime.GOOS, runtime.GOARCH) - } - } - - switch runtime.GOARCH { - case "arm": - t.Skip("skipping: arm tests fail with 'failed to parse trace' (https://golang.org/issue/9725)") - } -} - func TestTraceStartStop(t *testing.T) { - skipTraceTestsIfNeeded(t) buf := new(bytes.Buffer) if err := Start(buf); err != nil { t.Fatalf("failed to start tracing: %v", err) @@ -54,7 +34,6 @@ } } func TestTraceDoubleStart(t *testing.T) { - skipTraceTestsIfNeeded(t) Stop() buf := new(bytes.Buffer) if err := Start(buf); err != nil { @@ -68,7 +47,6 @@ Stop() } func TestTrace(t *testing.T) { - skipTraceTestsIfNeeded(t) buf := new(bytes.Buffer) if err := Start(buf); err != nil { t.Fatalf("failed to start tracing: %v", err) @@ -101,8 +79,6 @@ return events, gs, nil } func TestTraceStress(t *testing.T) { - skipTraceTestsIfNeeded(t) - var wg sync.WaitGroup done := make(chan bool) @@ -236,8 +212,6 @@ // Do a bunch of various stuff (timers, GC, network, etc) in a separate goroutine. // And concurrently with all that start/stop trace 3 times. func TestTraceStressStartStop(t *testing.T) { - skipTraceTestsIfNeeded(t) - defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(8)) outerDone := make(chan bool) @@ -375,13 +349,6 @@ <-outerDone } func TestTraceFutileWakeup(t *testing.T) { - // The test generates a full-load of futile wakeups on channels, - // and ensures that the trace is consistent after their removal. - skipTraceTestsIfNeeded(t) - if runtime.GOOS == "linux" && runtime.GOARCH == "ppc64le" { - t.Skip("test is unreliable; issue #10512") - } - buf := new(bytes.Buffer) if err := Start(buf); err != nil { t.Fatalf("failed to start tracing: %v", err)