Skip to content

Commit

Permalink
runtime/trace: remove existing Skips
Browse files Browse the repository at this point in the history
The skips added in CL 12579, based on incorrect time stamps,
should be sufficient to identify and exclude all the time-related
flakiness on these systems.

If there is other flakiness, we want to find out.

For #10512.

Change-Id: I5b588ac1585b2e9d1d18143520d2d51686b563e3
Reviewed-on: https://go-review.googlesource.com/12746
Reviewed-by: Austin Clements <[email protected]>
  • Loading branch information
rsc committed Jul 29, 2015
1 parent 80c98fa commit bd5ca22
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 34 deletions.
2 changes: 1 addition & 1 deletion src/runtime/trace/trace_stack_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
// 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)
Expand Down
33 changes: 0 additions & 33 deletions src/runtime/trace/trace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,7 @@ import (
"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)
Expand All @@ -54,7 +34,6 @@ func TestTraceStartStop(t *testing.T) {
}

func TestTraceDoubleStart(t *testing.T) {
skipTraceTestsIfNeeded(t)
Stop()
buf := new(bytes.Buffer)
if err := Start(buf); err != nil {
Expand All @@ -68,7 +47,6 @@ func TestTraceDoubleStart(t *testing.T) {
}

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)
Expand Down Expand Up @@ -101,8 +79,6 @@ func parseTrace(t *testing.T, r io.Reader) ([]*trace.Event, map[uint64]*trace.GD
}

func TestTraceStress(t *testing.T) {
skipTraceTestsIfNeeded(t)

var wg sync.WaitGroup
done := make(chan bool)

Expand Down Expand Up @@ -236,8 +212,6 @@ func TestTraceStress(t *testing.T) {
// 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)

Expand Down Expand Up @@ -375,13 +349,6 @@ func TestTraceStressStartStop(t *testing.T) {
}

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)
Expand Down

0 comments on commit bd5ca22

Please sign in to comment.