From 8bc9f4ba25c1dfeb190c9b7016dc6a60c80d6566 Mon Sep 17 00:00:00 2001 From: terrafrost Date: Sat, 17 Apr 2021 00:31:54 -0500 Subject: [PATCH] Travis: don't use parallels or xdebug --- .travis.yml | 8 +------- travis/run-phpunit.sh | 17 +++++------------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6a5d303..5e0d7727 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,13 +28,7 @@ matrix: before_install: true install: - - wget http://ftp.gnu.org/gnu/parallel/parallel-20170822.tar.bz2 - - tar -xvjf parallel* - - cd parallel-20170822 - - ./configure - - make - - sudo make install - - cd .. + - phpenv config-rm xdebug.ini - eval `ssh-agent -s` - 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" diff --git a/travis/run-phpunit.sh b/travis/run-phpunit.sh index 31b98afc..97d98fda 100755 --- a/travis/run-phpunit.sh +++ b/travis/run-phpunit.sh @@ -37,15 +37,8 @@ then find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/extends Unit_Crypt_Hash_\(SHA512Test\|SHA256Test\)/extends \1/g' fi -if [ "$TRAVIS_PHP_VERSION" = 'hhvm' -o `php -r "echo (int) version_compare(PHP_VERSION, '7.0', '>=');"` = "1" ] -then - find tests -type f -name "*Test.php" | \ - parallel --gnu --keep-order \ - "echo '== {} =='; \"$PHPUNIT\" $PHPUNIT_ARGS {};" -else - "$PHPUNIT" \ - $PHPUNIT_ARGS \ - --coverage-text \ - --coverage-clover code_coverage/clover.xml \ - --coverage-html code_coverage/ -fi +"$PHPUNIT" \ + $PHPUNIT_ARGS \ + --coverage-text \ + --coverage-clover code_coverage/clover.xml \ + --coverage-html code_coverage/