From df78a791a0315d590abd8a54808d05178f711a70 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 19 Nov 2020 13:52:35 +0100
Subject: update to 2.1.2 (no change) run upstream test suite during the build

---
 PHPINFO               |  2 +-
 REFLECTION            |  2 +-
 php-pecl-memprof.spec | 29 +++++++++++++++++++++++++++--
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index a1bdf92..7ade6e2 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,4 +2,4 @@
 memprof
 
 memprof support => enabled
-memprof version => 2.1.1
+memprof version => 2.1.2
diff --git a/REFLECTION b/REFLECTION
index 1c07c39..354a1be 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #117 memprof version 2.1.1 ] {
+Extension [ <persistent> extension #117 memprof version 2.1.2 ] {
 
   - Functions {
     Function [ <internal:memprof> function memprof_enabled ] {
diff --git a/php-pecl-memprof.spec b/php-pecl-memprof.spec
index 089cc7c..30740a4 100644
--- a/php-pecl-memprof.spec
+++ b/php-pecl-memprof.spec
@@ -10,6 +10,8 @@
 # Please, preserve the changelog entries
 #
 
+%bcond_without tests
+
 # we don't want -z defs linker flag
 %undefine _strict_symbol_defs_build
 
@@ -26,7 +28,7 @@
 
 Summary:        Memory usage profiler
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        2.1.1
+Version:        2.1.2
 Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        BSD
 URL:            https://pecl.php.net/package/%{pecl_name}
@@ -80,7 +82,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %prep
 %setup -q -c
 mv %{pecl_name}-%{version} NTS
-mv package2.xml package.xml
 
 # Don't install tests
 sed -e 's/role="test"/role="src"/' \
@@ -180,11 +181,31 @@ fi
     --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
     --modules | grep %{pecl_name}
 
+%if %{with tests}
+cd NTS
+: Upstream test suite for NTS extension
+TEST_PHP_EXECUTABLE=%{_bindir}/php \
+TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
+NO_INTERACTION=1 \
+REPORT_EXIT_STATUS=1 \
+%{_bindir}/php -n run-tests.php --show-diff
+%endif
+
 %if %{with_zts}
 : Minimal load test for ZTS extension
 %{__ztsphp} --no-php-ini \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
     --modules | grep %{pecl_name}
+
+%if %{with tests}
+cd ../NTS
+: 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
 %endif
 
 
@@ -203,6 +224,10 @@ fi
 
 
 %changelog
+* Thu Nov 19 2020 Remi Collet <remi@remirepo.net> - 2.1.2-1
+- update to 2.1.2 (no change)
+- run upstream test suite during the build
+
 * Wed Nov 18 2020 Remi Collet <remi@remirepo.net> - 2.1.1-1
 - update to 2.1.1
 - open https://github.com/arnaud-lb/php-memory-profiler/pull/43
-- 
cgit