From a41e823f5c4ed250717a8a2bb49e11428fed2c3b Mon Sep 17 00:00:00 2001
From: Joshua Humphries <2035234+jhump@users.noreply.github.com>
Date: Wed, 3 Apr 2024 20:29:55 -0400
Subject: [PATCH] Small little changes in follow-up to recent contribution to
 make protoprint support editions files (#601)

---
 Makefile                                                       | 3 ++-
 desc/protoprint/print_test.go                                  | 2 +-
 desc/protoprint/testfiles/check-protos.sh                      | 2 +-
 ...sc_test_editions.proto => desc_test_editions-default.proto} | 0
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename desc/protoprint/testfiles/{desc_test_editions.proto => desc_test_editions-default.proto} (100%)

diff --git a/Makefile b/Makefile
index 40eb25d4..3bf83348 100644
--- 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
index 3f992d9b..010bdbe1 100644
--- 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
index 69258de9..27348d87 100755
--- 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/desc/protoprint/testfiles/desc_test_editions.proto b/desc/protoprint/testfiles/desc_test_editions-default.proto
similarity index 100%
rename from desc/protoprint/testfiles/desc_test_editions.proto
rename to desc/protoprint/testfiles/desc_test_editions-default.proto