diff options
| author | Jisi Liu <liujisi@google.com> | 2017-10-12 11:02:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-12 11:02:57 -0700 |
| commit | a632f0dbac406227fad0951262f3b6160eaabebe (patch) | |
| tree | dc1deefbd5f9261836f1cd0f3f9fc5a3b6c93c36 /tests.sh | |
| parent | c4083bb3d1231f8a94f2f000434e38528bdff64a (diff) | |
| parent | dd980ccf578892615a0090d6b5e7538142cb5690 (diff) | |
| download | protobuf-a632f0dbac406227fad0951262f3b6160eaabebe.tar.gz protobuf-a632f0dbac406227fad0951262f3b6160eaabebe.tar.bz2 protobuf-a632f0dbac406227fad0951262f3b6160eaabebe.zip | |
Merge pull request #3739 from pherl/merge3.4
Merge3.4
Diffstat (limited to 'tests.sh')
| -rwxr-xr-x | tests.sh | 27 |
1 files changed, 16 insertions, 11 deletions
@@ -61,9 +61,8 @@ build_cpp_distcheck() { make dist # List all files that should be included in the distribution package. - git ls-files | grep "^\(java\|python\|objectivec\|csharp\|js\|ruby\|php\|cmake\|examples\)" |\ + git ls-files | grep "^\(java\|python\|objectivec\|csharp\|js\|ruby\|php\|cmake\|examples\|src/google/protobuf/.*\.proto\)" |\ grep -v ".gitignore" | grep -v "java/compatibility_tests" |\ - grep -v "cmake/protobuf.*\.pc\.cmake" |\ grep -v "python/compatibility_tests" | grep -v "csharp/compatibility_tests" > dist.lst # Unzip the dist tar file. DIST=`ls *.tar.gz` @@ -347,15 +346,21 @@ 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_reserved_enum_lower.proto \ + proto/test_reserved_enum_upper.proto \ + proto/test_reserved_enum_value_lower.proto \ + proto/test_reserved_enum_value_upper.proto \ + proto/test_reserved_message_lower.proto \ + proto/test_reserved_message_upper.proto \ + proto/test_service.proto \ + proto/test_service_namespace.proto \ proto/test_descriptors.proto pushd ../../src ./protoc --php_out=../php/tests/generated -I../php/tests -I. ../php/tests/proto/test_import_descriptor_proto.proto |