From dd8d5f57d7068080283c2c03af01d806efbe6cf4 Mon Sep 17 00:00:00 2001 From: Paul Yang Date: Wed, 8 Mar 2017 14:31:34 -0800 Subject: Rename encode/decode to serializeToString/mergeFromString (#2795) This better shows the semantic of the API. For already setted fields, mergeFromString do replacement for singular fields and appending for repeated fields. --- tests.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'tests.sh') diff --git a/tests.sh b/tests.sh index 981d20cc..2553df71 100755 --- a/tests.sh +++ b/tests.sh @@ -402,7 +402,14 @@ use_php_bc() { } build_php5.5() { - use_php 5.5 + PHP=`which php` + PHP_CONFIG=`which php-config` + PHPIZE=`which phpize` + ln -sfn "/usr/local/php-5.5/bin/php" $PHP + ln -sfn "/usr/local/php-5.5/bin/php-config" $PHP_CONFIG + ln -sfn "/usr/local/php-5.5/bin/phpize" $PHPIZE + generate_php_test_proto + pushd php rm -rf vendor cp -r /usr/local/vendor-5.5 vendor @@ -415,7 +422,15 @@ build_php5.5() { } build_php5.5_c() { - use_php 5.5 + PHP=`which php` + PHP_CONFIG=`which php-config` + PHPIZE=`which phpize` + ln -sfn "/usr/local/php-5.5/bin/php" $PHP + ln -sfn "/usr/local/php-5.5/bin/php-config" $PHP_CONFIG + ln -sfn "/usr/local/php-5.5/bin/phpize" $PHPIZE + generate_php_test_proto + wget https://phar.phpunit.de/phpunit-old.phar -O /usr/bin/phpunit + cd php/tests && /bin/bash ./test.sh && cd ../.. pushd conformance make test_php_c -- cgit v1.2.3