diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-14 15:45:53 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-14 15:45:53 -0700 |
| commit | b72793459124f6325bbfa26562697e3e03e63c2b (patch) | |
| tree | 23556eb61eb24604d5705689720c7534eaf1d941 | |
| parent | 793f67e85213f789ace0c766c13815a6025a2059 (diff) | |
| parent | eea75e7146f437ef64d8ba980dff2d9875064a0a (diff) | |
| download | php-git-b72793459124f6325bbfa26562697e3e03e63c2b.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix test - on CI somebody could create a process in the meantime
| -rw-r--r-- | ext/posix/tests/posix_kill_basic.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
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 + |