Use separate output files in x2gd tests

diff --git a/ext/gd/tests/gif2gd.phpt b/ext/gd/tests/gif2gd.phpt
index 17ec158cb30505ad19e5b20b5cdf346982dfad12..54a9601fb51070c8bc6a3beb0cadbb17df859c87 100644 (file)
--- a/ext/gd/tests/gif2gd.phpt
+++ b/ext/gd/tests/gif2gd.phpt
@@ -15,15 +15,15 @@ gif --> gd1/gd2 conversion test
        $cwd = dirname(__FILE__);
 
        echo "GIF to GD1 conversion: ";
-       echo imagegd(imagecreatefromgif($cwd . "/conv_test.gif"), $cwd . "/test.gd1") ? 'ok' : 'failed';
+       echo imagegd(imagecreatefromgif($cwd . "/conv_test.gif"), $cwd . "/test_gif.gd1") ? 'ok' : 'failed';
        echo "\n";
 
        echo "GIF to GD2 conversion: ";
-       echo imagegd2(imagecreatefromgif($cwd . "/conv_test.gif"), $cwd . "/test.gd2") ? 'ok' : 'failed';
+       echo imagegd2(imagecreatefromgif($cwd . "/conv_test.gif"), $cwd . "/test_gif.gd2") ? 'ok' : 'failed';
        echo "\n";
 
-       @unlink($cwd . "/test.gd1");
-       @unlink($cwd . "/test.gd2");
+       @unlink($cwd . "/test_gif.gd1");
+       @unlink($cwd . "/test_gif.gd2");
 ?>
 --EXPECT--
 GIF to GD1 conversion: ok

diff --git a/ext/gd/tests/jpg2gd.phpt b/ext/gd/tests/jpg2gd.phpt
index 805ec79834e1d03013530528d99213f786541ba0..c68bddd1a803aa85aff580a648a7abde6abe8533 100644 (file)
--- a/ext/gd/tests/jpg2gd.phpt
+++ b/ext/gd/tests/jpg2gd.phpt
@@ -15,23 +15,23 @@ jpeg <--> gd1/gd2 conversion test
        $cwd = dirname(__FILE__);
 
        echo "JPEG to GD1 conversion: ";
-       echo imagegd(imagecreatefromjpeg($cwd . "/conv_test.jpeg"), $cwd . "/test.gd1") ? 'ok' : 'failed';
+       echo imagegd(imagecreatefromjpeg($cwd . "/conv_test.jpeg"), $cwd . "/test_jpeg.gd1") ? 'ok' : 'failed';
        echo "\n";
 
        echo "JPEG to GD2 conversion: ";
-       echo imagegd2(imagecreatefromjpeg($cwd . "/conv_test.jpeg"), $cwd . "/test.gd2") ? 'ok' : 'failed';
+       echo imagegd2(imagecreatefromjpeg($cwd . "/conv_test.jpeg"), $cwd . "/test_jpeg.gd2") ? 'ok' : 'failed';
        echo "\n";
 
        echo "GD1 to JPEG conversion: ";
-       echo imagejpeg(imagecreatefromgd($cwd . "/test.gd1"), $cwd . "/test_gd1.jpeg") ? 'ok' : 'failed';
+       echo imagejpeg(imagecreatefromgd($cwd . "/test_jpeg.gd1"), $cwd . "/test_gd1.jpeg") ? 'ok' : 'failed';
        echo "\n";
 
        echo "GD2 to JPEG conversion: ";
-       echo imagejpeg(imagecreatefromgd2($cwd . "/test.gd2"), $cwd . "/test_gd2.jpeg") ? 'ok' : 'failed';
+       echo imagejpeg(imagecreatefromgd2($cwd . "/test_jpeg.gd2"), $cwd . "/test_gd2.jpeg") ? 'ok' : 'failed';
        echo "\n";
 
-       @unlink($cwd . "/test.gd1");
-       @unlink($cwd . "/test.gd2");
+       @unlink($cwd . "/test_jpeg.gd1");
+       @unlink($cwd . "/test_jpeg.gd2");
        @unlink($cwd . "/test_gd1.jpeg");
        @unlink($cwd . "/test_gd2.jpeg");
 ?>

diff --git a/ext/gd/tests/png2gd.phpt b/ext/gd/tests/png2gd.phpt
index 65ca505aebb5e93bda40d305e15471398765f449..07148a9ab3b776ce733650982e4e1246de19ff11 100644 (file)
--- a/ext/gd/tests/png2gd.phpt
+++ b/ext/gd/tests/png2gd.phpt
@@ -15,23 +15,23 @@ png <--> gd1/gd2 conversion test
        $cwd = dirname(__FILE__);
 
        echo "PNG to GD1 conversion: ";
-       echo imagegd(imagecreatefrompng($cwd . "/conv_test.png"), $cwd . "/test.gd1") ? 'ok' : 'failed';
+       echo imagegd(imagecreatefrompng($cwd . "/conv_test.png"), $cwd . "/test_png.gd1") ? 'ok' : 'failed';
        echo "\n";
 
        echo "PNG to GD2 conversion: ";
-       echo imagegd2(imagecreatefrompng($cwd . "/conv_test.png"), $cwd . "/test.gd2") ? 'ok' : 'failed';
+       echo imagegd2(imagecreatefrompng($cwd . "/conv_test.png"), $cwd . "/test_png.gd2") ? 'ok' : 'failed';
        echo "\n";
 
        echo "GD1 to PNG conversion: ";
-       echo imagepng(imagecreatefromgd($cwd . "/test.gd1"), $cwd . "/test_gd1.png") ? 'ok' : 'failed';
+       echo imagepng(imagecreatefromgd($cwd . "/test_png.gd1"), $cwd . "/test_gd1.png") ? 'ok' : 'failed';
        echo "\n";
 
        echo "GD2 to PNG conversion: ";
-       echo imagepng(imagecreatefromgd2($cwd . "/test.gd2"), $cwd . "/test_gd2.png") ? 'ok' : 'failed';
+       echo imagepng(imagecreatefromgd2($cwd . "/test_png.gd2"), $cwd . "/test_gd2.png") ? 'ok' : 'failed';
        echo "\n";
 
-       @unlink($cwd . "/test.gd1");
-       @unlink($cwd . "/test.gd2");
+       @unlink($cwd . "/test_png.gd1");
+       @unlink($cwd . "/test_png.gd2");
        @unlink($cwd . "/test_gd1.png");
        @unlink($cwd . "/test_gd2.png");
 ?>

diff --git a/ext/gd/tests/xpm2gd.phpt b/ext/gd/tests/xpm2gd.phpt
index e70a13f379ed96ee26dff12840f57bd8e2429af0..42df3f621396039659e4111159a5862b336321ac 100644 (file)
--- a/ext/gd/tests/xpm2gd.phpt
+++ b/ext/gd/tests/xpm2gd.phpt
@@ -15,15 +15,15 @@ xpm --> gd1/gd2 conversion test
        $cwd = dirname(__FILE__);
 
        echo "XPM to GD1 conversion: ";
-       echo imagegd(imagecreatefromxpm($cwd . "/conv_test.xpm"), $cwd . "/test.gd1") ? 'ok' : 'failed';
+       echo imagegd(imagecreatefromxpm($cwd . "/conv_test.xpm"), $cwd . "/test_xpm.gd1") ? 'ok' : 'failed';
        echo "\n";
 
        echo "XPM to GD2 conversion: ";
-       echo imagegd2(imagecreatefromxpm($cwd . "/conv_test.xpm"), $cwd . "/test.gd2") ? 'ok' : 'failed';
+       echo imagegd2(imagecreatefromxpm($cwd . "/conv_test.xpm"), $cwd . "/test_xpm.gd2") ? 'ok' : 'failed';
        echo "\n";
 
-       @unlink($cwd . "/test.gd1");
-       @unlink($cwd . "/test.gd2");
+       @unlink($cwd . "/test_xpm.gd1");
+       @unlink($cwd . "/test_xpm.gd2");
 ?>
 --EXPECT--
 XPM to GD1 conversion: ok