aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests.sh
diff options
context:
space:
mode:
authorGravatar Paul Yang <TeBoring@users.noreply.github.com>2017-04-20 16:55:56 -0700
committerGravatar GitHub <noreply@github.com>2017-04-20 16:55:56 -0700
commit4523c9c233dbb61d03996a5bbe25d1b5aea51f7f (patch)
treebebedd58dac1966bc462c00dfc39b1fea5deb6c6 /tests.sh
parent4c57e8475f78ccac80407f03c2d23d30014785f9 (diff)
Allow proto files to import descriptor.proto (#2995)
descriptor.proto uses proto2 syntax, which is not ready for external usage. However, some proto3 files import descriptor.proto and cannot be used. In this PR, all references (We cheated by only removing extensions, which is enough for now. User should avoid using messages defined in descriptor.proto as field type.) to content in descriptor.proto are removed from generated files. Those that import descriptor.proto can be used like other proto files.
Diffstat (limited to 'tests.sh')
-rwxr-xr-xtests.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests.sh b/tests.sh
index 8c56172d..edb37da7 100755
--- a/tests.sh
+++ b/tests.sh
@@ -362,6 +362,7 @@ generate_php_test_proto() {
../../src/protoc --php_out=generated proto/test.proto proto/test_include.proto proto/test_no_namespace.proto proto/test_prefix.proto
pushd ../../src
./protoc --php_out=../php/tests/generated google/protobuf/empty.proto
+ ./protoc --php_out=../php/tests/generated -I../php/tests -I. ../php/tests/proto/test_import_descriptor_proto.proto
popd
popd
}