commit aa1021653c81c3f0abf687dea3a64a06eef92bc2
Author: Elan Ruusamäe <[email protected]>
Date: Thu Nov 9 22:18:12 2017 +0200
update pecl tests
- always run php -m test
- show diff for phptests
php-pecl.spec | 34 +++++++++++++---------------------
1 file changed, 13 insertions(+), 21 deletions(-)
---
diff --git a/php-pecl.spec b/php-pecl.spec
index 4682aeb..986dc01 100644
--- 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/
-%{?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}-cli
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}/* .
+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
@@ -44,7 +53,6 @@ xfail() {
EOF
}
-# failed tests. investigate later
while read line; do
t=${line##*\[}; t=${t%\]}
xfail $t
@@ -58,7 +66,6 @@ phpize
%configure
%{__make}
-%if %{with tests}
# simple module load test
%{__php} -n -q \
-d extension_dir=modules \
@@ -67,23 +74,8 @@ phpize
-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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/template-specs.git/commitdiff/aa1021653c81c3f0abf687dea3a64a06eef92bc2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
