summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2007-05-14 10:57:04 +0000
committerAntony Dovgal <tony2001@php.net>2007-05-14 10:57:04 +0000
commitb33de5d0aa630cf10f6340622b3d2b8e4ef7c682 (patch)
tree60302183b47084ee69589044a3989680b1808569
parent19d1d24d60f1c6fb8caf2356f061016925ee4f09 (diff)
downloadphp-git-b33de5d0aa630cf10f6340622b3d2b8e4ef7c682.tar.gz
fix tests - make them 32bit only, 64bit version will be later
add --INI-- section remove recursive arrays, that thing should be in a separate test
-rw-r--r--ext/standard/tests/array/array_keys.phpt4
-rw-r--r--ext/standard/tests/array/array_values.phptbin5137 -> 5251 bytes
-rw-r--r--ext/standard/tests/array/end.phpt6
-rw-r--r--ext/standard/tests/general_functions/debug_zval_dump_b.phptbin8294 -> 7244 bytes
-rw-r--r--ext/standard/tests/general_functions/is_float.phpt4
-rw-r--r--ext/standard/tests/general_functions/is_int.phpt4
-rw-r--r--ext/standard/tests/general_functions/print_r.phpt75
-rw-r--r--ext/standard/tests/general_functions/var_dump.phpt80
8 files changed, 37 insertions, 136 deletions
diff --git a/ext/standard/tests/array/array_keys.phpt b/ext/standard/tests/array/array_keys.phpt
index 0d1e05b20c..07bb3446b3 100644
--- a/ext/standard/tests/array/array_keys.phpt
+++ b/ext/standard/tests/array/array_keys.phpt
@@ -1,5 +1,9 @@
--TEST--
Test array_keys() function
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
+?>
--FILE--
<?php
/*
diff --git a/ext/standard/tests/array/array_values.phpt b/ext/standard/tests/array/array_values.phpt
index c4c59b01d0..0aeb5a85a3 100644
--- a/ext/standard/tests/array/array_values.phpt
+++ b/ext/standard/tests/array/array_values.phpt
Binary files differ
diff --git a/ext/standard/tests/array/end.phpt b/ext/standard/tests/array/end.phpt
index d2eaa28451..da9422395e 100644
--- a/ext/standard/tests/array/end.phpt
+++ b/ext/standard/tests/array/end.phpt
@@ -1,5 +1,11 @@
--TEST--
Test end() function
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
+?>
+--INI--
+precision=14
--FILE--
<?php
/* Prototype: mixed end ( array &$array );
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 4b94f31db9..48370fbbc6 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/is_float.phpt b/ext/standard/tests/general_functions/is_float.phpt
index b30f06e7d2..d72a22a5c6 100644
--- a/ext/standard/tests/general_functions/is_float.phpt
+++ b/ext/standard/tests/general_functions/is_float.phpt
@@ -1,5 +1,9 @@
--TEST--
Test is_float() & it's FALIASes: is_double() & is_real() functions
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
+?>
--FILE--
<?php
/* Prototype: bool is_float ( mixed $var );
diff --git a/ext/standard/tests/general_functions/is_int.phpt b/ext/standard/tests/general_functions/is_int.phpt
index fb9aec39c7..2158bcc08b 100644
--- a/ext/standard/tests/general_functions/is_int.phpt
+++ b/ext/standard/tests/general_functions/is_int.phpt
@@ -1,5 +1,9 @@
--TEST--
Test is_int() & it's FALIASes: is_long() & is_integer() functions
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
+?>
--FILE--
<?php
/* Prototype: bool is_int ( mixed $var );
diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt
index 08798ccbde..86bc6e8943 100644
--- a/ext/standard/tests/general_functions/print_r.phpt
+++ b/ext/standard/tests/general_functions/print_r.phpt
@@ -1,7 +1,12 @@
--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--
-
<?php
/* Prototype: bool print_r ( mixed $expression [, bool $return] );
Description: Prints human-readable information about a variable
@@ -135,7 +140,6 @@ $arrays = array (
array(10.5, 5.6),
array("string", "test"),
array('string', 'test'),
- $array1 = array(1,2,3,4, &$array1) // recursive array
);
/* calling check_printr() to display contents of $arrays */
check_printr($arrays);
@@ -955,61 +959,6 @@ Array
[1] => test
)
--- Iteration 16 --
-Array
-(
- [0] => 1
- [1] => 2
- [2] => 3
- [3] => 4
- [4] => Array
- (
- [0] => 1
- [1] => 2
- [2] => 3
- [3] => 4
- [4] => Array
- *RECURSION*
- )
-
-)
-
-Array
-(
- [0] => 1
- [1] => 2
- [2] => 3
- [3] => 4
- [4] => Array
- (
- [0] => 1
- [1] => 2
- [2] => 3
- [3] => 4
- [4] => Array
- *RECURSION*
- )
-
-)
-
-Array
-(
- [0] => 1
- [1] => 2
- [2] => 3
- [3] => 4
- [4] => Array
- (
- [0] => 1
- [1] => 2
- [2] => 3
- [3] => 4
- [4] => Array
- *RECURSION*
- )
-
-)
-
*** Testing print_r() on object variables ***
-- Iteration 1 --
@@ -1538,13 +1487,13 @@ object_class Object
*** Testing print_r() on resources ***
-- Iteration 1 --
-Resource id #%d
-Resource id #%d
-Resource id #%d
+Resource id #5
+Resource id #5
+Resource id #5
-- Iteration 2 --
-Resource id #%d
-Resource id #%d
-Resource id #%d
+Resource id #6
+Resource id #6
+Resource id #6
*** Testing print_r() on different combinations of scalar
and non-scalar variables ***
diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt
index 9908884354..6f5e46b295 100644
--- a/ext/standard/tests/general_functions/var_dump.phpt
+++ b/ext/standard/tests/general_functions/var_dump.phpt
@@ -1,7 +1,12 @@
--TEST--
Test var_dump() function
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
+?>
+--INI--
+precision=14
--FILE--
-
<?php
/* Prototype: void var_dump ( mixed $expression [, mixed $expression [, $...]] );
Description: Displays structured information about one or more expressions that includes its type and value.
@@ -128,7 +133,6 @@ $arrays = array (
array(10.5, 5.6),
array("string", "test"),
array('string', 'test'),
- $array1 = array(1,2,3,4, &$array1) // recursive array
);
/* calling check_vardump() to display contents of an array
using var_dump() */
@@ -567,41 +571,6 @@ array(2) {
[1]=>
string(4) "test"
}
--- Iteration 16 --
-array(5) {
- [0]=>
- int(1)
- [1]=>
- int(2)
- [2]=>
- int(3)
- [3]=>
- int(4)
- [4]=>
- &array(5) {
- [0]=>
- int(1)
- [1]=>
- int(2)
- [2]=>
- int(3)
- [3]=>
- int(4)
- [4]=>
- &array(5) {
- [0]=>
- int(1)
- [1]=>
- int(2)
- [2]=>
- int(3)
- [3]=>
- int(4)
- [4]=>
- *RECURSION*
- }
- }
-}
*** Testing var_dump() on object variables ***
-- Iteration 1 --
@@ -1337,7 +1306,7 @@ array(14) {
9100
abcda"
}
-array(16) {
+array(15) {
[0]=>
array(0) {
}
@@ -1433,41 +1402,6 @@ array(16) {
[1]=>
string(4) "test"
}
- [15]=>
- array(5) {
- [0]=>
- int(1)
- [1]=>
- int(2)
- [2]=>
- int(3)
- [3]=>
- int(4)
- [4]=>
- &array(5) {
- [0]=>
- int(1)
- [1]=>
- int(2)
- [2]=>
- int(3)
- [3]=>
- int(4)
- [4]=>
- &array(5) {
- [0]=>
- int(1)
- [1]=>
- int(2)
- [2]=>
- int(3)
- [3]=>
- int(4)
- [4]=>
- *RECURSION*
- }
- }
- }
}
array(4) {
[0]=>