diff options
| author | Slater, Joseph <joe.slater@windriver.com> | 2019-05-21 13:40:22 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-05-21 17:52:23 -0700 |
| commit | 3327944ba5c3450ea36ce0bf7d08299f090fe87d (patch) | |
| tree | 90b7bcc567d78bc3a2ec978f3e2c81d885c46c46 | |
| parent | 33d578bda52b1b15026aa8d4416770a52d0fc057 (diff) | |
| download | meta-openembedded-3327944ba5c3450ea36ce0bf7d08299f090fe87d.tar.gz | |
php-7: mark two tests as expected to fail
The output is reasonable, but not what is expected.
Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch | 34 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php_7.3.4.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch b/meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch new file mode 100644 index 0000000000..21057439c9 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | php-ptest: xfail two tests | ||
| 2 | |||
| 3 | If and when these tests are modified to expect the correct output, they will | ||
| 4 | succeed and generate warnings in the test summary. This patch can then be removed. | ||
| 5 | |||
| 6 | Note that we add a closing '?>' to one test so that it can be executed directly by php. | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | |||
| 10 | Signed-off-By: Joe Slater <joe.slater@windriver.com> | ||
| 11 | |||
| 12 | |||
| 13 | --- a/tests/basic/bug71273.phpt | ||
| 14 | +++ b/tests/basic/bug71273.phpt | ||
| 15 | @@ -16,6 +16,8 @@ Bug #71273 A wrong ext directory setup i | ||
| 16 | var_dump(preg_match(",.+a[\\/].+[\\/]w.php_kartoffelbrei.dll.+,s", $out)); | ||
| 17 | ?> | ||
| 18 | ==DONE== | ||
| 19 | +--XFAIL-- | ||
| 20 | +Output is int(0), not int(1) | ||
| 21 | --EXPECT-- | ||
| 22 | int(1) | ||
| 23 | ==DONE== | ||
| 24 | --- a/tests/run-test/bug75042-3.phpt | ||
| 25 | +++ b/tests/run-test/bug75042-3.phpt | ||
| 26 | @@ -8,5 +8,8 @@ display_errors=1 | ||
| 27 | nonexistentsharedmodule | ||
| 28 | --FILE-- | ||
| 29 | <?php | ||
| 30 | +?> | ||
| 31 | +--XFAIL-- | ||
| 32 | +No warning message printed. | ||
| 33 | --EXPECTF-- | ||
| 34 | PHP Warning: PHP Startup: Unable to load dynamic library '%snonexistentsharedmodule.%s' %A | ||
diff --git a/meta-oe/recipes-devtools/php/php_7.3.4.bb b/meta-oe/recipes-devtools/php/php_7.3.4.bb index 1a5c9760de..4e577df18c 100644 --- a/meta-oe/recipes-devtools/php/php_7.3.4.bb +++ b/meta-oe/recipes-devtools/php/php_7.3.4.bb | |||
| @@ -11,6 +11,7 @@ SRC_URI_append_class-target = " \ | |||
| 11 | file://pear-makefile.patch \ | 11 | file://pear-makefile.patch \ |
| 12 | file://phar-makefile.patch \ | 12 | file://phar-makefile.patch \ |
| 13 | file://0001-opcache-config.m4-enable-opcache.patch \ | 13 | file://0001-opcache-config.m4-enable-opcache.patch \ |
| 14 | file://xfail_two_bug_tests.patch \ | ||
| 14 | " | 15 | " |
| 15 | 16 | ||
| 16 | SRC_URI[md5sum] = "efb58aea95a66738d871f83ec55fec6f" | 17 | SRC_URI[md5sum] = "efb58aea95a66738d871f83ec55fec6f" |
