Small little changes in follow-up to recent contribution to make prot…

…oprint support editions files (#601)
jhump · Apr 4, 2024 · a41e823 · a41e823
1 parent 0935deb
commit a41e823
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -64,8 +64,9 @@ errcheck:
 	errcheck ./...
 
 .PHONY: test
-test:
+test: generate
 	go test -cover -race ./...
+	./desc/protoprint/testfiles/check-protos.sh > /dev/null
 
 .PHONY: test-nounsafe
 test-nounsafe:

diff --git a/desc/protoprint/print_test.go b/desc/protoprint/print_test.go
@@ -231,7 +231,7 @@ func TestPrintEditions(t *testing.T) {
 	fd, err := loadProtoset("../../internal/testprotos/desc_test_editions.protoset")
 	testutil.Ok(t, err)
 
-	checkFile(t, &Printer{}, fd, "desc_test_editions.proto")
+	checkFile(t, &Printer{}, fd, "desc_test_editions-default.proto")
 }
 
 func TestPrintNonFileDescriptors(t *testing.T) {

diff --git a/desc/protoprint/testfiles/check-protos.sh b/desc/protoprint/testfiles/check-protos.sh
@@ -6,7 +6,7 @@ cd $(dirname $0)
 
 for f in *.proto; do
   echo -n "Checking $f..."
-  protoc $f -o tmp.protoset -I ../../../internal/testprotos -I .
+  ../../../internal/testprotos/protoc/bin/protoc $f --experimental_editions -o tmp.protoset -I ../../../internal/testprotos -I .
   echo "  good"
 done
 

diff --git a/...oprint/testfiles/desc_test_editions.proto → ...estfiles/desc_test_editions-default.proto b/...oprint/testfiles/desc_test_editions.proto → ...estfiles/desc_test_editions-default.proto