Skip to content

Commit f1e0003

Browse files
committed
Allows further tests to run on Windows
1 parent 718fc4c commit f1e0003

File tree

7 files changed

+14
-44
lines changed

7 files changed

+14
-44
lines changed

ext/standard/tests/mail/bug51604.phpt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
--TEST--
22
Bug #51604 (newline in end of header is shown in start of message)
33
--INI--
4-
sendmail_path=tee mail_bug51604.out >/dev/null
4+
sendmail_path={MAIL:mail_bug51604.out}
55
mail.add_x_header = Off
6-
--SKIPIF--
7-
<?php
8-
if(substr(PHP_OS, 0, 3) == "WIN")
9-
die("skip Won't run on Windows");
10-
?>
116
--FILE--
127
<?php
138
// Initialise all required variables

ext/standard/tests/mail/bug66535.phpt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
--TEST--
22
Bug #66535: Extra newline if add_x_header and no additional headers are used
33
--INI--
4-
sendmail_path=tee mailBug66535.out >/dev/null
4+
sendmail_path={MAIL:mailBug66535.out}
55
mail.add_x_header = On
6-
--SKIPIF--
7-
<?php
8-
if(substr(PHP_OS, 0, 3) == "WIN")
9-
die("skip Won't run on Windows");
10-
?>
116
--FILE--
127
<?php
138
/* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])

ext/standard/tests/mail/bug69874.phpt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
--TEST--
22
Bug #69874: Null addtional_headers does not send mail
33
--INI--
4-
sendmail_path=tee mailBug69874.out >/dev/null
4+
sendmail_path={MAIL:mailBug69874.out}
55
mail.add_x_header = Off
6-
--SKIPIF--
7-
<?php
8-
if(substr(PHP_OS, 0, 3) == "WIN")
9-
die("skip Won't run on Windows");
10-
?>
116
--FILE--
127
<?php
138
/* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])

ext/standard/tests/mail/bug69874_2.phpt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
--TEST--
22
Bug #69874: Null addtional_headers does not send mail
33
--INI--
4-
sendmail_path=tee mailBug69874_2.out >/dev/null
4+
sendmail_path={MAIL:mailBug69874_2.out}
55
mail.add_x_header = On
6-
--SKIPIF--
7-
<?php
8-
if(substr(PHP_OS, 0, 3) == "WIN")
9-
die("skip Won't run on Windows");
10-
?>
116
--FILE--
127
<?php
138
/* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])

ext/standard/tests/mail/bug73203.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@ only function besides mb_send_mail() which allows to call php_escape_shell_cmd()
66
with an empty string. Therefore we don't check the resulting email, but only
77
verify that the call succeeds.
88
--INI--
9-
sendmail_path=cat >/dev/null
9+
sendmail_path={MAIL:bug73203.eml}
1010
mail.add_x_header = Off
11-
--SKIPIF--
12-
<?php
13-
if (substr(PHP_OS, 0, 3) === 'WIN') die('skip won\'t run on Windows');
14-
?>
1511
--FILE--
1612
<?php
1713
var_dump(
@@ -20,3 +16,7 @@ var_dump(
2016
?>
2117
--EXPECT--
2218
bool(true)
19+
--CLEAN--
20+
<?php
21+
unlink('bug73203.eml');
22+
?>

ext/standard/tests/mail/mail_basic7.phpt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
--TEST--
22
Test mail() function : array extra header basic functionality
33
--INI--
4-
sendmail_path=tee mailBasic7.out >/dev/null
4+
sendmail_path={MAIL:mailBasic7.out}
55
mail.add_x_header = Off
6-
--SKIPIF--
7-
<?php
8-
if(substr(PHP_OS, 0, 3) == "WIN")
9-
die("skip Won't run on Windows");
10-
?>
116
--FILE--
127
<?php
138
/* Prototype : int mail(string to, string subject, string message [, mixed additional_headers [, string additional_parameters]])

ext/standard/tests/mail/mail_log.phpt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
--TEST--
22
Test mail() function : mail.log ini setting
33
--INI--
4-
sendmail_path=tee /tmp/mail.out >/dev/null
5-
mail.log = /tmp/mail.log
6-
--SKIPIF--
7-
<?php
8-
if(substr(PHP_OS, 0, 3) == "WIN")
9-
die("skip Won't run on Windows");
10-
?>
4+
sendmail_path={MAIL:mail.out}
5+
mail.log = mail.log
116
--FILE--
127
<?php
138
date_default_timezone_set("UTC");
@@ -37,8 +32,8 @@ echo file_get_contents($logfile);
3732
Done
3833
--CLEAN--
3934
<?php
40-
unlink("/tmp/mail.log");
41-
unlink("/tmp/mail.out");
35+
unlink("mail.log");
36+
unlink("mail.out");
4237
?>
4338
--EXPECTF--
4439
bool(true)

0 commit comments

Comments
 (0)