jani            Thu Apr 30 13:22:24 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/standard/tests/mail    mail_basic2.phpt 
                                        mail_variation2.phpt 
  Log:
  MFH: fix tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/mail/mail_basic2.phpt?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/standard/tests/mail/mail_basic2.phpt
diff -u php-src/ext/standard/tests/mail/mail_basic2.phpt:1.2.2.3 
php-src/ext/standard/tests/mail/mail_basic2.phpt:1.2.2.4
--- php-src/ext/standard/tests/mail/mail_basic2.phpt:1.2.2.3    Tue Feb 17 
15:21:10 2009
+++ php-src/ext/standard/tests/mail/mail_basic2.phpt    Thu Apr 30 13:22:24 2009
@@ -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 @@
 $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 @@
 
 sleep(5);
 echo file_get_contents($outFile);
-//unlink($outFile);
+unlink($outFile);
 ?>
 ===DONE===
 --EXPECT--
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/mail/mail_variation2.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/standard/tests/mail/mail_variation2.phpt
diff -u php-src/ext/standard/tests/mail/mail_variation2.phpt:1.2.2.2 
php-src/ext/standard/tests/mail/mail_variation2.phpt:1.2.2.3
--- php-src/ext/standard/tests/mail/mail_variation2.phpt:1.2.2.2        Fri Jan 
23 17:12:19 2009
+++ php-src/ext/standard/tests/mail/mail_variation2.phpt        Thu Apr 30 
13:22:24 2009
@@ -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 @@
 $to = 'u...@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) );



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to