Skip to content

Commit 0ae2328

Browse files
committed
Merge branch 'PHP-5.6'
* PHP-5.6: fix test - doesn't seem to produce warning Fix test - on CI somebody could create a process in the meantime
2 parents 46070e9 + bfbb409 commit 0ae2328

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

ext/mysqli/tests/mysqli_store_result_buffered_c.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,4 @@ mysqlnd.debug=d:t:O,/tmp/mysqlnd.trace
3838
require_once("clean_table.inc");
3939
?>
4040
--EXPECTF--
41-
Warning: mysqli_store_result(): Couldn't fetch mysqli in %s on line %d
42-
done!
41+
done!

ext/posix/tests/posix_kill_basic.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ Basic test of POSIX getpgid(), kill(), get_last_error() and strerror() functions
3434
Kill pid=%d
3535
bool(false)
3636
int(%d)
37-
string(%d) %sNo such process%s
37+
string(%d) %s%rNo such process|Operation not permitted%r%s
3838
===DONE====
39-
39+

0 commit comments

Comments
 (0)