diff options
author | Bo Yang <paulyang1211@gmail.com> | 2017-08-05 10:42:29 -0700 |
---|---|---|
committer | Bo Yang <paulyang1211@gmail.com> | 2017-08-05 10:42:29 -0700 |
commit | 8f4b8e430a0cf087af423be434cf8d837027c651 (patch) | |
tree | a7a79a2ff33b31b9036eb378eb458928a0648481 /tests.sh | |
parent | c2f69d6fa23a815948368fae0b8c1e56e50715c9 (diff) | |
parent | f14703c933d04a4aac285c482bf828269bd0a151 (diff) | |
download | protobuf-8f4b8e430a0cf087af423be434cf8d837027c651.tar.gz protobuf-8f4b8e430a0cf087af423be434cf8d837027c651.tar.bz2 protobuf-8f4b8e430a0cf087af423be434cf8d837027c651.zip |
Merge branch 'master' into 3.4.x
Diffstat (limited to 'tests.sh')
-rwxr-xr-x | tests.sh | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -347,7 +347,16 @@ generate_php_test_proto() { # Generate test file rm -rf generated mkdir generated - ../../src/protoc --php_out=generated proto/test.proto proto/test_include.proto proto/test_no_namespace.proto proto/test_prefix.proto proto/test_php_namespace.proto proto/test_empty_php_namespace.proto proto/test_service.proto proto/test_service_namespace.proto + ../../src/protoc --php_out=generated \ + proto/test.proto \ + proto/test_include.proto \ + proto/test_no_namespace.proto \ + proto/test_prefix.proto \ + proto/test_php_namespace.proto \ + proto/test_empty_php_namespace.proto \ + proto/test_service.proto \ + proto/test_service_namespace.proto \ + proto/test_descriptors.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 |