aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Yang <teboring@google.com>2016-10-04 17:32:08 +0000
committerBo Yang <teboring@google.com>2016-10-04 17:50:59 +0000
commit2d897c8fa2cbe21683263e3eeddd1ab8e0d89091 (patch)
tree1ce2e7f3a80f6d94b5c51ecc99f44061253daefe
parent3a055be9257b7ff9fe102243a744107b2712d583 (diff)
downloadprotobuf-2d897c8fa2cbe21683263e3eeddd1ab8e0d89091.tar.gz
protobuf-2d897c8fa2cbe21683263e3eeddd1ab8e0d89091.tar.bz2
protobuf-2d897c8fa2cbe21683263e3eeddd1ab8e0d89091.zip
Add test for php zts build.
-rwxr-xr-xtests.sh20
1 files changed, 16 insertions, 4 deletions
diff --git a/tests.sh b/tests.sh
index c3c66aa4..ccf49f00 100755
--- a/tests.sh
+++ b/tests.sh
@@ -347,6 +347,16 @@ use_php() {
cp "/usr/bin/phpize$VERSION" $PHPIZE
}
+use_php_zts() {
+ VERSION=$1
+ PHP=`which php`
+ PHP_CONFIG=`which php-config`
+ PHPIZE=`which phpize`
+ ln -sfn "/usr/local/php-${VERSION}-zts/bin/php" $PHP
+ ln -sfn "/usr/local/php-${VERSION}-zts/bin/php-config" $PHP_CONFIG
+ ln -sfn "/usr/local/php-${VERSION}-zts/bin/phpize" $PHPIZE
+}
+
build_php5.5() {
use_php 5.5
rm -rf vendor
@@ -358,10 +368,6 @@ build_php5.5_c() {
use_php 5.5
cd php/tests && /bin/bash ./test.sh && cd ../..
}
-build_php5.5_c() {
- use_php 5.5
- cd php/tests && /bin/bash ./test.sh && cd ../..
-}
build_php5.5_mac() {
curl -s https://php-osx.liip.ch/install.sh | bash -s 5.5
@@ -369,6 +375,11 @@ build_php5.5_mac() {
cd php/tests && /bin/bash ./test.sh && cd ../..
}
+build_php5.5_zts_c() {
+ use_php_zts 5.5
+ cd php/tests && /bin/bash ./test.sh && cd ../..
+}
+
build_php5.6() {
use_php 5.6
rm -rf vendor
@@ -400,6 +411,7 @@ build_php_all() {
build_php5.5_c
build_php5.6_c
# build_php7.0_c
+ build_php5.5_zts_c
}
# Note: travis currently does not support testing more than one language so the