[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array arsort_variation3.phpt

2008-02-11 Thread Ilia Alshanetsky 
iliaa   Mon Feb 11 16:02:46 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/array   arsort_variation3.phpt 
  Log:
  
  Fixed test on 64bit machines
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/arsort_variation3.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/array/arsort_variation3.phpt
diff -u php-src/ext/standard/tests/array/arsort_variation3.phpt:1.1.4.3 
php-src/ext/standard/tests/array/arsort_variation3.phpt:1.1.4.4
--- php-src/ext/standard/tests/array/arsort_variation3.phpt:1.1.4.3 Tue Feb 
 5 11:19:17 2008
+++ php-src/ext/standard/tests/array/arsort_variation3.phpt Mon Feb 11 
16:02:46 2008
@@ -59,7 +59,7 @@
 
 echo "Done\n";
 ?>
---EXPECT--
+--EXPECTF--
 *** Testing arsort() : usage variations ***
 
 -- Testing arsort() by supplying various integer/float arrays --
@@ -273,7 +273,7 @@
 bool(true)
 array(7) {
   [2]=>
-  float(2147483648)
+  %s(2147483648)
   [1]=>
   int(2147483647)
   [6]=>
@@ -283,15 +283,15 @@
   [3]=>
   int(-2147483647)
   [4]=>
-  float(-2147483648)
+  %s(-2147483648)
   [7]=>
-  float(-2147483649)
+  %s(-2147483649)
 }
 - Sort_flag = SORT_REGULAR -
 bool(true)
 array(7) {
   [2]=>
-  float(2147483648)
+  %s(2147483648)
   [1]=>
   int(2147483647)
   [6]=>
@@ -301,15 +301,15 @@
   [3]=>
   int(-2147483647)
   [4]=>
-  float(-2147483648)
+  %s(-2147483648)
   [7]=>
-  float(-2147483649)
+  %s(-2147483649)
 }
 - Sort_flag = SORT_NUMERIC -
 bool(true)
 array(7) {
   [2]=>
-  float(2147483648)
+  %s(2147483648)
   [1]=>
   int(2147483647)
   [6]=>
@@ -319,8 +319,8 @@
   [3]=>
   int(-2147483647)
   [4]=>
-  float(-2147483648)
+  %s(-2147483648)
   [7]=>
-  float(-2147483649)
+  %s(-2147483649)
 }
 Done
\ No newline at end of file

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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array arsort_variation3.phpt

2008-02-05 Thread Antony Dovgal 
On 05.02.2008 14:19, Robert Nicholson wrote:
> nicholsr  Tue Feb  5 11:19:17 2008 UTC
> 
>   Modified files:  (Branch: PHP_5_3)
> /php-src/ext/standard/tests/array arsort_variation3.phpt 
>   Log:
>   - fix arsort_variation3.phpt which was missing its EXPECT section

It seems that you still don't have a 64bit test machine.
Want me to create an account on my server for you?

-- 
Wbr, 
Antony Dovgal

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array arsort_variation3.phpt

2008-02-05 Thread Robert Nicholson 
nicholsrTue Feb  5 11:19:17 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/array   arsort_variation3.phpt 
  Log:
  - fix arsort_variation3.phpt which was missing its EXPECT section
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/arsort_variation3.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/array/arsort_variation3.phpt
diff -u php-src/ext/standard/tests/array/arsort_variation3.phpt:1.1.4.2 
php-src/ext/standard/tests/array/arsort_variation3.phpt:1.1.4.3
--- php-src/ext/standard/tests/array/arsort_variation3.phpt:1.1.4.2 Mon Feb 
 4 00:05:24 2008
+++ php-src/ext/standard/tests/array/arsort_variation3.phpt Tue Feb  5 
11:19:17 2008
@@ -59,3 +59,268 @@
 
 echo "Done\n";
 ?>
+--EXPECT--
+*** Testing arsort() : usage variations ***
+
+-- Testing arsort() by supplying various integer/float arrays --
+
+-- Iteration 1 --
+- With default sort_flag -
+bool(true)
+array(9) {
+  [8]=>
+  int(41)
+  [5]=>
+  int(31)
+  [3]=>
+  int(21)
+  [1]=>
+  int(11)
+  [7]=>
+  int(0)
+  [2]=>
+  int(-11)
+  [4]=>
+  int(-21)
+  [6]=>
+  int(-31)
+  [10]=>
+  int(-41)
+}
+- Sort_flag = SORT_REGULAR -
+bool(true)
+array(9) {
+  [8]=>
+  int(41)
+  [5]=>
+  int(31)
+  [3]=>
+  int(21)
+  [1]=>
+  int(11)
+  [7]=>
+  int(0)
+  [2]=>
+  int(-11)
+  [4]=>
+  int(-21)
+  [6]=>
+  int(-31)
+  [10]=>
+  int(-41)
+}
+- Sort_flag = SORT_NUMERIC -
+bool(true)
+array(9) {
+  [8]=>
+  int(41)
+  [5]=>
+  int(31)
+  [3]=>
+  int(21)
+  [1]=>
+  int(11)
+  [7]=>
+  int(0)
+  [2]=>
+  int(-11)
+  [4]=>
+  int(-21)
+  [6]=>
+  int(-31)
+  [10]=>
+  int(-41)
+}
+
+-- Iteration 2 --
+- With default sort_flag -
+bool(true)
+array(7) {
+  [3]=>
+  float(1050)
+  [1]=>
+  float(10.5)
+  [5]=>
+  float(0.5)
+  [4]=>
+  float(0.106)
+  [6]=>
+  float(0.0001)
+  [7]=>
+  float(-0.1)
+  [2]=>
+  float(-10.5)
+}
+- Sort_flag = SORT_REGULAR -
+bool(true)
+array(7) {
+  [3]=>
+  float(1050)
+  [1]=>
+  float(10.5)
+  [5]=>
+  float(0.5)
+  [4]=>
+  float(0.106)
+  [6]=>
+  float(0.0001)
+  [7]=>
+  float(-0.1)
+  [2]=>
+  float(-10.5)
+}
+- Sort_flag = SORT_NUMERIC -
+bool(true)
+array(7) {
+  [3]=>
+  float(1050)
+  [1]=>
+  float(10.5)
+  [5]=>
+  float(0.5)
+  [4]=>
+  float(0.106)
+  [6]=>
+  float(0.0001)
+  [7]=>
+  float(-0.1)
+  [2]=>
+  float(-10.5)
+}
+
+-- Iteration 3 --
+- With default sort_flag -
+bool(true)
+array(11) {
+  [11]=>
+  int(33)
+  [7]=>
+  int(2)
+  [9]=>
+  float(0.106)
+  [6]=>
+  float(0.09)
+  [2]=>
+  float(0.0021)
+  [1]=>
+  float(0.0001)
+  [5]=>
+  int(0)
+  [3]=>
+  float(-0.01)
+  [10]=>
+  float(-0.106)
+  [8]=>
+  float(-0.9)
+  [4]=>
+  int(-1)
+}
+- Sort_flag = SORT_REGULAR -
+bool(true)
+array(11) {
+  [11]=>
+  int(33)
+  [7]=>
+  int(2)
+  [9]=>
+  float(0.106)
+  [6]=>
+  float(0.09)
+  [2]=>
+  float(0.0021)
+  [1]=>
+  float(0.0001)
+  [5]=>
+  int(0)
+  [3]=>
+  float(-0.01)
+  [10]=>
+  float(-0.106)
+  [8]=>
+  float(-0.9)
+  [4]=>
+  int(-1)
+}
+- Sort_flag = SORT_NUMERIC -
+bool(true)
+array(11) {
+  [11]=>
+  int(33)
+  [7]=>
+  int(2)
+  [9]=>
+  float(0.106)
+  [6]=>
+  float(0.09)
+  [2]=>
+  float(0.0021)
+  [1]=>
+  float(0.0001)
+  [5]=>
+  int(0)
+  [3]=>
+  float(-0.01)
+  [10]=>
+  float(-0.106)
+  [8]=>
+  float(-0.9)
+  [4]=>
+  int(-1)
+}
+
+-- Iteration 4 --
+- With default sort_flag -
+bool(true)
+array(7) {
+  [2]=>
+  float(2147483648)
+  [1]=>
+  int(2147483647)
+  [6]=>
+  int(0)
+  [5]=>
+  int(0)
+  [3]=>
+  int(-2147483647)
+  [4]=>
+  float(-2147483648)
+  [7]=>
+  float(-2147483649)
+}
+- Sort_flag = SORT_REGULAR -
+bool(true)
+array(7) {
+  [2]=>
+  float(2147483648)
+  [1]=>
+  int(2147483647)
+  [6]=>
+  int(0)
+  [5]=>
+  int(0)
+  [3]=>
+  int(-2147483647)
+  [4]=>
+  float(-2147483648)
+  [7]=>
+  float(-2147483649)
+}
+- Sort_flag = SORT_NUMERIC -
+bool(true)
+array(7) {
+  [2]=>
+  float(2147483648)
+  [1]=>
+  int(2147483647)
+  [6]=>
+  int(0)
+  [5]=>
+  int(0)
+  [3]=>
+  int(-2147483647)
+  [4]=>
+  float(-2147483648)
+  [7]=>
+  float(-2147483649)
+}
+Done
\ No newline at end of file

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