runtime: add execution tracer v2 behind GOEXPERIMENT=exectracer2

[gostls13.git] / src / runtime / trace / trace_stack_test.go

diff --git a/src/runtime/trace/trace_stack_test.go b/src/runtime/trace/trace_stack_test.go
index 62c06e67d9d37436ec34c5469f5eb01f6eff63fa..f427e578dc7d4700af432fa66ddefa3db48242c7 100644 (file)
--- a/src/runtime/trace/trace_stack_test.go
+++ b/src/runtime/trace/trace_stack_test.go
@@ -7,6 +7,7 @@ package trace_test
 import (
        "bytes"
        "fmt"
+       "internal/goexperiment"
        "internal/testenv"
        "internal/trace"
        "net"
@@ -152,11 +153,11 @@ func TestTraceSymbolize(t *testing.T) {
                        {"runtime/trace_test.TestTraceSymbolize.func1", 0},
                }},
                {trace.EvGoSched, []frame{
-                       {"runtime/trace_test.TestTraceSymbolize", 111},
+                       {"runtime/trace_test.TestTraceSymbolize", 112},
                        {"testing.tRunner", 0},
                }},
                {trace.EvGoCreate, []frame{
-                       {"runtime/trace_test.TestTraceSymbolize", 40},
+                       {"runtime/trace_test.TestTraceSymbolize", 41},
                        {"testing.tRunner", 0},
                }},
                {trace.EvGoStop, []frame{
@@ -177,7 +178,7 @@ func TestTraceSymbolize(t *testing.T) {
                }},
                {trace.EvGoUnblock, []frame{
                        {"runtime.chansend1", 0},
-                       {"runtime/trace_test.TestTraceSymbolize", 113},
+                       {"runtime/trace_test.TestTraceSymbolize", 114},
                        {"testing.tRunner", 0},
                }},
                {trace.EvGoBlockSend, []frame{
@@ -186,7 +187,7 @@ func TestTraceSymbolize(t *testing.T) {
                }},
                {trace.EvGoUnblock, []frame{
                        {"runtime.chanrecv1", 0},
-                       {"runtime/trace_test.TestTraceSymbolize", 114},
+                       {"runtime/trace_test.TestTraceSymbolize", 115},
                        {"testing.tRunner", 0},
                }},
                {trace.EvGoBlockSelect, []frame{
@@ -195,7 +196,7 @@ func TestTraceSymbolize(t *testing.T) {
                }},
                {trace.EvGoUnblock, []frame{
                        {"runtime.selectgo", 0},
-                       {"runtime/trace_test.TestTraceSymbolize", 115},
+                       {"runtime/trace_test.TestTraceSymbolize", 116},
                        {"testing.tRunner", 0},
                }},
                {trace.EvGoBlockSync, []frame{
@@ -214,7 +215,7 @@ func TestTraceSymbolize(t *testing.T) {
                {trace.EvGoUnblock, []frame{
                        {"sync.(*WaitGroup).Add", 0},
                        {"sync.(*WaitGroup).Done", 0},
-                       {"runtime/trace_test.TestTraceSymbolize", 120},
+                       {"runtime/trace_test.TestTraceSymbolize", 121},
                        {"testing.tRunner", 0},
                }},
                {trace.EvGoBlockCond, []frame{
@@ -233,6 +234,7 @@ func TestTraceSymbolize(t *testing.T) {
                }},
                {trace.EvGomaxprocs, []frame{
                        {"runtime.startTheWorld", 0}, // this is when the current gomaxprocs is logged.
+                       {"runtime.startTheWorldGC", 0},
                        {"runtime.GOMAXPROCS", 0},
                        {"runtime/trace_test.TestTraceSymbolize", 0},
                        {"testing.tRunner", 0},
@@ -251,6 +253,7 @@ func TestTraceSymbolize(t *testing.T) {
                        {trace.EvGoSysCall, []frame{
                                {"syscall.read", 0},
                                {"syscall.Read", 0},
+                               {"internal/poll.ignoringEINTRIO", 0},
                                {"internal/poll.(*FD).Read", 0},
                                {"os.(*File).read", 0},
                                {"os.(*File).Read", 0},
@@ -287,6 +290,10 @@ func TestTraceSymbolize(t *testing.T) {
 
 func skipTraceSymbolizeTestIfNecessary(t *testing.T) {
        testenv.MustHaveGoBuild(t)
+       if goexperiment.ExecTracer2 {
+               // An equivalent test exists in internal/trace/v2.
+               t.Skip("skipping because this test is incompatible with the new tracer")
+       }
        if IsEnabled() {
                t.Skip("skipping because -test.trace is set")
        }