diff options
author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-12-24 14:27:53 -0200 |
---|---|---|
committer | Gabriel Caruso <carusogabriel34@gmail.com> | 2019-01-22 19:17:27 -0200 |
commit | 04723f21017c6ecd4c8d449d2801c2c79c7ecabd (patch) | |
tree | 6ba652750b078061ff3764d4a7434693cd9d636b | |
parent | 89a4c172e24d7eb2be7f272a6075634a14f1d791 (diff) | |
download | php-git-04723f21017c6ecd4c8d449d2801c2c79c7ecabd.tar.gz |
Make more tests run os MacOS
6 files changed, 3 insertions, 22 deletions
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt index d738373856..ddebad4f8c 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt @@ -5,9 +5,6 @@ Test symlink(), linkinfo(), link() and is_link() functions : usage variations - if ( substr(PHP_OS, 0, 3) == 'WIN' ) { die('skip no symlinks on Windows'); } -if ( substr(PHP_OS, 0, 3) == 'MAC' ) { - die('skip Not valid for MacOS'); -} // Skip if being run by root (files are always readable, writeable and executable) $filename = dirname(__FILE__)."/symlink_link_linkinfo_is_link6_check_root.tmp"; diff --git a/ext/standard/tests/general_functions/getservbyname_variation10.phpt b/ext/standard/tests/general_functions/getservbyname_variation10.phpt index 4779efdcaf..db1d47f3ef 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation10.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation10.phpt @@ -1,11 +1,5 @@ --TEST-- Test function getservbyname() by substituting argument 2 with emptyUnsetUndefNull values. ---SKIPIF-- -<?php -if(PHP_OS == 'Darwin') { - die("skip.. Mac OS X is fine with NULLs in getservbyname"); -} -?> --FILE-- <?php diff --git a/ext/standard/tests/general_functions/getservbyname_variation9.phpt b/ext/standard/tests/general_functions/getservbyname_variation9.phpt index 720dbf0fbc..2719679b30 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation9.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation9.phpt @@ -1,11 +1,5 @@ --TEST-- Test function getservbyname() by substituting argument 2 with boolean values. ---SKIPIF-- -<?php -if(PHP_OS == 'Darwin') { - die("skip.. Mac OS X is fine with NULLs in getservbyname"); -} -?> --FILE-- <?php diff --git a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt index 99ab02a60d..d44c04e5dd 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt @@ -3,10 +3,11 @@ Test gettype() & settype() functions : usage variations --SKIPIF-- <?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); -?> -if ( strtoupper( substr(PHP_OS, 0, 3) ) == 'MAC' ) { + +if (PHP_OS_FAMILY === 'Darwin') { die('skip Do not run on MacOS'); } +?> --INI-- precision=14 --FILE-- diff --git a/ext/standard/tests/math/ceil_basic.phpt b/ext/standard/tests/math/ceil_basic.phpt index 9e06267d22..275ed485c2 100644 --- a/ext/standard/tests/math/ceil_basic.phpt +++ b/ext/standard/tests/math/ceil_basic.phpt @@ -2,10 +2,6 @@ Test ceil() - basic function test for ceil() --INI-- precision=14 ---SKIPIF-- -if (strtolower(PHP_OS) == 'darwin') { - die('SKIP OSX does weird things with -0 so this test doesn't work there'); -} --FILE-- <?php /* Prototype : float ceil ( float $value ) diff --git a/ext/standard/tests/misc/time_nanosleep_error3.phpt b/ext/standard/tests/misc/time_nanosleep_error3.phpt index d10ef922d0..a419e82d0c 100644 --- a/ext/standard/tests/misc/time_nanosleep_error3.phpt +++ b/ext/standard/tests/misc/time_nanosleep_error3.phpt @@ -2,7 +2,6 @@ time_nanosleep — Delay for a number of seconds and nanoseconds --SKIPIF-- <?php -if (strpos(strtoupper(PHP_OS), 'WIN') !== false) die("skip Test is not valid for Windows"); if (!function_exists('time_nanosleep')) die("skip"); ?> --CREDITS-- |