aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Yang <teboring@google.com>2016-10-03 21:59:58 +0000
committerBo Yang <teboring@google.com>2016-10-03 23:07:21 +0000
commit858db7a202a36c57aeed998ef088a03cae48e582 (patch)
treea023370c0a8b06194fd8ff18a029c550a3a6f08d
parentbcb32c0b8692774634cb9de10be921d11d7fbf8a (diff)
downloadprotobuf-858db7a202a36c57aeed998ef088a03cae48e582.tar.gz
protobuf-858db7a202a36c57aeed998ef088a03cae48e582.tar.bz2
protobuf-858db7a202a36c57aeed998ef088a03cae48e582.zip
Add travis test on Mac for php.
-rw-r--r--.travis.yml1
-rwxr-xr-xtests.sh28
2 files changed, 20 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 094235e0..d331a26e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@ env:
- CONFIG=ruby21
- CONFIG=ruby22
- CONFIG=jruby
+ - CONFIG=php5.5_mac
matrix:
exclude:
# It's nontrivial to programmatically install a new JDK from the command
diff --git a/tests.sh b/tests.sh
index f0d2abc9..c3c66aa4 100755
--- a/tests.sh
+++ b/tests.sh
@@ -347,11 +347,6 @@ use_php() {
cp "/usr/bin/phpize$VERSION" $PHPIZE
}
-build_php5.5_c() {
- use_php 5.5
- cd php/tests && /bin/bash ./test.sh && cd ../..
-}
-
build_php5.5() {
use_php 5.5
rm -rf vendor
@@ -359,8 +354,18 @@ build_php5.5() {
./vendor/bin/phpunit
}
-build_php5.6_c() {
- use_php 5.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
+ export PATH="/usr/local/php5-5.5.38-20160831-100002/bin:$PATH"
cd php/tests && /bin/bash ./test.sh && cd ../..
}
@@ -371,8 +376,8 @@ build_php5.6() {
./vendor/bin/phpunit
}
-build_php7.0_c() {
- use_php 7.0
+build_php5.6_c() {
+ use_php 5.6
cd php/tests && /bin/bash ./test.sh && cd ../..
}
@@ -383,6 +388,11 @@ build_php7.0() {
./vendor/bin/phpunit
}
+build_php7.0_c() {
+ use_php 7.0
+ cd php/tests && /bin/bash ./test.sh && cd ../..
+}
+
build_php_all() {
build_php5.5
build_php5.6