From: Antony Dovgal <tony2001@php.net>
Date: Mon, 1 Oct 2007 10:25:50 +0000 (+0000)
Subject: fix tests
X-Git-Tag: php-5.2.5RC1~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d70e63458f5c64b783cf2406ff266da911946fca;p=php

fix tests
---

diff --git a/ext/standard/tests/strings/join_error.phpt b/ext/standard/tests/strings/join_error.phpt
index 8113d30dfb..d227b73d34 100644
--- a/ext/standard/tests/strings/join_error.phpt
+++ b/ext/standard/tests/strings/join_error.phpt
@@ -45,6 +45,6 @@ NULL
 
 -- Testing join() with less than expected no. of arguments --
 
-Warning: join(): Argument to join must be an array in %s on line %d
+Warning: join(): Argument to implode must be an array. in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/strings/sprintf_basic7.phpt b/ext/standard/tests/strings/sprintf_basic7.phpt
index 4ce6044183..56bae8bd8d 100644
--- a/ext/standard/tests/strings/sprintf_basic7.phpt
+++ b/ext/standard/tests/strings/sprintf_basic7.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test sprintf() function : basic functionality - unsigned format
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) {
+	    die("skip this test is for 32bit platform only");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
diff --git a/ext/standard/tests/strings/sprintf_basic8.phpt b/ext/standard/tests/strings/sprintf_basic8.phpt
index 63469e8f04..bb9ecd1a66 100644
--- a/ext/standard/tests/strings/sprintf_basic8.phpt
+++ b/ext/standard/tests/strings/sprintf_basic8.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test sprintf() function : basic functionality - octal format
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) {
+	    die("skip this test is for 32bit platform only");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
diff --git a/ext/standard/tests/strings/sprintf_variation28.phpt b/ext/standard/tests/strings/sprintf_variation28.phpt
index 08237f9289..8fad68b0d9 100644
--- a/ext/standard/tests/strings/sprintf_variation28.phpt
+++ b/ext/standard/tests/strings/sprintf_variation28.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test sprintf() function : usage variations - octal formats with integer values
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) {
+	    die("skip this test is for 32bit platform only");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
@@ -323,4 +329,4 @@ string(11) "17777777777"
 string(30) "                   17777777777"
 string(4) "0-7]"
 string(1) "o"
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/strings/sprintf_variation29.phpt b/ext/standard/tests/strings/sprintf_variation29.phpt
index 271c6a9052..87ee835b76 100644
--- a/ext/standard/tests/strings/sprintf_variation29.phpt
+++ b/ext/standard/tests/strings/sprintf_variation29.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test sprintf() function : usage variations - octal formats with float values
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) {
+	    die("skip this test is for 32bit platform only");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
@@ -163,4 +169,4 @@ string(7) "4002620"
 string(30) "                       4002620"
 string(4) "0-7]"
 string(1) "o"
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/strings/sprintf_variation34.phpt b/ext/standard/tests/strings/sprintf_variation34.phpt
index 51443d8e6a..c6186b6780 100644
--- a/ext/standard/tests/strings/sprintf_variation34.phpt
+++ b/ext/standard/tests/strings/sprintf_variation34.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test sprintf() function : usage variations - hexa formats with integer values
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) {
+	    die("skip this test is for 32bit platform only");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
@@ -323,4 +329,4 @@ string(8) "7fffffff"
 string(30) "                      7fffffff"
 string(10) "0-9A-Fa-f]"
 string(1) "x"
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/strings/sprintf_variation35.phpt b/ext/standard/tests/strings/sprintf_variation35.phpt
index c8f03cd05f..ca6ba891dd 100644
--- a/ext/standard/tests/strings/sprintf_variation35.phpt
+++ b/ext/standard/tests/strings/sprintf_variation35.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test sprintf() function : usage variations - hexa formats with float values
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) {
+	    die("skip this test is for 32bit platform only");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
@@ -228,4 +234,4 @@ string(6) "100590"
 string(30) "                        100590"
 string(10) "0-9A-Fa-f]"
 string(1) "x"
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/strings/sprintf_variation4.phpt b/ext/standard/tests/strings/sprintf_variation4.phpt
index 3c8fab39b1..7fc66f910e 100644
--- a/ext/standard/tests/strings/sprintf_variation4.phpt
+++ b/ext/standard/tests/strings/sprintf_variation4.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test sprintf() function : usage variations - int formats with float values
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) {
+	    die("skip this test is for 32bit platform only");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
@@ -228,4 +234,4 @@ string(7) "1050000"
 string(30) "                       1050000"
 string(4) "0-9]"
 string(1) "d"
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/strings/sprintf_variation40.phpt b/ext/standard/tests/strings/sprintf_variation40.phpt
index 9c17e6c766..0da6a10b8a 100644
--- a/ext/standard/tests/strings/sprintf_variation40.phpt
+++ b/ext/standard/tests/strings/sprintf_variation40.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test sprintf() function : usage variations - unsigned formats with integer values
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) {
+	    die("skip this test is for 32bit platform only");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
@@ -324,4 +330,4 @@ string(10) "2147483647"
 string(30) "                    2147483647"
 string(4) "0-9]"
 string(1) "u"
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/strings/sprintf_variation41.phpt b/ext/standard/tests/strings/sprintf_variation41.phpt
index 481712d0fa..219ea0f025 100644
--- a/ext/standard/tests/strings/sprintf_variation41.phpt
+++ b/ext/standard/tests/strings/sprintf_variation41.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test sprintf() function : usage variations - unsigned formats with float values
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) {
+	    die("skip this test is for 32bit platform only");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
@@ -307,4 +313,4 @@ string(7) "1050000"
 string(30) "                       1050000"
 string(4) "0-9]"
 string(1) "u"
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/strings/sprintf_variation44.phpt b/ext/standard/tests/strings/sprintf_variation44.phpt
index 6659d40301..fd4e0bc5a6 100644
--- a/ext/standard/tests/strings/sprintf_variation44.phpt
+++ b/ext/standard/tests/strings/sprintf_variation44.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test sprintf() function : usage variations - unsigned formats with string values
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) {
+	    die("skip this test is for 32bit platform only");
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
@@ -356,4 +362,4 @@ string(4) "   0"
 string(30) "                             0"
 string(4) "0-9]"
 string(1) "u"
-Done
\ No newline at end of file
+Done