fix-test-run.patch

   1 --- php-5.3.2/configure.in~     2010-03-16 12:16:56.000000000 +0200
   2 +++ php-5.3.2/configure.in      2010-03-16 16:13:24.926435546 +0200
   3 @@ -1224,6 +1224,11 @@
   4  PHP_SUBST(PHP_CLI_OBJS)
   5  PHP_SUBST(PHP_GLOBAL_OBJS)
   6
   7 +# shift so that pcre, spl, ... are loaded first
   8 +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,')
   9 +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/spl.la \),\2\1,')
  10 +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/pcre.la \),\2\1,')
  11 +
  12  PHP_SUBST(PHP_MODULES)
  13  PHP_SUBST(PHP_ZEND_EX)
  14
  15 --- php-5.3.2/Makefile.global   2010-03-16 16:14:24.340804566 +0200
  16 +++ php-5.3.2/Makefile.global   2010-03-16 16:31:36.972576955 +0200
  17 @@ -77,7 +77,7 @@
  18                 done; \
  19         fi
  20
  21 -PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
  22 +PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
  23  PHP_TEST_SHARED_EXTENSIONS =  ` \
  24         if test "x$(PHP_MODULES)" != "x"; then \
  25                 for i in $(PHP_MODULES)""; do \
  26 @@ -92,7 +92,7 @@
  27  PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
  28
  29  test: all
  30 -       -@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
  31 +       -@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
  32                 INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
  33                 if test "$$INI_FILE"; then \
  34                         $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
  35 @@ -320,7 +320,10 @@
  36                 TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
  37                 TEST_PHP_SRCDIR=$(top_srcdir) \
  38                 CC="$(CC)" \
  39 -                       $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(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) $(TESTS); \
  40 +                       $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
  41 +                       -d extension_dir=$(top_builddir)/modules/ -d 'extension=pcre.$(SHLIB_DL_SUFFIX_NAME)' \
  42 +                       $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
  43 +                       -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_ARGS) $(TESTS); \
  44         else \
  45                 echo "ERROR: Cannot run tests without CLI sapi."; \
  46         fi