Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4: Fix test - on CI somebody could create a process in the meantime
12 years ago · b727934591
1 changed files with 2 additions and 2 deletions
--- 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====
-  
+