tony2001                Mon May 14 10:57:04 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/standard/tests/array   array_keys.phpt array_values.phpt 
                                        end.phpt 
    /php-src/ext/standard/tests/general_functions       
                                                        debug_zval_dump_b.phpt 
                                                        is_float.phpt 
                                                        is_int.phpt 
                                                        print_r.phpt 
                                                        var_dump.phpt 
  Log:
  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
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_keys.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_keys.phpt
diff -u php-src/ext/standard/tests/array/array_keys.phpt:1.1.2.1 
php-src/ext/standard/tests/array/array_keys.phpt:1.1.2.2
--- php-src/ext/standard/tests/array/array_keys.phpt:1.1.2.1    Sat May 12 
09:53:30 2007
+++ php-src/ext/standard/tests/array/array_keys.phpt    Mon May 14 10:57:04 2007
@@ -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
 /*
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_values.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/standard/tests/array/array_values.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/end.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/array/end.phpt
diff -u php-src/ext/standard/tests/array/end.phpt:1.1.2.1 
php-src/ext/standard/tests/array/end.phpt:1.1.2.2
--- php-src/ext/standard/tests/array/end.phpt:1.1.2.1   Sat May 12 09:53:30 2007
+++ php-src/ext/standard/tests/array/end.phpt   Mon May 14 10:57:04 2007
@@ -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 );
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/debug_zval_dump_b.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/debug_zval_dump_b.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_float.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/is_float.phpt
diff -u php-src/ext/standard/tests/general_functions/is_float.phpt:1.1.2.1 
php-src/ext/standard/tests/general_functions/is_float.phpt:1.1.2.2
--- php-src/ext/standard/tests/general_functions/is_float.phpt:1.1.2.1  Sat May 
12 10:28:00 2007
+++ php-src/ext/standard/tests/general_functions/is_float.phpt  Mon May 14 
10:57:04 2007
@@ -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 );
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_int.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/is_int.phpt
diff -u php-src/ext/standard/tests/general_functions/is_int.phpt:1.1.2.1 
php-src/ext/standard/tests/general_functions/is_int.phpt:1.1.2.2
--- php-src/ext/standard/tests/general_functions/is_int.phpt:1.1.2.1    Sat May 
12 10:28:00 2007
+++ php-src/ext/standard/tests/general_functions/is_int.phpt    Mon May 14 
10:57:04 2007
@@ -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 );
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/print_r.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/print_r.phpt
diff -u php-src/ext/standard/tests/general_functions/print_r.phpt:1.1.2.1 
php-src/ext/standard/tests/general_functions/print_r.phpt:1.1.2.2
--- php-src/ext/standard/tests/general_functions/print_r.phpt:1.1.2.1   Sat May 
12 10:28:00 2007
+++ php-src/ext/standard/tests/general_functions/print_r.phpt   Mon May 14 
10:57:04 2007
@@ -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 @@
   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);
@@ -952,61 +956,6 @@
     [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 --
@@ -1535,13 +1484,13 @@
 *** 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 ***
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/var_dump.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/var_dump.phpt
diff -u php-src/ext/standard/tests/general_functions/var_dump.phpt:1.1.2.1 
php-src/ext/standard/tests/general_functions/var_dump.phpt:1.1.2.2
--- php-src/ext/standard/tests/general_functions/var_dump.phpt:1.1.2.1  Sat May 
12 10:28:00 2007
+++ php-src/ext/standard/tests/general_functions/var_dump.phpt  Mon May 14 
10:57:04 2007
@@ -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 @@
   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() */
@@ -566,41 +570,6 @@
   [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 --
@@ -1335,7 +1304,7 @@
 5678
        9100abcda"
 }
-array(16) {
+array(15) {
   [0]=>
   array(0) {
   }
@@ -1431,41 +1400,6 @@
     [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]=>

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to