diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-17 18:50:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 18:50:04 -0700 |
| commit | d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e (patch) | |
| tree | 6224f98ad30e99dc2d896423853892f2142f16ed /php/tests/compatibility_test.sh | |
| parent | 22503a01722939385a7584c3b65f1c43dc5b2ef8 (diff) | |
| parent | 8356d270a54e18c21f4feac6f5e2b6f1061dc8d5 (diff) | |
| download | protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.gz protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.bz2 protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.zip | |
Merge pull request #4924 from xfxyjwf/3.6.x
Cherry-pick master build fixes and kokoro changes to 3.6.x
Diffstat (limited to 'php/tests/compatibility_test.sh')
| -rwxr-xr-x | php/tests/compatibility_test.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/php/tests/compatibility_test.sh b/php/tests/compatibility_test.sh index b5b255ea..b377d85c 100755 --- a/php/tests/compatibility_test.sh +++ b/php/tests/compatibility_test.sh @@ -122,6 +122,8 @@ composer install tests=( array_test.php encode_decode_test.php generated_class_test.php map_field_test.php well_known_test.php ) sed -i.bak '/php_implementation_test.php/d' phpunit.xml sed -i.bak '/generated_phpdoc_test.php/d' phpunit.xml +sed -i.bak 's/generated_phpdoc_test.php//g' tests/test.sh +sed -i.bak '/memory_leak_test.php/d' tests/test.sh for t in "${tests[@]}" do remove_error_test tests/$t |