From ecc57a7d01e094f3034e8be4bef42a8b0793aed2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Jan 29 2021 09:44:56 +0000 Subject: Try FTBFS again (cherry picked from commit a9130ad43d564b57c2f2fbe3fef26797dd5f8712) --- diff --git a/phpcov.spec b/phpcov.spec index 3fc7c2c..866f123 100644 --- a/phpcov.spec +++ b/phpcov.spec @@ -48,7 +48,7 @@ BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-comp BuildRequires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) BuildRequires: (php-composer(sebastian/diff) >= 4 with php-composer(sebastian/diff) < 5) BuildRequires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) -BuildRequires: php-pecl(Xdebug) +BuildRequires: php-pecl(Xdebug) >= 3 %endif # from composer.json @@ -128,9 +128,12 @@ rm tests/end-to-end/merge/valid-directory-with-text-report-stdout.phpt rm tests/end-to-end/help/help.phpt rm tests/end-to-end/help/help2.phpt -# TODO php80 when xdebug will be available +# Needed for XDebug 3 +find tests -name \*.phpt \ + -exec sed -e '/xdebug.overload_var_dump/d' -i {} \; + ret=0 -for cmd in php php73 php74; do +for cmd in php php73 php74 php80; do if which $cmd; then $cmd $EXT %{_bindir}/phpunit9 --testsuite end-to-end --verbose || ret=1 fi