packages: php-ffmpeg/testsuite.patch - write tests.log to see if any test f...
glen
glen at pld-linux.org
Fri Jun 26 01:46:22 CEST 2009
Author: glen Date: Thu Jun 25 23:46:22 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- write tests.log to see if any test failed
---- Files affected:
packages/php-ffmpeg:
testsuite.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/php-ffmpeg/testsuite.patch
diff -u packages/php-ffmpeg/testsuite.patch:1.1 packages/php-ffmpeg/testsuite.patch:1.2
--- packages/php-ffmpeg/testsuite.patch:1.1 Fri Jun 26 01:23:14 2009
+++ packages/php-ffmpeg/testsuite.patch Fri Jun 26 01:46:17 2009
@@ -15,7 +15,7 @@
- at if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
+ INI_FILES=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file(), "\n"; foreach (explode(",\n", trim(php_ini_scanned_files())) as $$a) echo $$a, "\n";'`; \
+ if test "$$INI_FILES"; then \
-+ $(EGREP) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' $$INI_FILES > $(top_builddir)/tmp-php.ini; \
++ $(EGREP) -hv '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' $$INI_FILES > $(top_builddir)/tmp-php.ini; \
+ else \
+ echo > $(top_builddir)/tmp-php.ini; \
+ fi; \
@@ -24,7 +24,7 @@
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \
- $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \
-+ $(PHP_EXECUTABLE) -d 'display_errors=stderr' -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -d extension_dir=modules/ -d extension=gd.$(SHLIB_DL_SUFFIX_NAME) -d extension=ffmpeg.$(SHLIB_DL_SUFFIX_NAME) -d ffmpeg.allow_persistent=On -c $(top_builddir)/tmp-php.ini tests/; \
++ $(PHP_EXECUTABLE) -d 'display_errors=stderr' $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -w tests.log -d extension_dir=modules/ -d extension=gd.$(SHLIB_DL_SUFFIX_NAME) -d extension=ffmpeg.$(SHLIB_DL_SUFFIX_NAME) -d ffmpeg.allow_persistent=On -c $(top_builddir)/tmp-php.ini tests/; \
+ rm -f $(top_builddir)/modules/gd.$(SHLIB_DL_SUFFIX_NAME); \
elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-ffmpeg/testsuite.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list