diff options
| author | Remi Collet <remi@remirepo.net> | 2017-12-11 15:54:54 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-12-11 15:54:54 +0100 |
| commit | 56711faafc5c083f63c19bd87ebbe7f6b50239ce (patch) | |
| tree | 5115545dc0726d0afdb001765855fa709dcd227e | |
| parent | bd4084afa6093bd539e7fde4d0951fcca15034b7 (diff) | |
cleanzend-loader
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | php-zendframework-zend-expressive.spec | 27 |
2 files changed, 13 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fc9aa8c --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +clog +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/php-zendframework-zend-expressive.spec b/php-zendframework-zend-expressive.spec index 5319cc0..5bd4f88 100644 --- a/php-zendframework-zend-expressive.spec +++ b/php-zendframework-zend-expressive.spec @@ -30,7 +30,6 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Tests %if %{with_tests} @@ -147,8 +146,6 @@ EOF %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{php_home}/Zend/ cp -pr src %{buildroot}%{php_home}/Zend/%{library} @@ -177,33 +174,19 @@ require_once '%{php_home}/Zend/autoload.php'; require_once '%{php_home}/Mockery/autoload.php'; EOF -# remirepo:11 -run=0 ret=0 -if which php56; then - php56 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1 - run=1 -fi -if which php71; then - php71 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1 - run=1 -fi -if [ $run -eq 0 ]; then -%{_bindir}/phpunit --include-path=%{buildroot}%{php_home} --verbose -# remirepo:2 -fi +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit || ret=1 + fi +done exit $ret %else : Test suite disabled %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md |