From: Michael Anthony Knyszek <mknyszek@google.com>
Date: Tue, 21 May 2024 02:20:55 +0000 (+0000)
Subject: internal/trace: fix up debug commands
X-Git-Tag: go1.23rc1~199
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1110c4095e3ce91eabd830161b6b0836eba4263c;p=gostls13.git

internal/trace: fix up debug commands

They were still referencing the old internal/trace/v2 packages, and
gotraceeventstats had an extra layer of cmd directory (not sure why,
maybe it was always like that).

Change-Id: Ieba48074ff36ea86c467168568751177d80db31d
Reviewed-on: https://go-review.googlesource.com/c/go/+/586998
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
Auto-Submit: Michael Knyszek <mknyszek@google.com>
---

diff --git a/src/internal/trace/testdata/cmd/cmd/gotraceeventstats/main.go b/src/internal/trace/testdata/cmd/gotraceeventstats/main.go
similarity index 98%
rename from src/internal/trace/testdata/cmd/cmd/gotraceeventstats/main.go
rename to src/internal/trace/testdata/cmd/gotraceeventstats/main.go
index ad06af6481..d2379daab5 100644
--- a/src/internal/trace/testdata/cmd/cmd/gotraceeventstats/main.go
+++ b/src/internal/trace/testdata/cmd/gotraceeventstats/main.go
@@ -15,8 +15,8 @@ import (
 	"slices"
 	"text/tabwriter"
 
-	"internal/trace/v2/event"
-	"internal/trace/v2/raw"
+	"internal/trace/event"
+	"internal/trace/raw"
 )
 
 func init() {
diff --git a/src/internal/trace/testdata/cmd/gotraceraw/main.go b/src/internal/trace/testdata/cmd/gotraceraw/main.go
index 3df11be7a8..ec4ebf23b9 100644
--- a/src/internal/trace/testdata/cmd/gotraceraw/main.go
+++ b/src/internal/trace/testdata/cmd/gotraceraw/main.go
@@ -11,8 +11,8 @@ import (
 	"log"
 	"os"
 
-	"internal/trace/v2/raw"
-	"internal/trace/v2/version"
+	"internal/trace/raw"
+	"internal/trace/version"
 )
 
 func init() {
diff --git a/src/internal/trace/testdata/cmd/gotracevalidate/main.go b/src/internal/trace/testdata/cmd/gotracevalidate/main.go
index 944d19f85e..6c681df179 100644
--- a/src/internal/trace/testdata/cmd/gotracevalidate/main.go
+++ b/src/internal/trace/testdata/cmd/gotracevalidate/main.go
@@ -11,8 +11,8 @@ import (
 	"log"
 	"os"
 
-	"internal/trace/v2"
-	"internal/trace/v2/testtrace"
+	"internal/trace"
+	"internal/trace/testtrace"
 )
 
 func init() {