]> TLD Linux GIT Repositories - packages/php.git/blob - fix-test-run.patch
- updated to 8.1.28
[packages/php.git] / fix-test-run.patch
1 diff -urNp -x '*.orig' php-8.1.21.org/build/Makefile.global php-8.1.21/build/Makefile.global
2 --- php-8.1.21.org/build/Makefile.global        2023-07-10 19:20:41.273462676 +0200
3 +++ php-8.1.21/build/Makefile.global    2023-07-10 19:20:42.545480764 +0200
4 @@ -81,8 +81,15 @@ install-headers:
5                 done; \
6         fi
7  
8 -PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
9 +PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
10 +PHP_TEST_SHARED_SYSTEM_EXTENSIONS =
11  PHP_TEST_SHARED_EXTENSIONS =  ` \
12 +       if test "x$(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)" != "x"; then \
13 +               for i in $(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)""; do \
14 +                       dlname=$$i.$(SHLIB_DL_SUFFIX_NAME); \
15 +                       $(top_srcdir)/build/shtool echo -n -- " -d extension=$(EXTENSION_DIR)/$$dlname"; \
16 +               done; \
17 +       fi; \
18         if test "x$(PHP_MODULES)" != "x"; then \
19                 for i in $(PHP_MODULES)""; do \
20                         . $$i; \
21 @@ -114,7 +121,9 @@ test: all
22                 TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
23                 TEST_PHP_SRCDIR=$(top_srcdir) \
24                 CC="$(CC)" \
25 -                       $(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); \
26 +                       $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
27 +                       $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
28 +                       -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
29                 TEST_RESULT_EXIT_CODE=$$?; \
30                 rm $(top_builddir)/tmp-php.ini; \
31                 exit $$TEST_RESULT_EXIT_CODE; \
32 diff -urNp -x '*.orig' php-8.1.21.org/configure.ac php-8.1.21/configure.ac
33 --- php-8.1.21.org/configure.ac 2023-07-10 19:20:41.283462818 +0200
34 +++ php-8.1.21/configure.ac     2023-07-10 19:20:42.545480764 +0200
35 @@ -1430,6 +1430,9 @@ if test -n "${PHP_BUILD_ARCH}"; then
36    AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture])
37  fi
38  
39 +# shift so that extensions like xml are loaded first
40 +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,')
41 +
42  PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
43  
44  PHP_SUBST(PHP_FASTCGI_OBJS)