SPECS (AC-branch): php.spec - HEAD merge (tests in %check was bad ...

[glen]

Author: glen                         Date: Fri Jun  1 08:47:25 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge (tests in %check was bad idea -- no way to disable)

---- Files affected:
SPECS:
   php.spec (1.631.2.39 -> 1.631.2.40) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.631.2.39 SPECS/php.spec:1.631.2.40
--- SPECS/php.spec:1.631.2.39	Fri Jun  1 10:43:53 2007
+++ SPECS/php.spec	Fri Jun  1 10:47:19 2007
@@ -71,10 +71,6 @@
 %undefine	with_filter
 %endif
 
-%if %{without tests}
-%define	check	%{nil}
-%endif
-
 %define	_rel 1
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr):	Le langage de script embarque-HTML PHP
@@ -1832,12 +1828,13 @@
 cp -af php_config.h.cli main/php_config.h
 %{__make} sapi/cli/php -f Makefile.cli LDFLAGS=-lpthread
 
-%check
+%if %{with tests}
 # Run tests, using the CLI SAPI
 export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
 unset TZ LANG LC_ALL || :
 %{__make} test
 unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -2734,6 +2731,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.631.2.40  2007/06/01 08:47:19  glen
+- HEAD merge (tests in %check was bad idea -- no way to disable)
+
 Revision 1.631.2.39  2007/06/01 08:43:53  glen
 - fix cgi/fcgi build/install
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.631.2.39&r2=1.631.2.40&f=u