diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2017-03-01 10:39:48 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-01 10:39:48 -0800 |
| commit | bcbaabe53a8d661f5a473d2a157a4278ad8bf579 (patch) | |
| tree | 173e7e07319f10451e2ec290c00cba89a34b647e /php/tests/test.sh | |
| parent | 7339fc04c49a055ec0688cd0cb24cf7ea64f7783 (diff) | |
Add mergeFrom method on Message (#2766)
This method merges the contents of the specified message into the
current message. Singular fields that are set in the specified message
overwrite the corresponding fields in the current message. Repeated
fields are appended. Map fields key-value pairs are overritten.
Singular/Oneof sub-messages are recursively merged. All overritten
sub-messages are deep-copied.
Diffstat (limited to 'php/tests/test.sh')
| -rwxr-xr-x | php/tests/test.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/php/tests/test.sh b/php/tests/test.sh index 3635d86c..fc3f0186 100755 --- a/php/tests/test.sh +++ b/php/tests/test.sh @@ -19,7 +19,9 @@ do echo "" done -# Make sure to run the memory test in debug mode. -php -dextension=../ext/google/protobuf/modules/protobuf.so memory_leak_test.php +# # Make sure to run the memory test in debug mode. +# php -dextension=../ext/google/protobuf/modules/protobuf.so memory_leak_test.php -USE_ZEND_ALLOC=0 valgrind --leak-check=yes php -dextension=../ext/google/protobuf/modules/protobuf.so memory_leak_test.php +export ZEND_DONT_UNLOAD_MODULES=1 +export USE_ZEND_ALLOC=0 +valgrind --leak-check=yes php -dextension=../ext/google/protobuf/modules/protobuf.so memory_leak_test.php |