From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 19 Feb 2019 13:51:33 +0000 (+0100)
Subject: Avoid file conflicts in mail tests
X-Git-Tag: php-7.4.0alpha1~976
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7207686fcf12abdf0299b57714ef4bb26b6489d0;p=php

Avoid file conflicts in mail tests
---

diff --git a/ext/standard/tests/mail/bug66535.phpt b/ext/standard/tests/mail/bug66535.phpt
index f0a5d5ea85..09dad37ad6 100644
--- a/ext/standard/tests/mail/bug66535.phpt
+++ b/ext/standard/tests/mail/bug66535.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #66535: Extra newline if add_x_header and no additional headers are used
 --INI--
-sendmail_path=tee mailBasic.out >/dev/null
+sendmail_path=tee mailBug66535.out >/dev/null
 mail.add_x_header = On
 --SKIPIF--
 <?php
@@ -23,7 +23,7 @@ $to = 'user@company.com';
 $subject = 'Test Subject';
 $message = 'A Message';
 
-$outFile = "mailBasic.out";
+$outFile = "mailBug66535.out";
 @unlink($outFile);
 
 var_dump( mail($to, $subject, $message) );
diff --git a/ext/standard/tests/mail/bug69874.phpt b/ext/standard/tests/mail/bug69874.phpt
index 14a4b452df..45cfd0d32f 100644
--- a/ext/standard/tests/mail/bug69874.phpt
+++ b/ext/standard/tests/mail/bug69874.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #69874: Null addtional_headers does not send mail
 --INI--
-sendmail_path=tee mailBasic.out >/dev/null
+sendmail_path=tee mailBug69874.out >/dev/null
 mail.add_x_header = Off
 --SKIPIF--
 <?php
@@ -23,7 +23,7 @@ $to = 'user@company.com';
 $subject = 'Test Subject';
 $message = 'A Message';
 
-$outFile = "mailBasic.out";
+$outFile = "mailBug69874.out";
 @unlink($outFile);
 
 var_dump( mail($to, $subject, $message) );
diff --git a/ext/standard/tests/mail/bug69874_2.phpt b/ext/standard/tests/mail/bug69874_2.phpt
index 53d991a26b..e35d1c367e 100644
--- a/ext/standard/tests/mail/bug69874_2.phpt
+++ b/ext/standard/tests/mail/bug69874_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #69874: Null addtional_headers does not send mail
 --INI--
-sendmail_path=tee mailBasic.out >/dev/null
+sendmail_path=tee mailBug69874_2.out >/dev/null
 mail.add_x_header = On
 --SKIPIF--
 <?php
@@ -23,7 +23,7 @@ $to = 'user@company.com';
 $subject = 'Test Subject';
 $message = 'A Message';
 
-$outFile = "mailBasic.out";
+$outFile = "mailBug69874_2.out";
 @unlink($outFile);
 
 var_dump( mail($to, $subject, $message, '') );
diff --git a/ext/standard/tests/mail/mail_basic6.phpt b/ext/standard/tests/mail/mail_basic6.phpt
index 01d315ae06..f9eab07e61 100644
--- a/ext/standard/tests/mail/mail_basic6.phpt
+++ b/ext/standard/tests/mail/mail_basic6.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test mail() function : basic functionality
 --INI--
-sendmail_path=tee mailBasic.out >/dev/null
+sendmail_path=tee mailBasic6.out >/dev/null
 mail.add_x_header = Off
 --SKIPIF--
 <?php
@@ -24,7 +24,7 @@ $to = 'user@example.com';
 $subject = 'Test Subject';
 $message = 'A Message';
 $additional_headers = "HEAD1: a\r\nHEAD2: b\r\n";
-$outFile = "mailBasic.out";
+$outFile = "mailBasic6.out";
 @unlink($outFile);
 
 echo "-- Valid Header --\n";
diff --git a/ext/standard/tests/mail/mail_basic7.phpt b/ext/standard/tests/mail/mail_basic7.phpt
index 3b389d2c4e..0b2cdc2c4f 100644
--- a/ext/standard/tests/mail/mail_basic7.phpt
+++ b/ext/standard/tests/mail/mail_basic7.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test mail() function : array extra header basic functionality
 --INI--
-sendmail_path=tee mailBasic.out >/dev/null
+sendmail_path=tee mailBasic7.out >/dev/null
 mail.add_x_header = Off
 --SKIPIF--
 <?php
@@ -35,7 +35,7 @@ $additional_headers = array(
 		"bar\r\n\t fuga",
 	),
 );
-$outFile = "mailBasic.out";
+$outFile = "mailBasic7.out";
 @unlink($outFile);
 
 echo "-- All Mail Content Parameters --\n";
@@ -62,7 +62,7 @@ $additional_headers = array(
 	'message-id' => array('foo7'),
 	'in-reply-to'=> array('foo8'),
 );
-$outFile = "mailBasic.out";
+$outFile = "mailBasic7.out";
 @unlink($outFile);
 
 echo "-- All Mail Content Parameters --\n";
@@ -87,7 +87,7 @@ $additional_headers = array(
 	'foo6' => array(NULL),
 	'foo7' => array(new StdClass),
 );
-$outFile = "mailBasic.out";
+$outFile = "mailBasic7.out";
 @unlink($outFile);
 
 echo "-- All Mail Content Parameters --\n";
@@ -115,7 +115,7 @@ $additional_headers = array(
 	"foo9" => '%&$#!',
 	"foo10" => "abc\0\tdef",
 );
-$outFile = "mailBasic.out";
+$outFile = "mailBasic7.out";
 @unlink($outFile);
 
 echo "-- All Mail Content Parameters --\n";