[packages/php-pecl-translit] always run simple module load test

glen glen at pld-linux.org
Mon Nov 20 19:25:49 CET 2017


commit 7e6a512a2ab9123317b3cede7ae0cf815ead9abb
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Mon Nov 20 20:24:03 2017 +0200

    always run simple module load test

 php-pecl-translit.spec | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/php-pecl-translit.spec b/php-pecl-translit.spec
index edb9336..fd4cbbc 100644
--- a/php-pecl-translit.spec
+++ b/php-pecl-translit.spec
@@ -8,18 +8,18 @@ Summary:	%{modname} - transliterates non-latin character sets to latin
 Summary(pl.UTF-8):	%{modname} - translitacja alfabetów niełacińskich do łacińskiego
 Name:		%{php_name}-pecl-%{modname}
 Version:	0.6.2
-Release:	1
+Release:	2
 License:	PHP
 Group:		Development/Languages/PHP
 Source0:	https://github.com/derickr/pecl-translit/archive/RELEASE_0_6_2.tar.gz
 # Source0-md5:	599a00bb624d1ebc8440698aa89585dc
 URL:		https://github.com/derickr/pecl-translit
 BuildRequires:	%{php_name}-devel >= 3:5.0.4
-BuildRequires:	libtool
-BuildRequires:	rpmbuild(macros) >= 1.650
-%if %{with tests}
 BuildRequires:	%{php_name}-cli
 BuildRequires:	%{php_name}-iconv
+BuildRequires:	libtool
+BuildRequires:	rpmbuild(macros) >= 1.666
+%if %{with tests}
 BuildRequires:	%{php_name}-pcre
 %endif
 %{?requires_php_extension}
@@ -50,12 +50,21 @@ znaków przestankowych i odstępów.
 %setup -qc
 mv pecl-translit-*/* .
 
+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="iconv" \
+	RUN_TESTS_SETTINGS="-q $*"
+EOF
+chmod +x run-tests.sh
+
 %build
 phpize
 %configure
 %{__make}
 
-%if %{with tests}
 # simple module load test
 %{__php} -n -q \
 	-d extension_dir=modules \
@@ -64,17 +73,8 @@ phpize
 	-m > modules.log
 grep %{modname} modules.log
 
-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="iconv" \
-	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/packages/php-pecl-translit.git/commitdiff/7e6a512a2ab9123317b3cede7ae0cf815ead9abb



More information about the pld-cvs-commit mailing list