packages: php/fix-test-run.patch, php/php.spec - rename RUN_TESTS_ARGS to R...

glen glen at pld-linux.org
Mon Jun 7 20:32:32 CEST 2010


Author: glen                         Date: Mon Jun  7 18:32:32 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rename RUN_TESTS_ARGS to RUN_TESTS_SETTINGS to match other vars

---- Files affected:
packages/php:
   fix-test-run.patch (1.3 -> 1.4) , php.spec (1.871 -> 1.872) 

---- Diffs:

================================================================
Index: packages/php/fix-test-run.patch
diff -u packages/php/fix-test-run.patch:1.3 packages/php/fix-test-run.patch:1.4
--- packages/php/fix-test-run.patch:1.3	Mon Jun  7 20:30:06 2010
+++ packages/php/fix-test-run.patch	Mon Jun  7 20:32:26 2010
@@ -31,7 +31,7 @@
 +			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
 +			-d extension_dir=$(top_builddir)/modules/ -d 'extension=pcre.$(SHLIB_DL_SUFFIX_NAME)' \
 +			$(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
-+			-d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_ARGS) $(TESTS); \
++			-d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
  	else \
  		echo "ERROR: Cannot run tests without CLI sapi."; \
  	fi

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.871 packages/php/php.spec:1.872
--- packages/php/php.spec:1.871	Sun Jun  6 16:48:11 2010
+++ packages/php/php.spec	Mon Jun  7 20:32:26 2010
@@ -2127,7 +2127,7 @@
 cp -af Makefile.cli Makefile
 export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
 unset TZ LANG LC_ALL || :
-%{__make} test RUN_TESTS_ARGS="-s test.log"
+%{__make} test RUN_TESTS_SETTINGS="-s test.log"
 unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_
 
 # collect failed tests into cleanup script used in prep.
@@ -3082,6 +3082,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.872  2010/06/07 18:32:26  glen
+- rename RUN_TESTS_ARGS to RUN_TESTS_SETTINGS to match other vars
+
 Revision 1.871  2010/06/06 14:48:11  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/fix-test-run.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.871&r2=1.872&f=u



More information about the pld-cvs-commit mailing list