summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-05-14 19:00:33 +0200
committerRemi Collet <remi@remirepo.net>2017-05-14 19:00:33 +0200
commitf8ffd0e4b54f793b87618bb7bc7f1117bcf312c6 (patch)
tree862a603468028622bfee16575ce15caefedb7735
parent703c24113ec12bba71289837751cd762d3eaee56 (diff)
cleanup
-rw-r--r--php-alcaeus-mongo-php-adapter.spec16
1 files changed, 3 insertions, 13 deletions
diff --git a/php-alcaeus-mongo-php-adapter.spec b/php-alcaeus-mongo-php-adapter.spec
index 5d091ea..4f2e8be 100644
--- a/php-alcaeus-mongo-php-adapter.spec
+++ b/php-alcaeus-mongo-php-adapter.spec
@@ -43,12 +43,7 @@ BuildRequires: php-spl
# from composer.json, require-dev": {
# "phpunit/phpunit": "^5.7 || ^6.0"
BuildRequires: mongodb-server >= 3.4
-%if 0%{?fedora} >= 26
-%global phpunit %{_bindir}/phpunit6
-%else
-%global phpunit %{_bindir}/phpunit
-%endif
-BuildRequires: %{phpunit}
+BuildRequires: phpunit6
%endif
# From composer.json, "require": {
@@ -132,16 +127,11 @@ if [ ! -s server.pid ] ; then
fi
: Run the test suite
-ret=0
-for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" "php71 %{_bindir}/phpunit6" "php72 %{_bindir}/phpunit"; do
- if which $cmd; then
- set $cmd
- $1 $2 --bootstrap bs.php || ret=1
- fi
-done
+%{_bindir}/phpunit6 --bootstrap bs.php || ret=1
: Cleanup
kill $(cat server.pid)
+sleep 1
exit $ret
%else