Skip to content

Commit b0a8cbb

Browse files
neildneild
committed
all: fix interactions with latest v2 API
Change test.bash to pass -tags=protolegacy instead of proto1_legacy. Regenerate .pb.go files. Change-Id: Ifd0633c20c5860de765fcef5d0eb6c5bf3e3f183 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/190979 Reviewed-by: Joe Tsai <[email protected]>
1 parent ae1d65b commit b0a8cbb

File tree

9 files changed

+106
-74
lines changed

9 files changed

+106
-74
lines changed

‎protoc-gen-go/descriptor/descriptor.pb.go

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎protoc-gen-go/plugin/plugin.pb.go

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ptypes/any/any.pb.go

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ptypes/duration/duration.pb.go

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ptypes/empty/empty.pb.go

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ptypes/struct/struct.pb.go

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ptypes/timestamp/timestamp.pb.go

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ptypes/wrappers/wrappers.pb.go

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ PASS="\x1b[32mPASS"
1010
FAIL="\x1b[31mFAIL"
1111
RESET="\x1b[0m"
1212

13-
echo -e "${BOLD}go test -tags proto1_legacy ./...${RESET}"
14-
RET_TEST0=$(go test -tags proto1_legacy ./... | egrep -v "^(ok|[?])\s+")
13+
echo -e "${BOLD}go test -tags protolegacy ./...${RESET}"
14+
RET_TEST0=$(go test -tags protolegacy ./... | egrep -v "^(ok|[?])\s+")
1515
if [[ ! -z "$RET_TEST0" ]]; then echo "$RET_TEST0"; echo; fi
1616

1717
echo -e "${BOLD}go test -tags use_golang_protobuf_v1 ./...${RESET}"

0 commit comments

Comments
 (0)