- Skip some tests in 32bit systems, add cleanups where missing

6 files changed, 15 insertions, 3 deletions

diff --git a/ext/gd/tests/bug43073.phpt b/ext/gd/tests/bug43073.phpt
index fce58b4657..df4ffe37e8 100644
--- a/ext/gd/tests/bug43073.phpt
+++ b/ext/gd/tests/bug43073.phpt
@@ -27,6 +27,8 @@ for ($angle = 0.0; $angle < 360.0; $angle += $delta_t) {
 }
 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)
diff --git a/ext/gd/tests/bug48555.phpt b/ext/gd/tests/bug48555.phpt
index c259501e3a..f2030fece4 100644
--- a/ext/gd/tests/bug48555.phpt
+++ b/ext/gd/tests/bug48555.phpt
@@ -9,9 +9,9 @@ Bug #48555 (ImageFTBBox() differs from previous versions for texts with new line
 <?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--
diff --git a/ext/gd/tests/bug48732.phpt b/ext/gd/tests/bug48732.phpt
index d4c90113a1..f8cb5e2bac 100644
--- a/ext/gd/tests/bug48732.phpt
+++ b/ext/gd/tests/bug48732.phpt
@@ -16,5 +16,7 @@ $bbox  = imagettftext($g, 12, 0, 0, 20, $black, $font, "ABCEDFGHIJKLMN\nopqrstu\
 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)
diff --git a/ext/standard/tests/strings/bug38770.phpt b/ext/standard/tests/strings/bug38770.phpt
index 75522ee9d5..417794cd25 100644
--- a/ext/standard/tests/strings/bug38770.phpt
+++ b/ext/standard/tests/strings/bug38770.phpt
@@ -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
 
diff --git a/ext/standard/tests/strings/chunk_split_variation5.phpt b/ext/standard/tests/strings/chunk_split_variation5.phpt
index 934d889c13..580f8f0a6f 100644
--- a/ext/standard/tests/strings/chunk_split_variation5.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation5.phpt
diff --git a/ext/standard/tests/strings/chunk_split_variation8.phpt b/ext/standard/tests/strings/chunk_split_variation8.phpt
index 2ccd48da2f..cfb440e923 100644
--- a/ext/standard/tests/strings/chunk_split_variation8.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation8.phpt
@@ -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]])