diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-01-20 08:56:09 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-01-20 08:56:09 +0300 |
| commit | d975f63f73ea806ae9cffca6eabce3befd904710 (patch) | |
| tree | 265c3a8935fc2dc0a25292189eb9f712e66a6a1a | |
| parent | 8dc3c283b892e17f83a5f98310a6955fcbda6fb6 (diff) | |
| parent | 5c88d112430d58da1bd86653603262fb8f86c041 (diff) | |
| download | php-git-d975f63f73ea806ae9cffca6eabce3befd904710.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Update remaining octal 32-bit tests
| -rw-r--r-- | Zend/tests/oct_overflow_32bit.phpt | 6 | ||||
| -rw-r--r-- | ext/standard/tests/file/fscanf_variation33.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/file/fscanf_variation39.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/file/fscanf_variation9.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/general_functions/intval.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/general_functions/is_int.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/strings/printf_basic8.phpt | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/Zend/tests/oct_overflow_32bit.phpt b/Zend/tests/oct_overflow_32bit.phpt index d27c1f547c..5b62778e40 100644 --- a/Zend/tests/oct_overflow_32bit.phpt +++ b/Zend/tests/oct_overflow_32bit.phpt @@ -10,9 +10,9 @@ precision=14 $doubles = array( 076545676543223, 032325463734, - 077777797777777, - 07777777777777977777777777, - 03333333333333382222222222222, + 0777777, + 07777777777777, + 033333333333333, ); foreach ($doubles as $d) { diff --git a/ext/standard/tests/file/fscanf_variation33.phpt b/ext/standard/tests/file/fscanf_variation33.phpt index 2dc404ac76..b36598c72c 100644 --- a/ext/standard/tests/file/fscanf_variation33.phpt +++ b/ext/standard/tests/file/fscanf_variation33.phpt @@ -43,7 +43,7 @@ $valid_ints = array( 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal - 01912, // should be quivalent to octal 1 + 01, // should be quivalent to octal 1 -020000000000, // max negative integer as octal 017777777777 // max positive integer as octal ); diff --git a/ext/standard/tests/file/fscanf_variation39.phpt b/ext/standard/tests/file/fscanf_variation39.phpt index 30d299662a..1ed250c36c 100644 --- a/ext/standard/tests/file/fscanf_variation39.phpt +++ b/ext/standard/tests/file/fscanf_variation39.phpt @@ -43,7 +43,7 @@ $valid_ints = array( 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal - 01912, // should be quivalent to octal 1 + 01, // should be quivalent to octal 1 -020000000000, // max negative integer as octal 017777777777 // max positive integer as octal ); diff --git a/ext/standard/tests/file/fscanf_variation9.phpt b/ext/standard/tests/file/fscanf_variation9.phpt index 609c3ef139..e4cc6fa3b3 100644 --- a/ext/standard/tests/file/fscanf_variation9.phpt +++ b/ext/standard/tests/file/fscanf_variation9.phpt @@ -44,7 +44,7 @@ $integer_values = array ( 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal - 01912, // should be quivalent to octal 1 + 01, // should be quivalent to octal 1 -020000000000, // max negative integer as octal 017777777777 // max positive integer as octal ); diff --git a/ext/standard/tests/general_functions/intval.phpt b/ext/standard/tests/general_functions/intval.phpt index 095d66e3f2..a22b747e55 100644 --- a/ext/standard/tests/general_functions/intval.phpt +++ b/ext/standard/tests/general_functions/intval.phpt @@ -28,7 +28,7 @@ $valid_ints = array( '0x7fffffff', // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal '0123', // integer as octal - 01912, // should be quivalent to octal 1 + 01, // should be quivalent to octal 1 -020000000000, // max negative integer as octal 017777777777, // max positive integer as octal ); diff --git a/ext/standard/tests/general_functions/is_int.phpt b/ext/standard/tests/general_functions/is_int.phpt index 3aed0c9f17..eccaa1995c 100644 --- a/ext/standard/tests/general_functions/is_int.phpt +++ b/ext/standard/tests/general_functions/is_int.phpt @@ -28,7 +28,7 @@ $valid_ints = array( 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal 0123, // integer as octal - 01912, // should be quivalent to octal 1 + 01, // should be quivalent to octal 1 -020000000000, // max negative integer as octal 017777777777, // max positive integer as octal ); diff --git a/ext/standard/tests/strings/printf_basic8.phpt b/ext/standard/tests/strings/printf_basic8.phpt index 0e028ea9d7..4127bc637f 100644 --- a/ext/standard/tests/strings/printf_basic8.phpt +++ b/ext/standard/tests/strings/printf_basic8.phpt @@ -22,7 +22,7 @@ $format2 = "%o %o"; $format3 = "%o %o %o"; $arg1 = 021; $arg2 = -0347; -$arg3 = 05678; +$arg3 = 0567; echo "\n-- Calling printf() with no arguments --\n"; $result = printf($format); |