diff options
author | Yilun Chong <chongyilun250@sina.com> | 2017-06-30 17:38:50 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-30 17:38:50 -0700 |
commit | e82ba0b8026eb16c40ceba861f02c643c36e8232 (patch) | |
tree | 2aa89a917c6091923682221026507aa9eea1aba4 /tests.sh | |
parent | 726ba33d98cd06c268f88b7dedf2a9a7916d978d (diff) | |
parent | ecca6ea95d56a6f70ff7b223ec3f904758acc8b1 (diff) | |
download | protobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.tar.gz protobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.tar.bz2 protobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.zip |
Merge branch 'master' into ConformanceTestYilunChong
Diffstat (limited to 'tests.sh')
-rwxr-xr-x | tests.sh | 59 |
1 files changed, 33 insertions, 26 deletions
@@ -397,27 +397,30 @@ build_php5.5() { phpunit popd pushd conformance - # TODO(teboring): Add it back - # make test_php + make test_php popd } build_php5.5_c() { use_php 5.5 wget https://phar.phpunit.de/phpunit-4.8.0.phar -O /usr/bin/phpunit - cd php/tests && /bin/bash ./test.sh && cd ../.. - pushd conformance - # make test_php_c + pushd php/tests + /bin/bash ./test.sh popd + # TODO(teboring): Add it back + # pushd conformance + # make test_php_c + # popd } build_php5.5_zts_c() { use_php_zts 5.5 wget https://phar.phpunit.de/phpunit-4.8.0.phar -O /usr/bin/phpunit cd php/tests && /bin/bash ./test.sh && cd ../.. - pushd conformance - # make test_php_c - popd + # TODO(teboring): Add it back + # pushd conformance + # make test_php_zts_c + # popd } build_php5.6() { @@ -429,8 +432,7 @@ build_php5.6() { phpunit popd pushd conformance - # TODO(teboring): Add it back - # make test_php + make test_php popd } @@ -438,18 +440,20 @@ build_php5.6_c() { use_php 5.6 wget https://phar.phpunit.de/phpunit-5.7.0.phar -O /usr/bin/phpunit cd php/tests && /bin/bash ./test.sh && cd ../.. - pushd conformance + # TODO(teboring): Add it back + # pushd conformance # make test_php_c - popd + # popd } build_php5.6_zts_c() { use_php_zts 5.6 wget https://phar.phpunit.de/phpunit-5.7.0.phar -O /usr/bin/phpunit cd php/tests && /bin/bash ./test.sh && cd ../.. - pushd conformance - # make test_php_c - popd + # TODO(teboring): Add it back + # pushd conformance + # make test_php_zts_c + # popd } build_php5.6_mac() { @@ -471,9 +475,10 @@ build_php5.6_mac() { # Test cd php/tests && /bin/bash ./test.sh && cd ../.. - pushd conformance + # TODO(teboring): Add it back + # pushd conformance # make test_php_c - popd + # popd } build_php7.0() { @@ -485,8 +490,7 @@ build_php7.0() { phpunit popd pushd conformance - # TODO(teboring): Add it back - # make test_php + make test_php popd } @@ -494,18 +498,20 @@ build_php7.0_c() { use_php 7.0 wget https://phar.phpunit.de/phpunit-5.6.0.phar -O /usr/bin/phpunit cd php/tests && /bin/bash ./test.sh && cd ../.. - pushd conformance + # TODO(teboring): Add it back + # pushd conformance # make test_php_c - popd + # popd } build_php7.0_zts_c() { use_php_zts 7.0 wget https://phar.phpunit.de/phpunit-5.6.0.phar -O /usr/bin/phpunit cd php/tests && /bin/bash ./test.sh && cd ../.. - pushd conformance - # make test_php_c - popd + # TODO(teboring): Add it back. + # pushd conformance + # make test_php_zts_c + # popd } build_php7.0_mac() { @@ -527,9 +533,10 @@ build_php7.0_mac() { # Test cd php/tests && /bin/bash ./test.sh && cd ../.. - pushd conformance + # TODO(teboring): Add it back + # pushd conformance # make test_php_c - popd + # popd } build_php_compatibility() { |