From 8d7ecdfdbb81efae4c8d7baa6c3b690c2effd57c Mon Sep 17 00:00:00 2001
From: Jani Taskinen <jani@php.net>
Date: Thu, 30 Apr 2009 13:22:24 +0000
Subject: [PATCH] MFH: fix tests

---
 ext/standard/tests/mail/mail_basic2.phpt     | 8 ++++----
 ext/standard/tests/mail/mail_variation2.phpt | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ext/standard/tests/mail/mail_basic2.phpt b/ext/standard/tests/mail/mail_basic2.phpt
index bb2e42eebcc..8f9ef64135b 100644
--- a/ext/standard/tests/mail/mail_basic2.phpt
+++ b/ext/standard/tests/mail/mail_basic2.phpt
@@ -1,12 +1,12 @@
 --TEST--
 Test mail() function : basic functionality 
---INI--
-sendmail_path=echo --- > mailBasic2.out
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == "WIN")
   die("skip Won't run on Windows");
 ?>
+--INI--
+sendmail_path="echo --- > /tmp/php_test_mailBasic2.out"
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
@@ -24,7 +24,7 @@ $subject = 'Test Subject';
 $message = 'A Message';
 $additional_headers = 'KHeaders';
 $additional_parameters = "Extras";
-$outFile = "mailBasic2.out";
+$outFile = "/tmp/php_test_mailBasic2.out";
 @unlink($outFile);
 
 echo "-- extra parameters --\n";
@@ -37,7 +37,7 @@ var_dump( mail($to, $subject, $message, $additional_headers, $additional_paramet
 
 sleep(5);
 echo file_get_contents($outFile);
-//unlink($outFile);
+unlink($outFile);
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/mail/mail_variation2.phpt b/ext/standard/tests/mail/mail_variation2.phpt
index 1a0fcc69d05..59ef1d9028a 100644
--- a/ext/standard/tests/mail/mail_variation2.phpt
+++ b/ext/standard/tests/mail/mail_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test mail() function : variation force extra parameters
 --INI--
-sendmail_path=echo --- > mailBasic2.out
+sendmail_path="echo --- > /tmp/php_test_mailVariation2.out"
 mail.force_extra_parameters="forced params"
 --SKIPIF--
 <?php
@@ -23,7 +23,7 @@ echo "*** Testing mail() : basic functionality ***\n";
 $to = 'user@company.com';
 $subject = 'Test Subject';
 $message = 'A Message';
-$outFile = "mailBasic2.out";
+$outFile = "/tmp/php_test_mailVariation2.out";
 @unlink($outFile);
 
 var_dump( mail($to, $subject, $message) );