From b5eaf1e92d2e6c51c99993a62968ca474f552b06 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 6 Dec 2018 16:26:39 +0100 Subject: skip test relying on uopz extension --- php-sentry.spec | 45 +++++++++++++-------------------------------- 1 file changed, 13 insertions(+), 32 deletions(-) (limited to 'php-sentry.spec') diff --git a/php-sentry.spec b/php-sentry.spec index 8ef7a35..ec6aa98 100644 --- a/php-sentry.spec +++ b/php-sentry.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-sentry # -# Copyright (c) 2016 Shawn Iwinski +# Copyright (c) 2016-2018 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -31,10 +31,9 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 6%{?github_release}%{?dist} Summary: PHP client for Sentry -Group: Development/Libraries # ASL 2.0: # - lib/Raven/Serializer.php # BSD: @@ -47,7 +46,6 @@ URL: https://github.com/%{github_owner}/%{github_name} Source0: %{name}-%{github_version}-%{github_commit}.tar.gz Source1: %{name}-get-source.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Library version value check BuildRequires: php-cli @@ -67,18 +65,12 @@ BuildRequires: php-reflection BuildRequires: php-session BuildRequires: php-spl BuildRequires: php-zlib -%if 0%{?fedora} >= 25 -# Required for PHPUnit with PHP 7 -# See https://github.com/getsentry/sentry-php/pull/365 -BuildRequires: php-uopz -%endif # Conflict because Monolog will load obsoleted package's autoloader and classes. BuildConflicts: php-Raven %endif Requires: php-cli -# use path as ca-certificates doesn't exists on EL-5 -Requires: /etc/pki/tls/cert.pem +Requires: ca-certificates # composer.json Requires: php(language) >= %{php_min_ver} Requires: php-composer(monolog/monolog) >= %{monolog_min_ver} @@ -141,8 +133,6 @@ AUTOLOAD %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{phpdir} cp -rp lib/* %{buildroot}%{phpdir}/ @@ -170,33 +160,21 @@ require_once '%{buildroot}%{phpdir}/Raven/autoload.php'; BOOTSTRAP : Run tests -# remirepo:11 -run=0 ret=0 -if which php56; then - php56 %{_bindir}/phpunit --bootstrap bootstrap.php || ret=1 - run=1 -fi -if which php71; then - php71 %{_bindir}/phpunit --bootstrap bootstrap.php || ret=1 - run=1 -fi -if [ $run -eq 0 ]; then -%{_bindir}/phpunit --verbose --bootstrap bootstrap.php -# remirepo:2 -fi +for cmd in php php70 php71 php72 php73; do + if which $cmd; then + $cmd %{_bindir}/phpunit \ + --filter '^((?!(testCanTraceParamContext|testDoesFixFrameInfo)).)*$' \ + --verbose --bootstrap bootstrap.php || ret=1 + fi +done exit $ret %else : Tests skipped %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.rst @@ -209,6 +187,9 @@ rm -rf %{buildroot} %changelog +* Thu Dec 6 2018 Remi Collet - 0.22.0-6 +- skip test relying on uopz extension + * Sun Nov 6 2016 Remi Collet - 0.22.0-1 - add backport stuff for remi repo. -- cgit