Merge branch 'master' into php5

* master:
  Put PHP extension installation into a shell script.
  Add a folder for travis.
This commit is contained in:
Andreas Fischer 2014-01-22 04:15:13 +01:00
commit 4f0fbe065a
4 changed files with 30 additions and 6 deletions

View File

@ -9,12 +9,11 @@ php:
env:
global:
# Defines CODE_COVERAGE_PASSPHRASE which is the passphrase for unlocking
# the tests/code_coverage_id_rsa RSA private key.
# the travis/code_coverage_id_rsa RSA private key.
- secure: "jtQTZKQBnzUlp/jz7NlM6470ZDnLGVAs53sgvIm4tcYqf9TWSXSXjIYvFsrS\nKPR2eyZaAevYysUkIGRFTUXTlG6tC36YngMp9+6FPxASl8mnGXsTbKcm613B\n59vD3242pgIgqhhmgFQ0c8gbvnE8PuF2aS4/hluP3r+AxhWN56E="
before_script:
- git clone git://github.com/zenovich/runkit.git && cd runkit && phpize && ./configure && make && make install && cd ..
- echo "extension=runkit.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
- travis/install-php-extensions.sh
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' ]; then composer install --dev --no-interaction; fi"
script:
@ -22,4 +21,4 @@ script:
- phpunit --verbose --coverage-text --coverage-html code_coverage/
after_success:
- sh -c "if $TRAVIS_SECURE_ENV_VARS; then tests/code_coverage_upload.sh; fi"
- sh -c "if $TRAVIS_SECURE_ENV_VARS; then travis/upload-code-coverage.sh; fi"

View File

@ -0,0 +1,25 @@
#!/bin/bash
#
# This file is part of the phpseclib project.
#
# (c) Andreas Fischer <bantu@phpbb.com>
#
# For the full copyright and license information, please view the LICENSE
# file that was distributed with this source code.
#
set -e
function install_php_extension
{
cd "$1"
phpize
./configure
make
make install
cd ..
echo "extension=$1.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
}
# runkit
git clone git://github.com/zenovich/runkit.git
install_php_extension 'runkit'

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# This file is part of the phpseclib test suite.
# This file is part of the phpseclib project.
#
# (c) Andreas Fischer <bantu@phpbb.com>
#
@ -13,7 +13,7 @@ HOSTNAME='phpseclib.bantux.org'
HOSTRSAF='09:40:96:14:6a:cd:67:46:17:e5:b4:39:24:24:6e:9d'
LDIRNAME='code_coverage'
RDIRNAME='code_coverage'
ID_RSA='tests/code_coverage_id_rsa'
ID_RSA='travis/code_coverage_id_rsa'
# Install expect if necessary
if ! which expect > /dev/null