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 ad06af6481a52814089b3f0f2d27ceea5cc02cb6..d2379daab59cbe82258835bc44e14d454c26a366 100644 (file)
--- 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 3df11be7a8c3ae4c4284355743211e1c7141e610..ec4ebf23b9de10a7221eadd3f9c5f13dbf5bf63a 100644 (file)
--- 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 944d19f85ee53521cb88dfa512f9ebcf2958306d..6c681df179956642adb1e39e8af5eaf7df77cc5d 100644 (file)
--- 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() {