mailprotect test cases now work on linux

sektioneins · May 21, 2015 · c60c18e · c60c18e
1 parent 4a16e56
commit c60c18e
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/tests/misc/mailprotect_1_header_nl.phpt b/tests/misc/mailprotect_1_header_nl.phpt
@@ -8,7 +8,7 @@ suhosin.log.stdout=0
 suhosin.log.script=0
 suhosin.log.syslog=0
 suhosin.mail.protect=1
-sendmail_path=/usr/bin/true
+sendmail_path=$([ -f /bin/true ]&& echo /bin/true || echo /usr/bin/true)
 --FILE--
 <?php
 	var_dump(mail("to", "subject", "msg", "\r\nFoo: bar"));

diff --git a/tests/misc/mailprotect_1_header_nlnl.phpt b/tests/misc/mailprotect_1_header_nlnl.phpt
@@ -8,7 +8,7 @@ suhosin.log.stdout=0
 suhosin.log.script=0
 suhosin.log.syslog=0
 suhosin.mail.protect=1
-sendmail_path=/usr/bin/true
+sendmail_path=$([ -f /bin/true ]&& echo /bin/true || echo /usr/bin/true)
 --FILE--
 <?php
 	var_dump(mail("to", "subject", "msg", "Foo: bar\r\n\r\nfake-msg-start"));

diff --git a/tests/misc/mailprotect_1_subject.phpt b/tests/misc/mailprotect_1_subject.phpt
@@ -8,7 +8,7 @@ suhosin.log.stdout=0
 suhosin.log.script=0
 suhosin.log.syslog=0
 suhosin.mail.protect=1
-sendmail_path=/usr/bin/true
+sendmail_path=$([ -f /bin/true ]&& echo /bin/true || echo /usr/bin/true)
 --FILE--
 <?php
 	var_dump(mail("to", "sub\nject", "msg"));

diff --git a/tests/misc/mailprotect_1_subject_long.phpt b/tests/misc/mailprotect_1_subject_long.phpt
@@ -8,7 +8,7 @@ suhosin.log.stdout=0
 suhosin.log.script=0
 suhosin.log.syslog=0
 suhosin.mail.protect=1
-sendmail_path=/usr/bin/true
+sendmail_path=$([ -f /bin/true ]&& echo /bin/true || echo /usr/bin/true)
 --FILE--
 <?php
 	var_dump(mail("to", "sub\n ject\r\n\tfoo", "msg"));

diff --git a/tests/misc/mailprotect_1_to.phpt b/tests/misc/mailprotect_1_to.phpt
@@ -8,7 +8,7 @@ suhosin.log.stdout=0
 suhosin.log.script=0
 suhosin.log.syslog=0
 suhosin.mail.protect=1
-sendmail_path=/usr/bin/true
+sendmail_path=$([ -f /bin/true ]&& echo /bin/true || echo /usr/bin/true)
 --FILE--
 <?php
 	var_dump(mail("t\r\no", "subject", "msg"));

diff --git a/tests/misc/mailprotect_1_to_long.phpt b/tests/misc/mailprotect_1_to_long.phpt
@@ -8,7 +8,7 @@ suhosin.log.stdout=0
 suhosin.log.script=0
 suhosin.log.syslog=0
 suhosin.mail.protect=1
-sendmail_path=/usr/bin/true
+sendmail_path=$([ -f /bin/true ]&& echo /bin/true || echo /usr/bin/true)
 --FILE--
 <?php
 	var_dump(mail("to\n long\r\n\tfoo", "subject", "msg"));

diff --git a/tests/misc/mailprotect_2_bcc.phpt b/tests/misc/mailprotect_2_bcc.phpt
@@ -8,7 +8,7 @@ suhosin.log.stdout=0
 suhosin.log.script=0
 suhosin.log.syslog=0
 suhosin.mail.protect=2
-sendmail_path=/usr/bin/true
+sendmail_path=$([ -f /bin/true ]&& echo /bin/true || echo /usr/bin/true)
 --FILE--
 <?php
 	var_dump(mail("to", "subject", "msg", "Bcc: me"));

diff --git a/tests/misc/mailprotect_2_cc.phpt b/tests/misc/mailprotect_2_cc.phpt
@@ -8,7 +8,7 @@ suhosin.log.stdout=0
 suhosin.log.script=0
 suhosin.log.syslog=0
 suhosin.mail.protect=2
-sendmail_path=/usr/bin/true
+sendmail_path=$([ -f /bin/true ]&& echo /bin/true || echo /usr/bin/true)
 --FILE--
 <?php
 	var_dump(mail("to", "subject", "msg", "Cc: me"));

diff --git a/tests/misc/mailprotect_2_to.phpt b/tests/misc/mailprotect_2_to.phpt
@@ -8,7 +8,7 @@ suhosin.log.stdout=0
 suhosin.log.script=0
 suhosin.log.syslog=0
 suhosin.mail.protect=2
-sendmail_path=/usr/bin/true
+sendmail_path=$([ -f /bin/true ]&& echo /bin/true || echo /usr/bin/true)
 --FILE--
 <?php
 	var_dump(mail("to", "subject", "msg", "To: me"));