diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-14 15:48:33 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-14 15:48:33 -0700 |
| commit | 0ae2328c445f26f757fa84b98c7047a5fda2f50b (patch) | |
| tree | 076f7bbbaefcb6d3a6e57a3bd6d03709268757f4 | |
| parent | 46070e956cf3bec9cc0fafb75701f196b7b9d3c3 (diff) | |
| parent | bfbb409b32493d7510a943c1201caa89484a0f65 (diff) | |
| download | php-git-0ae2328c445f26f757fa84b98c7047a5fda2f50b.tar.gz | |
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
| -rw-r--r-- | ext/mysqli/tests/mysqli_store_result_buffered_c.phpt | 3 | ||||
| -rw-r--r-- | ext/posix/tests/posix_kill_basic.phpt | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt index d580ec430f..2dec703b99 100644 --- a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt +++ b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt @@ -38,5 +38,4 @@ mysqlnd.debug=d:t:O,/tmp/mysqlnd.trace require_once("clean_table.inc"); ?> --EXPECTF-- -Warning: mysqli_store_result(): Couldn't fetch mysqli in %s on line %d -done!
\ No newline at end of file +done! diff --git a/ext/posix/tests/posix_kill_basic.phpt b/ext/posix/tests/posix_kill_basic.phpt index c995031af4..b68d3cb5db 100644 --- a/ext/posix/tests/posix_kill_basic.phpt +++ b/ext/posix/tests/posix_kill_basic.phpt @@ -34,6 +34,6 @@ Basic test of POSIX getpgid(), kill(), get_last_error() and strerror() functions Kill pid=%d bool(false) int(%d) -string(%d) %sNo such process%s +string(%d) %s%rNo such process|Operation not permitted%r%s ===DONE==== -
\ No newline at end of file + |