@@ -45,12 +45,12 @@ rsync -av --delete $SRC/ $DST
45
45
rm $DST /trace_test.go
46
46
rm -r $DST /testdata/testprog
47
47
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
50
50
# 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
54
54
55
55
# Remove files that are only pertinent to cmd/trace.
56
56
rm $DST /export_test.go
@@ -66,15 +66,14 @@ rm $DST/testdata/mktests.go
66
66
67
67
# Make some packages internal.
68
68
mv $DST /raw $DST /internal/raw
69
- mv $DST /event $DST /internal/event
69
+ mv $DST /tracev2 $DST /internal/tracev2
70
70
mv $DST /version $DST /internal/version
71
71
mv $DST /testtrace $DST /internal/testtrace
72
72
73
73
# Fix up import paths.
74
74
find $DST -name ' *.go' | xargs -- sed -i' .tmp' -e ' s internal/trace golang.org/x/exp/trace '
75
75
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 '
78
77
find $DST -name ' *.go' | xargs -- sed -i' .tmp' -e ' s golang.org/x/exp/trace/version golang.org/x/exp/trace/internal/version '
79
78
find $DST -name ' *.go' | xargs -- sed -i' .tmp' -e ' s golang.org/x/exp/trace/testtrace golang.org/x/exp/trace/internal/testtrace '
80
79
find $DST -name ' *.go' | xargs -- sed -i' .tmp' -e ' s internal/txtar golang.org/x/tools/txtar '
0 commit comments