From cd3df9ea48899dee839edffe37c4677492c1a657 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 4 Feb 2021 15:52:40 +0100
Subject: minor

---
 php-pecl-scoutapm.spec | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/php-pecl-scoutapm.spec b/php-pecl-scoutapm.spec
index 3893dd7..f3bd25c 100644
--- a/php-pecl-scoutapm.spec
+++ b/php-pecl-scoutapm.spec
@@ -166,18 +166,20 @@ fi
 # Minimal load test for NTS extension
 %{__php} --no-php-ini \
     --define zend_extension=$PWD/NTS/modules/%{pecl_name}.so \
-    --modules | grep %{pecl_name}
+    --modules | grep '^%{pecl_name}$'
 
 %if %{with_zts}
 # Minimal load test for ZTS extension
 %{__ztsphp} --no-php-ini \
     --define zend_extension=$PWD/ZTS/modules/%{pecl_name}.so \
-    --modules | grep %{pecl_name}
+    --modules | grep '^%{pecl_name}$'
 %endif
 
+DEPS="-n -d extension=curl.so -d extension=pdo.so -d extension=pdo_sqlite.so"
+
 : Upstream test suite for NTS extension
 cd NTS
-TEST_PHP_ARGS="-n -d extension=curl.so -d extension=pdo.so -d extension=pdo_sqlite.so -d zend_extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
+TEST_PHP_ARGS="$DEPS -d zend_extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
 REPORT_EXIT_STATUS=1 \
 NO_INTERACTION=1 \
 TEST_PHP_EXECUTABLE=%{__php} \
@@ -186,7 +188,7 @@ TEST_PHP_EXECUTABLE=%{__php} \
 %if %{with_zts}
 : Upstream test suite for ZTS extension
 cd ../ZTS
-TEST_PHP_ARGS="-n -d extension=curl.so -d extension=pdo.so -d extension=pdo_sqlite.so -d zend_extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
+TEST_PHP_ARGS="$DEPS -d zend_extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
 %if "%{php_version}" > "8.0"
 REPORT_EXIT_STATUS=0 \
 %else
-- 
cgit