From e83616e348f814398b6a52d31146b305a824af54 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Dec 2017 10:57:11 +0100 Subject: cleanup --- .gitignore | 8 ++++++++ php-zendframework-zend-di.spec | 20 +++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 .gitignore 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-di.spec b/php-zendframework-zend-di.spec index 834fe73..efa85b9 100644 --- a/php-zendframework-zend-di.spec +++ b/php-zendframework-zend-di.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} @@ -98,8 +97,6 @@ mv LICENSE.md LICENSE %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{php_home}/Zend/ cp -pr src %{buildroot}%{php_home}/Zend/%{library} @@ -119,22 +116,19 @@ Zend\Loader\AutoloaderFactory::factory(array( require_once '%{php_home}/Zend/autoload.php'; EOF -%{_bindir}/phpunit --include-path=%{buildroot}%{php_home} - -if which php70; then - php70 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} -fi +ret=0 +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit --verbose || 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 -- cgit