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]>
veloting · Aug 20, 2019 · b0a8cbb · b0a8cbb
1 parent ae1d65b
commit b0a8cbb
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 74 deletions.
diff --git a/protoc-gen-go/descriptor/descriptor.pb.go b/protoc-gen-go/descriptor/descriptor.pb.go
diff --git a/protoc-gen-go/plugin/plugin.pb.go b/protoc-gen-go/plugin/plugin.pb.go
diff --git a/ptypes/any/any.pb.go b/ptypes/any/any.pb.go
diff --git a/ptypes/duration/duration.pb.go b/ptypes/duration/duration.pb.go
diff --git a/ptypes/empty/empty.pb.go b/ptypes/empty/empty.pb.go
diff --git a/ptypes/struct/struct.pb.go b/ptypes/struct/struct.pb.go
diff --git a/ptypes/timestamp/timestamp.pb.go b/ptypes/timestamp/timestamp.pb.go
diff --git a/ptypes/wrappers/wrappers.pb.go b/ptypes/wrappers/wrappers.pb.go
diff --git a/test.bash b/test.bash
@@ -10,8 +10,8 @@ PASS="\x1b[32mPASS"
 FAIL="\x1b[31mFAIL"
 RESET="\x1b[0m"
 
-echo -e "${BOLD}go test -tags proto1_legacy ./...${RESET}"
-RET_TEST0=$(go test -tags proto1_legacy ./... | egrep -v "^(ok|[?])\s+")
+echo -e "${BOLD}go test -tags protolegacy ./...${RESET}"
+RET_TEST0=$(go test -tags protolegacy ./... | egrep -v "^(ok|[?])\s+")
 if [[ ! -z "$RET_TEST0" ]]; then echo "$RET_TEST0"; echo; fi
 
 echo -e "${BOLD}go test -tags use_golang_protobuf_v1 ./...${RESET}"