summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Caruso <carusogabriel34@gmail.com>2018-07-27 00:19:13 -0300
committerGabriel Caruso <carusogabriel34@gmail.com>2018-07-30 09:43:09 -0300
commit9c8b3ae43fc4cfb5818dccc5f48f4ee1ba967fa1 (patch)
treeea1cf9adef4cc5eb356f1308f626d3c93f6c59f2
parent4a1336de7c93fd6504fcad26b0b048db4b0ca885 (diff)
downloadphp-git-9c8b3ae43fc4cfb5818dccc5f48f4ee1ba967fa1.tar.gz
Make more tests run on 64bit plataforms
-rw-r--r--Zend/tests/bug74603.phpt4
-rw-r--r--Zend/tests/oct_overflow.phpt (renamed from Zend/tests/oct_overflow_32bit.phpt)2
-rw-r--r--ext/exif/tests/exif_tagname_variation1.phpt4
-rw-r--r--ext/json/tests/pass001.1.phpt3
-rw-r--r--ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt3
-rw-r--r--ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt3
-rw-r--r--ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt3
-rw-r--r--ext/standard/tests/general_functions/debug_zval_dump_b.phptbin4554 -> 4461 bytes
-rw-r--r--ext/standard/tests/general_functions/print_r.phpt4
-rw-r--r--ext/standard/tests/mail/ezmlm_hash_basic.phpt6
-rw-r--r--ext/standard/tests/strings/crc32_basic.phpt8
-rw-r--r--ext/standard/tests/strings/crc32_error.phpt8
-rw-r--r--ext/standard/tests/strings/strripos_offset.phpt2
-rw-r--r--ext/standard/tests/strings/strrpos_offset.phpt2
-rw-r--r--tests/lang/operators/bitwiseShiftLeft_variationStr.phpt4
-rw-r--r--tests/lang/operators/operator_gt_variation.phpt4
-rw-r--r--tests/lang/operators/operator_lt_variation.phpt4
17 files changed, 5 insertions, 59 deletions
diff --git a/Zend/tests/bug74603.phpt b/Zend/tests/bug74603.phpt
index b3194ecd48..5a5e40292e 100644
--- a/Zend/tests/bug74603.phpt
+++ b/Zend/tests/bug74603.phpt
@@ -1,9 +1,5 @@
--TEST--
Bug #74603 (PHP INI Parsing Stack Buffer Overflow Vulnerability)
---SKIPIF--
-<?php
-if (PHP_INT_MAX !== 2147483647)
- die('skip for 32-bit only');
--FILE--
<?php
var_dump(parse_ini_file(__DIR__ . "/bug74603.ini", true, INI_SCANNER_NORMAL));
diff --git a/Zend/tests/oct_overflow_32bit.phpt b/Zend/tests/oct_overflow.phpt
index 5b62778e40..77e4d2a8bc 100644
--- a/Zend/tests/oct_overflow_32bit.phpt
+++ b/Zend/tests/oct_overflow.phpt
@@ -2,8 +2,6 @@
testing integer overflow (32bit)
--INI--
precision=14
---SKIPIF--
-<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
--FILE--
<?php
diff --git a/ext/exif/tests/exif_tagname_variation1.phpt b/ext/exif/tests/exif_tagname_variation1.phpt
index 207b200aac..d6dd0ffc97 100644
--- a/ext/exif/tests/exif_tagname_variation1.phpt
+++ b/ext/exif/tests/exif_tagname_variation1.phpt
@@ -1,9 +1,7 @@
--TEST--
Test exif_tagname() function : usage variations - different types for index argument
--SKIPIF--
-<?php if (!extension_loaded('exif')) print 'skip exif extension not available';
-if (PHP_INT_SIZE != 4) die('skip 32-bit only');
-?>
+<?php if (!extension_loaded('exif')) print 'skip exif extension not available'; ?>
--FILE--
<?php
diff --git a/ext/json/tests/pass001.1.phpt b/ext/json/tests/pass001.1.phpt
index aced88fee2..7ac87cbdd8 100644
--- a/ext/json/tests/pass001.1.phpt
+++ b/ext/json/tests/pass001.1.phpt
@@ -4,8 +4,7 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json)
serialize_precision=-1
--SKIPIF--
<?php
-if (!extension_loaded('json')) die('skip');
-if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
+if (!extension_loaded('json')) die('skip json extension not loaded');
?>
--FILE--
<?php
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt
index 8aae9b3bca..7e8b5b24cf 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt
@@ -8,9 +8,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
if (substr(PHP_OS, 0, 3) == 'SUN') {
die('skip Not valid for Sun Solaris');
}
-if (PHP_INT_SIZE != 4) {
- die("skip this test is for 32bit platform only");
-}
?>
--FILE--
<?php
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt
index 98ce6211da..0386e64415 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt
@@ -5,9 +5,6 @@ Test symlink(), linkinfo(), link() and is_link() functions : error conditions -
if (substr(PHP_OS, 0, 3) == 'WIN') {
die('skip no symlinks on Windows');
}
-if (PHP_INT_SIZE != 4) {
- die("skip this test is for 32bit platform only");
-}
?>
--FILE--
<?php
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 9b9afba10d..e2f30cdfda 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
@@ -8,9 +8,6 @@ if ( substr(PHP_OS, 0, 3) == 'WIN' ) {
if ( substr(PHP_OS, 0, 3) == 'MAC' ) {
die('skip Not valid for MacOS');
}
-if (PHP_INT_SIZE != 4) {
- die("skip this test is for 32bit platform only");
-}
// 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/debug_zval_dump_b.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt
index ec8e0a66ed..5c6fe36523 100644
--- a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt
+++ b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt
Binary files differ
diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt
index e502f61291..5069dd33f1 100644
--- a/ext/standard/tests/general_functions/print_r.phpt
+++ b/ext/standard/tests/general_functions/print_r.phpt
@@ -1,9 +1,5 @@
--TEST--
Test print_r() function
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
-?>
--INI--
precision=14
--FILE--
diff --git a/ext/standard/tests/mail/ezmlm_hash_basic.phpt b/ext/standard/tests/mail/ezmlm_hash_basic.phpt
index 2f810e2562..da629e9e12 100644
--- a/ext/standard/tests/mail/ezmlm_hash_basic.phpt
+++ b/ext/standard/tests/mail/ezmlm_hash_basic.phpt
@@ -1,9 +1,5 @@
--TEST--
-Test ezmlm_hash() function : basic functionality
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
-?>
+Test ezmlm_hash() function : basic functionality
--FILE--
<?php
/* Prototype : int ezmlm_hash ( string $addr )
diff --git a/ext/standard/tests/strings/crc32_basic.phpt b/ext/standard/tests/strings/crc32_basic.phpt
index 3aa780d113..2ddc2f9618 100644
--- a/ext/standard/tests/strings/crc32_basic.phpt
+++ b/ext/standard/tests/strings/crc32_basic.phpt
@@ -1,11 +1,5 @@
--TEST--
-Test crc32() function : basic functionality
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4)
- die("skip this test is for 32bit platform only");
-?>
-
+Test crc32() function : basic functionality
--FILE--
<?php
/* Prototype : string crc32(string $str)
diff --git a/ext/standard/tests/strings/crc32_error.phpt b/ext/standard/tests/strings/crc32_error.phpt
index 45378204cd..71798ed002 100644
--- a/ext/standard/tests/strings/crc32_error.phpt
+++ b/ext/standard/tests/strings/crc32_error.phpt
@@ -1,11 +1,5 @@
--TEST--
-Test crc32() function : error conditions
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4)
- die("skip this test is for 32bit platform only");
-?>
-
+Test crc32() function : error conditions
--FILE--
<?php
/* Prototype : string crc32(string $str)
diff --git a/ext/standard/tests/strings/strripos_offset.phpt b/ext/standard/tests/strings/strripos_offset.phpt
index 080f87050d..81e4e2ba8a 100644
--- a/ext/standard/tests/strings/strripos_offset.phpt
+++ b/ext/standard/tests/strings/strripos_offset.phpt
@@ -1,7 +1,5 @@
--TEST--
strripos() offset integer overflow
---SKIPIF--
-<?php if (PHP_INT_SIZE !== 4) die("skip this test is for 32-bit only");
--FILE--
<?php
diff --git a/ext/standard/tests/strings/strrpos_offset.phpt b/ext/standard/tests/strings/strrpos_offset.phpt
index 72f0c5f528..6ecab108dc 100644
--- a/ext/standard/tests/strings/strrpos_offset.phpt
+++ b/ext/standard/tests/strings/strrpos_offset.phpt
@@ -1,7 +1,5 @@
--TEST--
strrpos() offset integer overflow
---SKIPIF--
-<?php if (PHP_INT_SIZE !== 4) die("skip this test is for 32-bit only");
--FILE--
<?php
diff --git a/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt b/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
index 0176d90738..7300eca02c 100644
--- a/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
+++ b/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
@@ -1,9 +1,5 @@
--TEST--
Test << operator : various numbers as strings
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
-?>
--FILE--
<?php
diff --git a/tests/lang/operators/operator_gt_variation.phpt b/tests/lang/operators/operator_gt_variation.phpt
index ff15550dbe..937ebbbb63 100644
--- a/tests/lang/operators/operator_gt_variation.phpt
+++ b/tests/lang/operators/operator_gt_variation.phpt
@@ -1,9 +1,5 @@
--TEST--
Test > operator : max int 32bit range
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
-?>
--FILE--
<?php
diff --git a/tests/lang/operators/operator_lt_variation.phpt b/tests/lang/operators/operator_lt_variation.phpt
index 4f468638dc..f210fe4657 100644
--- a/tests/lang/operators/operator_lt_variation.phpt
+++ b/tests/lang/operators/operator_lt_variation.phpt
@@ -1,9 +1,5 @@
--TEST--
Test < operator : max int 32bit range
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
-?>
--FILE--
<?php