diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/php')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf | 4 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch | 34 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.6.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.4.bb) | 5 |
3 files changed, 39 insertions, 4 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf b/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf index 77cdd82a7..ef79a0cc9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf @@ -1,6 +1,6 @@ # Taken from http://wiki.apache.org/httpd/PHP-FPM -LoadModule proxy_module lib/apache2/modules/mod_proxy.so -LoadModule proxy_fcgi_module lib/apache2/modules/mod_proxy_fcgi.so +LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so +LoadModule proxy_fcgi_module /usr/lib/apache2/modules/mod_proxy_fcgi.so ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/usr/share/apache2/htdocs/ diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch new file mode 100644 index 000000000..21057439c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch @@ -0,0 +1,34 @@ +php-ptest: xfail two tests + +If and when these tests are modified to expect the correct output, they will +succeed and generate warnings in the test summary. This patch can then be removed. + +Note that we add a closing '?>' to one test so that it can be executed directly by php. + +Upstream-Status: Pending + +Signed-off-By: Joe Slater <joe.slater@windriver.com> + + +--- a/tests/basic/bug71273.phpt ++++ b/tests/basic/bug71273.phpt +@@ -16,6 +16,8 @@ Bug #71273 A wrong ext directory setup i + var_dump(preg_match(",.+a[\\/].+[\\/]w.php_kartoffelbrei.dll.+,s", $out)); + ?> + ==DONE== ++--XFAIL-- ++Output is int(0), not int(1) + --EXPECT-- + int(1) + ==DONE== +--- a/tests/run-test/bug75042-3.phpt ++++ b/tests/run-test/bug75042-3.phpt +@@ -8,5 +8,8 @@ display_errors=1 + nonexistentsharedmodule + --FILE-- + <?php ++?> ++--XFAIL-- ++No warning message printed. + --EXPECTF-- + PHP Warning: PHP Startup: Unable to load dynamic library '%snonexistentsharedmodule.%s' %A diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.4.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.6.bb index 1a5c9760d..b1cac1c07 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.6.bb @@ -11,10 +11,11 @@ SRC_URI_append_class-target = " \ file://pear-makefile.patch \ file://phar-makefile.patch \ file://0001-opcache-config.m4-enable-opcache.patch \ + file://xfail_two_bug_tests.patch \ " -SRC_URI[md5sum] = "efb58aea95a66738d871f83ec55fec6f" -SRC_URI[sha256sum] = "2e2c3d8212c83649e443b61efffbd03df4b9edd0f9c7a679081fe4cb2da12b78" +SRC_URI[md5sum] = "bde9a912fb311182cd460dad1abbc247" +SRC_URI[sha256sum] = "1e5ac8700154835c0910e3a814517da9b87bb4a82cc7011fea1a82096b6f6f77" PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ --with-pdo-mysql=mysqlnd \ |