8000 trace: update gen.bash for Go 1.25 renames · golang/exp@cf3c555 · GitHub
[go: up one dir, main page]
Skip to content

Commit cf3c555

Browse files
rhyshgopherbot
rhysh
authored and
gopherbot
committed
trace: update gen.bash for Go 1.25 renames
Disable a test that counts Sync events. Re-enable it after pulling in the Go 1.25 parser. For golang/go#73558 Change-Id: I5ab2a2ce34c1e4a3d31fd599c2ae683334433474 Reviewed-on: https://go-review.googlesource.com/c/exp/+/669257 Auto-Submit: Rhys Hiltner <rhys.hiltner@gmail.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Carlos Amedee <carlos@golang.org> Reviewed-by: Cherry Mui <cherryyz@google.com>
1 parent 2b6e20a commit cf3c555

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

‎trace/flightrecorder_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ func TestFlightRecorderLog(t *testing.T) {
196196
}
197197

198198
func TestFlightRecorderOneGeneration(t *testing.T) {
199+
t.Skip("requires update for Go 1.25's additional Sync event, go.dev/issue/73558")
199200
test := func(t *testing.T, fr *FlightRecorder) {
200201
tr := testFlightRecorder(t, fr, func(snapshot func()) {
201202
// Sleep to let a few generations pass.

‎trace/gen.bash‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ rsync -av --delete $SRC/ $DST
4545
rm $DST/trace_test.go
4646
rm -r $DST/testdata/testprog
4747

48-
# Remove the oldtrace testdata to avoid checking in new binary files.
49-
# Remove oldtrace_test.go and internal/oldtrace/parser_test.go because
48+
# Remove the tracev1 testdata to avoid checking in new binary files.
49+
# Remove tracev1_test.go and internal/tracev1/parser_test.go because
5050
# they fail without this data.
51-
rm -r $DST/internal/oldtrace/testdata
52-
rm $DST/oldtrace_test.go
53-
rm $DST/internal/oldtrace/parser_test.go
51+
rm -r $DST/internal/tracev1/testdata
52+
rm $DST/tracev1_test.go
53+
rm $DST/internal/tracev1/parser_test.go
5454

5555
# Remove files that are only pertinent to cmd/trace.
5656
rm $DST/export_test.go
@@ -66,15 +66,14 @@ rm $DST/testdata/mktests.go
6666

6767
# Make some packages internal.
6868
mv $DST/raw $DST/internal/raw
69-
mv $DST/event $DST/internal/event
69+
mv $DST/tracev2 $DST/internal/tracev2
7070
mv $DST/version $DST/internal/version
7171
mv $DST/testtrace $DST/internal/testtrace
7272

7373
# Fix up import paths.
7474
find $DST -name '*.go' | xargs -- sed -i'.tmp' -e 's internal/trace golang.org/x/exp/trace '
7575
find $DST -name '*.go' | xargs -- sed -i'.tmp' -e 's golang.org/x/exp/trace/raw golang.org/x/exp/trace/internal/raw '
76-
find $DST -name '*.go' | xargs -- sed -i'.tmp' -e 's golang.org/x/exp/trace/event golang.org/x/exp/trace/internal/event '
77-
find $DST -name '*.go' | xargs -- sed -i'.tmp' -e 's golang.org/x/exp/trace/event/go122 golang.org/x/exp/trace/internal/event/go122 '
76+
find $DST -name '*.go' | xargs -- sed -i'.tmp' -e 's golang.org/x/exp/trace/tracev2 golang.org/x/exp/trace/internal/tracev2 '
7877
find $DST -name '*.go' | xargs -- sed -i'.tmp' -e 's golang.org/x/exp/trace/version golang.org/x/exp/trace/internal/version '
7978
find $DST -name '*.go' | xargs -- sed -i'.tmp' -e 's golang.org/x/exp/trace/testtrace golang.org/x/exp/trace/internal/testtrace '
8079
find $DST -name '*.go' | xargs -- sed -i'.tmp' -e 's internal/txtar golang.org/x/tools/txtar '

0 commit comments

Comments
 (0)
0