From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 4 Mar 2019 09:48:09 +0000 (+0100)
Subject: Use separate output files in x2gd tests
X-Git-Tag: php-7.4.0alpha1~844
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e27ba75e0f2929cc2ecbbb45761eec60fd9abffb;p=php

Use separate output files in x2gd tests
---

diff --git a/ext/gd/tests/gif2gd.phpt b/ext/gd/tests/gif2gd.phpt
index 17ec158cb3..54a9601fb5 100644
--- 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 805ec79834..c68bddd1a8 100644
--- 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 65ca505aeb..07148a9ab3 100644
--- 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 e70a13f379..42df3f6213 100644
--- 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