update pecl tests

- always run php -m test
- show diff for phptests

diff --git a/php-pecl.spec b/php-pecl.spec
index 4682aebc11db8b7f9a08f1a67c60d651edbc7045..986dc01f7c77cfe4b2893d4d97db8c5fd31361c2 100644 (file)
--- a/php-pecl.spec
+++ b/php-pecl.spec
@@ -14,11 +14,10 @@ Group:              Development/Languages/PHP
 Source0:       https://pecl.php.net/get/%{modname}-%{version}.tgz
 # Source0-md5: -
 URL:           https://pecl.php.net/package/MODULE_NAME/
 Source0:       https://pecl.php.net/get/%{modname}-%{version}.tgz
 # Source0-md5: -
 URL:           https://pecl.php.net/package/MODULE_NAME/

-%{?with_tests:BuildRequires:    %{php_name}-cli}
+BuildRequires: %{php_name}-cli

 BuildRequires: %{php_name}-devel
 BuildRequires: rpmbuild(macros) >= 1.666
 %if %{with tests}
 BuildRequires: %{php_name}-devel
 BuildRequires: rpmbuild(macros) >= 1.666
 %if %{with tests}

-BuildRequires: %{php_name}-cli

 BuildRequires: %{php_name}-pcre
 %endif
 %{?requires_php_extension}
 BuildRequires: %{php_name}-pcre
 %endif
 %{?requires_php_extension}


@@ -34,6 +33,16 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %setup -qc
 mv %{modname}-%{version}/* .
 
 %setup -qc
 mv %{modname}-%{version}/* .
 

+cat <<'EOF' > run-tests.sh
+#!/bin/sh
+export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
+exec %{__make} test \
+       PHP_EXECUTABLE=%{__php} \
+       PHP_TEST_SHARED_SYSTEM_EXTENSIONS="spl pdo session" \
+       RUN_TESTS_SETTINGS="-q $*"
+EOF
+chmod +x run-tests.sh
+

 xfail() {
        local t=$1
        test -f $t
 xfail() {
        local t=$1
        test -f $t


@@ -44,7 +53,6 @@ xfail() {
        EOF
 }
 
        EOF
 }
 

-# failed tests. investigate later

 while read line; do
        t=${line##*\[}; t=${t%\]}
        xfail $t
 while read line; do
        t=${line##*\[}; t=${t%\]}
        xfail $t


@@ -58,7 +66,6 @@ phpize
 %configure
 %{__make}
 
 %configure
 %{__make}
 

-%if %{with tests}

 # simple module load test
 %{__php} -n -q \
        -d extension_dir=modules \
 # simple module load test
 %{__php} -n -q \
        -d extension_dir=modules \


@@ -67,23 +74,8 @@ phpize
        -m > modules.log
 grep %{modname} modules.log
 
        -m > modules.log
 grep %{modname} modules.log
 

-export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
-%{__make} test \
-       PHP_EXECUTABLE=%{__php} \
-       PHP_TEST_SHARED_SYSTEM_EXTENSIONS="spl" \
-
-# or:
-cat <<'EOF' > run-tests.sh
-#!/bin/sh
-export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
-exec %{__make} test \
-       PHP_EXECUTABLE=%{__php} \
-       PHP_TEST_SHARED_SYSTEM_EXTENSIONS="spl pdo session" \
-       RUN_TESTS_SETTINGS="-q $*"
-EOF
-chmod +x run-tests.sh
-
-./run-tests.sh
+%if %{with tests}
+./run-tests.sh --show-diff

 %endif
 
 %install
 %endif
 
 %install