Allows further tests to run on Windows

This commit is contained in:
Christoph M. Becker 2020-01-05 20:26:35 +01:00
parent 718fc4cefd
commit f1e00033e6
7 changed files with 14 additions and 44 deletions

View File

@ -1,13 +1,8 @@
--TEST--
Bug #51604 (newline in end of header is shown in start of message)
--INI--
sendmail_path=tee mail_bug51604.out >/dev/null
sendmail_path={MAIL:mail_bug51604.out}
mail.add_x_header = Off
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) == "WIN")
die("skip Won't run on Windows");
?>
--FILE--
<?php
// Initialise all required variables

View File

@ -1,13 +1,8 @@
--TEST--
Bug #66535: Extra newline if add_x_header and no additional headers are used
--INI--
sendmail_path=tee mailBug66535.out >/dev/null
sendmail_path={MAIL:mailBug66535.out}
mail.add_x_header = On
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) == "WIN")
die("skip Won't run on Windows");
?>
--FILE--
<?php
/* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])

View File

@ -1,13 +1,8 @@
--TEST--
Bug #69874: Null addtional_headers does not send mail
--INI--
sendmail_path=tee mailBug69874.out >/dev/null
sendmail_path={MAIL:mailBug69874.out}
mail.add_x_header = Off
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) == "WIN")
die("skip Won't run on Windows");
?>
--FILE--
<?php
/* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])

View File

@ -1,13 +1,8 @@
--TEST--
Bug #69874: Null addtional_headers does not send mail
--INI--
sendmail_path=tee mailBug69874_2.out >/dev/null
sendmail_path={MAIL:mailBug69874_2.out}
mail.add_x_header = On
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) == "WIN")
die("skip Won't run on Windows");
?>
--FILE--
<?php
/* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])

View File

@ -6,12 +6,8 @@ only function besides mb_send_mail() which allows to call php_escape_shell_cmd()
with an empty string. Therefore we don't check the resulting email, but only
verify that the call succeeds.
--INI--
sendmail_path=cat >/dev/null
sendmail_path={MAIL:bug73203.eml}
mail.add_x_header = Off
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) === 'WIN') die('skip won\'t run on Windows');
?>
--FILE--
<?php
var_dump(
@ -20,3 +16,7 @@ var_dump(
?>
--EXPECT--
bool(true)
--CLEAN--
<?php
unlink('bug73203.eml');
?>

View File

@ -1,13 +1,8 @@
--TEST--
Test mail() function : array extra header basic functionality
--INI--
sendmail_path=tee mailBasic7.out >/dev/null
sendmail_path={MAIL:mailBasic7.out}
mail.add_x_header = Off
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) == "WIN")
die("skip Won't run on Windows");
?>
--FILE--
<?php
/* Prototype : int mail(string to, string subject, string message [, mixed additional_headers [, string additional_parameters]])

View File

@ -1,13 +1,8 @@
--TEST--
Test mail() function : mail.log ini setting
--INI--
sendmail_path=tee /tmp/mail.out >/dev/null
mail.log = /tmp/mail.log
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) == "WIN")
die("skip Won't run on Windows");
?>
sendmail_path={MAIL:mail.out}
mail.log = mail.log
--FILE--
<?php
date_default_timezone_set("UTC");
@ -37,8 +32,8 @@ echo file_get_contents($logfile);
Done
--CLEAN--
<?php
unlink("/tmp/mail.log");
unlink("/tmp/mail.out");
unlink("mail.log");
unlink("mail.out");
?>
--EXPECTF--
bool(true)