com php-src: Update remaining octal 32-bit tests: Zend/tests/oc t_overflow_32bit.phpt ext/standard/tests/file/fscan f_variation33.phpt
ext/standard/tests/file/fscanf_v ariation39.phpt ext/standard/tests/file/fscanf_variat ion9.phpt ext/standard/tests/general_functions/intval .phpt
ext/standard/tests/general_functions/is_int.php t ext/standard/tests/strings/printf_basic8.phpt
| From: | ajf@php.net | Date: | Tue, 20 Jan 2015 05:54:13 +0000 |
| Subject: | com php-src: Update remaining octal 32-bit tests: Zend/tests/oc t_overflow_32bit.phpt ext/standard/tests/file/fscan f_variation33.phpt ext/standard/tests/file/fscanf_v ariation39.phpt ext/standard/tests/file/fscanf_variat ion9.phpt ext/standard/tests/general_functions/intval .phpt ext/standard/tests/general_functions/is_int.php t ext/standard/tests/strings/printf_basic8.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84195@lists.php.net to get a copy of this message | ||
Commit: 5c88d112430d58da1bd86653603262fb8f86c041
Author: Andrea Faulds <ajf@ajf.me> Tue, 20 Jan 2015 05:54:13 +0000
Parents: 6f67d5ad6e81d2763af320240ed88db3a981fdca
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5c88d112430d58da1bd86653603262fb8f86c041
Log:
Update remaining octal 32-bit tests
Changed paths:
M Zend/tests/oct_overflow_32bit.phpt
M ext/standard/tests/file/fscanf_variation33.phpt
M ext/standard/tests/file/fscanf_variation39.phpt
M ext/standard/tests/file/fscanf_variation9.phpt
M ext/standard/tests/general_functions/intval.phpt
M ext/standard/tests/general_functions/is_int.phpt
M ext/standard/tests/strings/printf_basic8.phpt
Diff:
diff --git a/Zend/tests/oct_overflow_32bit.phpt b/Zend/tests/oct_overflow_32bit.phpt
index d27c1f5..5b62778 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 2dc404a..b36598c 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 30d2996..1ed250c 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 609c3ef..e4cc6fa 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 095d66e..a22b747 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 3aed0c9..eccaa19 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 0e028ea..4127bc6 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);