From 8fdaf11d9b64baa9ff9600cab0819bc352f59624 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Aug 2016 11:32:28 +0200 Subject: php-nette: cleanup test suite --- php-nette-utils-dev.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/php-nette-utils-dev.spec b/php-nette-utils-dev.spec index a40635a..990dd2f 100644 --- a/php-nette-utils-dev.spec +++ b/php-nette-utils-dev.spec @@ -116,8 +116,6 @@ rm tests/Utils/Image.resize.phpt rm tests/Utils/Json.decode\(\).phpt rm tests/Utils/Image.drawing.phpt -: Generate configuration -cat /etc/php.ini /etc/php.d/*ini >php.ini export LANG=fr_FR.utf8 : Generate autoloader @@ -129,21 +127,19 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/Utils/autoload.php'; EOF : Run test suite in sources tree -# remirepo:13 +# remirepo:11 ret=0 run=0 if which php56; then - cat /opt/remi/php56/root/etc/php.ini /opt/remi/php56/root/etc/php.d/*ini >php.ini - php56 %{_bindir}/nette-tester --colors 0 -p php56 -c ./php.ini tests -s || ret=1 + php56 %{_bindir}/nette-tester --colors 0 -p php56 -C tests -s || ret=1 run=1 fi if which php71; then - cat /etc/opt/remi/php71/php.ini /etc/opt/remi/php71/php.d/*ini >php.ini - php71 %{_bindir}/nette-tester --colors 0 -p php71 -c ./php.ini tests -s || ret=1 + php71 %{_bindir}/nette-tester --colors 0 -p php71 -C tests -s || ret=1 run=1 fi if [ $run -eq 0 ]; then -%{_bindir}/nette-tester --colors 0 -p php -c ./php.ini tests -s +%{_bindir}/nette-tester --colors 0 -p php -C tests -s # remirepo:2 fi exit $ret -- cgit