mirror of
https://github.com/phpseclib/phpseclib.git
synced 2025-01-12 01:45:47 +00:00
Merge branch '2.0' into 3.0
This commit is contained in:
commit
721fd70a6b
@ -19,13 +19,7 @@ matrix:
|
|||||||
- php: nightly
|
- php: nightly
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- wget http://ftp.gnu.org/gnu/parallel/parallel-20170822.tar.bz2
|
- phpenv config-rm xdebug.ini
|
||||||
- tar -xvjf parallel*
|
|
||||||
- cd parallel-20170822
|
|
||||||
- ./configure
|
|
||||||
- make
|
|
||||||
- sudo make install
|
|
||||||
- cd ..
|
|
||||||
- eval `ssh-agent -s`
|
- eval `ssh-agent -s`
|
||||||
- travis/setup-secure-shell.sh
|
- travis/setup-secure-shell.sh
|
||||||
- sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' -a `php -r "echo (int) version_compare(PHP_VERSION, '7.0', '<');"` = "1" ]; then travis/install-php-extensions.sh; fi"
|
- sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' -a `php -r "echo (int) version_compare(PHP_VERSION, '7.0', '<');"` = "1" ]; then travis/install-php-extensions.sh; fi"
|
||||||
|
@ -38,15 +38,8 @@ then
|
|||||||
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Functional_Net_/class /g'
|
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Functional_Net_/class /g'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$TRAVIS_PHP_VERSION" = 'hhvm' -o `php -r "echo (int) version_compare(PHP_VERSION, '7.0', '>=');"` = "1" ]
|
"$PHPUNIT" \
|
||||||
then
|
|
||||||
find tests -type f -name "*Test.php" | \
|
|
||||||
parallel --gnu --keep-order \
|
|
||||||
"echo '== {} =='; \"$PHPUNIT\" $PHPUNIT_ARGS {};"
|
|
||||||
else
|
|
||||||
"$PHPUNIT" \
|
|
||||||
$PHPUNIT_ARGS \
|
$PHPUNIT_ARGS \
|
||||||
--coverage-text \
|
--coverage-text \
|
||||||
--coverage-clover code_coverage/clover.xml \
|
--coverage-clover code_coverage/clover.xml \
|
||||||
--coverage-html code_coverage/
|
--coverage-html code_coverage/
|
||||||
fi
|
|
||||||
|
Loading…
Reference in New Issue
Block a user