diff options
| author | Remi Collet <remi@php.net> | 2012-12-19 10:25:05 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2012-12-19 10:25:05 +0100 |
| commit | 828bb4d44d9d07cb2510dc0bced1da931b78791c (patch) | |
| tree | 221c663bd9efc512d3caa1fa4e33f74cb7e18b7c | |
| parent | d53f1bf8ab326a6fd3596a5f265d04bf49de74fe (diff) | |
| parent | 3732fa95c50a4cfc6f4e029635ec4976263ee5dc (diff) | |
| download | php-git-828bb4d44d9d07cb2510dc0bced1da931b78791c.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix failing test on Linux build
| -rw-r--r-- | ext/sockets/tests/bug49341.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/sockets/tests/bug49341.phpt b/ext/sockets/tests/bug49341.phpt index c165ac7d68..961b5e7bc8 100644 --- a/ext/sockets/tests/bug49341.phpt +++ b/ext/sockets/tests/bug49341.phpt @@ -6,7 +6,7 @@ if (!extension_loaded('sockets')) { die('skip sockets extension not available.'); } if (PHP_OS !== 'Darwin' && false === strpos(PHP_OS, 'BSD')) { - die('is not *BSD.'); + die('skip is not *BSD.'); } --FILE-- <?php |