diff options
| author | Remi Collet <remi@remirepo.net> | 2018-08-22 10:11:39 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-08-22 10:11:39 +0200 |
| commit | bb066c808dd72181b333b3c7812f188fc334452c (patch) | |
| tree | 43959371e2c316cff37c937d0e02beecca7dd8e3 | |
| parent | 99976e2de1aaeb9180709425b0e73bfa4032af19 (diff) | |
ignore test suite results with newer system library
| -rw-r--r-- | php-zstd.spec | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/php-zstd.spec b/php-zstd.spec index c0d6d49..20ebdc0 100644 --- a/php-zstd.spec +++ b/php-zstd.spec @@ -21,6 +21,7 @@ %global with_libzstd 1 %else %global with_libzstd 0 +%global zstdver 1.3.4 %endif %global gh_commit 6386eb94ef67b54c108cac6e3925bf077828816d @@ -36,9 +37,9 @@ Summary: Zstd Extension for PHP Name: %{?sub_prefix}php-%{pecl_name} Version: 0.4.14 %if 0%{?gh_date:1} -Release: 3%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif %if %{?with_libzstd} License: MIT @@ -55,9 +56,9 @@ Source1: makesrc.sh BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel %if %{?with_libzstd} -BuildRequires: libzstd-devel >= 1.3 +BuildRequires: libzstd-devel >= %{zstdver} %else -Provides: bundled(libstd) = 1.3.4 +Provides: bundled(libstd) = %{zstdver} %endif Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -190,6 +191,15 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %check +export NO_INTERACTION=1 +export REPORT_EXIT_STATUS=1 +%if %{?with_libzstd} +ver=$(pkg-config libzstd --modversion) +if [ "$ver" != "%{zstdver}" ] ; then +export REPORT_EXIT_STATUS=0 +fi +%endif + cd NTS : Minimal load test for NTS extension %{__php} --no-php-ini \ @@ -199,8 +209,6 @@ cd NTS : Upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ %{__php} -n run-tests.php --show-diff || : ignore %if %{with_zts} @@ -213,8 +221,6 @@ cd ../ZTS : Upstream test suite for ZTS extension TEST_PHP_EXECUTABLE=%{__ztsphp} \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ %{__ztsphp} -n run-tests.php --show-diff %endif @@ -246,6 +252,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 0.4.14-4 +- ignore test suite results with newer system library + * Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 0.4.14-3 - rebuild for 7.3.0beta2 new ABI |