From 76614ed8cdc8406379ee939e046e7b9ff4f7cce2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Jan 2018 11:31:38 +0100 Subject: use run-tests.php instead of make test --- php-pecl-mcrypt.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'php-pecl-mcrypt.spec') diff --git a/php-pecl-mcrypt.spec b/php-pecl-mcrypt.spec index 3686ec4..bb55055 100644 --- a/php-pecl-mcrypt.spec +++ b/php-pecl-mcrypt.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-mcrypt # -# Copyright (c) 2017 Remi Collet +# Copyright (c) 2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -15,7 +15,7 @@ Summary: Bindings for the libmcrypt library Name: %{?scl_prefix}php-pecl-mcrypt Version: 1.0.1 -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/mcrypt @@ -146,18 +146,22 @@ cd NTS --modules | grep %{pecl_name} : upstream test suite for NTS extension -make test +TEST_PHP_EXECUTABLE=%{__php} \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ +%{__php} -n run-tests.php --show-diff %if %{with_zts} cd ../ZTS : minimal load test of ZTS extension -%{_bindir}/zts-php --no-php-ini \ +%{__ztsphp} --no-php-ini \ --define extension_dir=modules \ --define extension=%{pecl_name} \ --modules | grep %{pecl_name} : upstream test suite for ZTS extension -make test +TEST_PHP_EXECUTABLE=%{__ztsphp} \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ +%{__ztsphp} -n run-tests.php --show-diff %endif @@ -196,6 +200,9 @@ fi %changelog +* Wed Jan 10 2018 Remi Collet - 1.0.1-5 +- use run-tests.php instead of make test + * Tue Jul 18 2017 Remi Collet - 1.0.1-4 - rebuild for PHP 7.2.0beta1 new API -- cgit