jani Tue, 28 Jul 2009 19:16:02 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286464
Log:
- Skip some tests in 32bit systems, add cleanups where missing
Changed paths:
U php/php-src/branches/PHP_5_2/ext/gd/tests/bug43073.phpt
U php/php-src/branches/PHP_5_2/ext/gd/tests/bug48555.phpt
U php/php-src/branches/PHP_5_2/ext/gd/tests/bug48732.phpt
U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/bug38770.phpt
U
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation5.phpt
U
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation8.phpt
U php/php-src/branches/PHP_5_3/ext/gd/tests/bug43073.phpt
U php/php-src/branches/PHP_5_3/ext/gd/tests/bug48555.phpt
U php/php-src/branches/PHP_5_3/ext/gd/tests/bug48732.phpt
U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug38770.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation5.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation8.phpt
U php/php-src/trunk/ext/gd/tests/bug43073.phpt
U php/php-src/trunk/ext/gd/tests/bug48555.phpt
U php/php-src/trunk/ext/gd/tests/bug48732.phpt
U php/php-src/trunk/ext/standard/tests/strings/bug38770.phpt
U php/php-src/trunk/ext/standard/tests/strings/chunk_split_variation5.phpt
U php/php-src/trunk/ext/standard/tests/strings/chunk_split_variation8.phpt
Modified: php/php-src/branches/PHP_5_2/ext/gd/tests/bug43073.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gd/tests/bug43073.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/branches/PHP_5_2/ext/gd/tests/bug43073.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -27,6 +27,8 @@
}
imagepng($g, "$cwd/bug43073.png");
?>
+--CLEAN--
+<?php @unlink(dirname(__FILE__) . '/bug43073.png'); ?>
--EXPECTF--
(500, 402), (610, 402), (610, 376), (500, 376)
(492, 363), (591, 322), (580, 295), (480, 336)
Modified: php/php-src/branches/PHP_5_2/ext/gd/tests/bug48555.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gd/tests/bug48555.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/branches/PHP_5_2/ext/gd/tests/bug48555.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -9,9 +9,9 @@
<?php
$cwd = dirname(__FILE__);
$font = "$cwd/Tuffy.ttf";
-$box = ImageFTBBox(13, 0, $font, "Text without line-break");
+$box = ImageFTBBox(14, 0, $font, "Text without line-break");
echo 'Top without line-break: ' . $box[7] . "\n";
-$box = ImageFTBBox(13, 0, $font, "Text with\nline-break\none more");
+$box = ImageFTBBox(14, 0, $font, "Text with\nline-break\none more");
echo 'Top with line-break: ' . $box[7] . "\n";
?>
--EXPECTF--
Modified: php/php-src/branches/PHP_5_2/ext/gd/tests/bug48732.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gd/tests/bug48732.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/branches/PHP_5_2/ext/gd/tests/bug48732.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -16,5 +16,7 @@
imagepng($g, "$cwd/bug48732.png");
echo 'Left Bottom: (' . $bbox[0] . ', ' . $bbox[1] . ')';
?>
+--CLEAN--
+<?php @unlink(dirname(__FILE__) . '/bug48732.png'); ?>
--EXPECTF--
-Left Bottom: (0, 47)
\ No newline at end of file
+Left Bottom: (0, 47)
Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/bug38770.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/bug38770.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/bug38770.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -1,5 +1,9 @@
--TEST--
Bug #38770 (unpack() broken with longs on 64 bit machines)
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+?>
--FILE--
<?php
Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation5.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation5.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation5.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -1,5 +1,9 @@
--TEST--
Test chunk_split() function : usage variations - different integer values for 'chunklen' argument(Bug#42796)
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+?>
--FILE--
<?php
/* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]])
Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation8.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation8.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation8.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -1,5 +1,9 @@
--TEST--
Test chunk_split() function : usage variations - different integer values for 'chunklen' with heredoc string as 'str'(Bug#42796)
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+?>
--FILE--
<?php
/* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]])
Modified: php/php-src/branches/PHP_5_3/ext/gd/tests/bug43073.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/tests/bug43073.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/bug43073.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -27,6 +27,8 @@
}
imagepng($g, "$cwd/bug43073.png");
?>
+--CLEAN--
+<?php @unlink(dirname(__FILE__) . '/bug43073.png'); ?>
--EXPECTF--
(500, 402), (610, 402), (610, 376), (500, 376)
(492, 363), (591, 322), (580, 295), (480, 336)
Modified: php/php-src/branches/PHP_5_3/ext/gd/tests/bug48555.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/tests/bug48555.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/bug48555.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -9,9 +9,9 @@
<?php
$cwd = dirname(__FILE__);
$font = "$cwd/Tuffy.ttf";
-$box = ImageFTBBox(13, 0, $font, "Text without line-break");
+$box = ImageFTBBox(14, 0, $font, "Text without line-break");
echo 'Top without line-break: ' . $box[7] . "\n";
-$box = ImageFTBBox(13, 0, $font, "Text with\nline-break\none more");
+$box = ImageFTBBox(14, 0, $font, "Text with\nline-break\none more");
echo 'Top with line-break: ' . $box[7] . "\n";
?>
--EXPECTF--
Modified: php/php-src/branches/PHP_5_3/ext/gd/tests/bug48732.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/tests/bug48732.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/bug48732.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -16,5 +16,7 @@
imagepng($g, "$cwd/bug48732.png");
echo 'Left Bottom: (' . $bbox[0] . ', ' . $bbox[1] . ')';
?>
+--CLEAN--
+<?php @unlink(dirname(__FILE__) . '/bug48732.png'); ?>
--EXPECTF--
-Left Bottom: (0, 47)
\ No newline at end of file
+Left Bottom: (0, 47)
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug38770.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug38770.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug38770.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -1,5 +1,9 @@
--TEST--
Bug #38770 (unpack() broken with longs on 64 bit machines)
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+?>
--FILE--
<?php
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation5.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation5.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation5.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -1,5 +1,9 @@
--TEST--
Test chunk_split() function : usage variations - different integer values for 'chunklen' argument(Bug#42796)
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+?>
--FILE--
<?php
/* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]])
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation8.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation8.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation8.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -1,5 +1,9 @@
--TEST--
Test chunk_split() function : usage variations - different integer values for 'chunklen' with heredoc string as 'str'(Bug#42796)
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+?>
--FILE--
<?php
/* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]])
Modified: php/php-src/trunk/ext/gd/tests/bug43073.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/bug43073.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/trunk/ext/gd/tests/bug43073.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -27,6 +27,8 @@
}
imagepng($g, "$cwd/bug43073.png");
?>
+--CLEAN--
+<?php @unlink(dirname(__FILE__) . '/bug43073.png'); ?>
--EXPECTF--
(500, 402), (610, 402), (610, 376), (500, 376)
(492, 363), (591, 322), (580, 295), (480, 336)
Modified: php/php-src/trunk/ext/gd/tests/bug48555.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/bug48555.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/trunk/ext/gd/tests/bug48555.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -9,9 +9,9 @@
<?php
$cwd = dirname(__FILE__);
$font = "$cwd/Tuffy.ttf";
-$box = ImageFTBBox(13, 0, $font, "Text without line-break");
+$box = ImageFTBBox(14, 0, $font, "Text without line-break");
echo 'Top without line-break: ' . $box[7] . "\n";
-$box = ImageFTBBox(13, 0, $font, "Text with\nline-break\none more");
+$box = ImageFTBBox(14, 0, $font, "Text with\nline-break\none more");
echo 'Top with line-break: ' . $box[7] . "\n";
?>
--EXPECTF--
Modified: php/php-src/trunk/ext/gd/tests/bug48732.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/bug48732.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/trunk/ext/gd/tests/bug48732.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -16,5 +16,7 @@
imagepng($g, "$cwd/bug48732.png");
echo 'Left Bottom: (' . $bbox[0] . ', ' . $bbox[1] . ')';
?>
+--CLEAN--
+<?php @unlink(dirname(__FILE__) . '/bug48732.png'); ?>
--EXPECTF--
-Left Bottom: (0, 47)
\ No newline at end of file
+Left Bottom: (0, 47)
Modified: php/php-src/trunk/ext/standard/tests/strings/bug38770.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/bug38770.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/trunk/ext/standard/tests/strings/bug38770.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -1,5 +1,9 @@
--TEST--
Bug #38770 (unpack() broken with longs on 64 bit machines)
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+?>
--FILE--
<?php
Modified: php/php-src/trunk/ext/standard/tests/strings/chunk_split_variation5.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/chunk_split_variation5.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/trunk/ext/standard/tests/strings/chunk_split_variation5.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -1,5 +1,9 @@
--TEST--
Test chunk_split() function : usage variations - different integer values for 'chunklen' argument
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+?>
--FILE--
<?php
/* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]])
Modified: php/php-src/trunk/ext/standard/tests/strings/chunk_split_variation8.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/chunk_split_variation8.phpt 2009-07-28 15:44:49 UTC (rev 286463)
+++ php/php-src/trunk/ext/standard/tests/strings/chunk_split_variation8.phpt 2009-07-28 19:16:02 UTC (rev 286464)
@@ -1,5 +1,9 @@
--TEST--
Test chunk_split() function : usage variations - different integer values for 'chunklen' with heredoc string as 'str'(Bug#42796)
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+?>
--FILE--
<?php
/* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
