MFH: Specify full path for the cat utility for mbstring e-mail tests.

MFH: Previously made fixes to tests that address bug #25635
php · Sep 24, 2003 · ee3c851 · ee3c851
1 parent ccc0fb6
commit ee3c851
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 24 deletions.
diff --git a/ext/bz2/tests/with_strings.phpt b/ext/bz2/tests/with_strings.phpt
@@ -22,8 +22,7 @@ $blaat2 = bzdecompress(bzcompress($blaat));
 $tests = <<<TESTS
  \$blaat === \$blaat2
 TESTS;
-
- include('tests/quicktester.inc');
+ include(dirname(__FILE__) . '/../../../tests/quicktester.inc');
 
 --EXPECT--
 OK
diff --git a/ext/mbstring/tests/mb_send_mail01.phpt b/ext/mbstring/tests/mb_send_mail01.phpt
@@ -7,7 +7,7 @@ if (@mb_send_mail() === false || !mb_language("neutral")) {
 }
 ?>
 --INI--
-sendmail_path=cat
+sendmail_path=/usr/cat
 --FILE--
 <?php
 $to = 'example@example.com';

diff --git a/ext/mbstring/tests/mb_send_mail02.phpt b/ext/mbstring/tests/mb_send_mail02.phpt
@@ -7,7 +7,7 @@ if (@mb_send_mail() === false || !mb_language("japanese")) {
 }
 ?>
 --INI--
-sendmail_path=cat
+sendmail_path=/bin/cat
 --FILE--
 <?php
 $to = 'example@example.com';

diff --git a/ext/mbstring/tests/mb_send_mail03.phpt b/ext/mbstring/tests/mb_send_mail03.phpt
@@ -7,7 +7,7 @@ if (@mb_send_mail() === false || !mb_language("english")) {
 }
 ?>
 --INI--
-sendmail_path=cat
+sendmail_path=/bin/cat
 --FILE--
 <?php
 $to = 'example@example.com';

diff --git a/ext/mbstring/tests/mb_send_mail04.phpt b/ext/mbstring/tests/mb_send_mail04.phpt
@@ -7,7 +7,7 @@ if (@mb_send_mail() === false || !mb_language("german")) {
 }
 ?>
 --INI--
-sendmail_path=cat
+sendmail_path=/bin/cat
 --FILE--
 <?php
 $to = 'example@example.com';

diff --git a/ext/standard/tests/aggregation/aggregate.phpt b/ext/standard/tests/aggregation/aggregate.phpt
@@ -3,7 +3,7 @@ aggregating everything
 --FILE--
 <?php
 
-include "ext/standard/tests/aggregation/aggregate.lib";
+include dirname(__FILE__) . "/aggregate.lib";
 
 $obj = new simple();
 aggregate($obj, 'helper');

diff --git a/ext/standard/tests/aggregation/aggregate_methods.phpt b/ext/standard/tests/aggregation/aggregate_methods.phpt
@@ -4,7 +4,7 @@ aggregating all methods
 --GET--
 --FILE--
 <?php
-include "ext/standard/tests/aggregation/aggregate.lib";
+include dirname(__FILE__) . "/aggregate.lib";
 
 $obj = new simple();
 aggregate_methods($obj, 'mixin');

diff --git a/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt b/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt
@@ -4,7 +4,7 @@ aggregating methods specified in the list
 --GET--
 --FILE--
 <?php
-include "ext/standard/tests/aggregation/aggregate.lib";
+include dirname(__FILE__) . "/aggregate.lib";
 
 $obj = new simple();
 aggregate_methods_by_list($obj, 'helper', array('just_another_method'));

diff --git a/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt b/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt
@@ -6,7 +6,7 @@ aggregating methods matching regular expression
 --GET--
 --FILE--
 <?php
-include "ext/standard/tests/aggregation/aggregate.lib";
+include dirname(__FILE__) . "/aggregate.lib";
 
 $obj = new simple();
 aggregate_methods_by_regexp($obj, 'helper', '/^do/');

diff --git a/ext/standard/tests/aggregation/aggregate_properties.phpt b/ext/standard/tests/aggregation/aggregate_properties.phpt
@@ -4,7 +4,7 @@ aggregating all default properties
 --GET--
 --FILE--
 <?php
-include "ext/standard/tests/aggregation/aggregate.lib";
+include dirname(__FILE__) . "/aggregate.lib";
 
 $obj = new simple();
 aggregate_properties($obj, 'mixin');

diff --git a/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt b/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt
@@ -4,7 +4,7 @@ aggregating default properties specified in the list
 --GET--
 --FILE--
 <?php
-include "ext/standard/tests/aggregation/aggregate.lib";
+include dirname(__FILE__) . "/aggregate.lib";
 
 $obj = new simple();
 aggregate_properties_by_list($obj, 'helper', array('my_prop', 'our_prop'));

diff --git a/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt b/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt
@@ -6,7 +6,7 @@ aggregating default properties matching regular expression
 --GET--
 --FILE--
 <?php
-include "ext/standard/tests/aggregation/aggregate.lib";
+include dirname(__FILE__) . "/aggregate.lib";
 
 $obj = new simple();
 aggregate_properties_by_regexp($obj, 'helper', '/^my/');

diff --git a/ext/standard/tests/aggregation/aggregation_info.phpt b/ext/standard/tests/aggregation/aggregation_info.phpt
@@ -4,7 +4,7 @@ retrieving aggregation info
 --GET--
 --FILE--
 <?php
-include "ext/standard/tests/aggregation/aggregate.lib";
+include dirname(__FILE__) . "/aggregate.lib";
 
 $obj = new simple();
 aggregate($obj, 'mixin');

diff --git a/ext/standard/tests/aggregation/deaggregate.phpt b/ext/standard/tests/aggregation/deaggregate.phpt
@@ -4,7 +4,7 @@ deaggreating
 --GET--
 --FILE--
 <?php
-include "ext/standard/tests/aggregation/aggregate.lib";
+include dirname(__FILE__) . "/aggregate.lib";
 
 $obj = new simple();
 aggregate($obj, 'helper');

diff --git a/ext/standard/tests/array/001.phpt b/ext/standard/tests/array/001.phpt
@@ -6,7 +6,7 @@ Test array_merge and array_walk
 precision=14
 --FILE--
 <?php
-require('ext/standard/tests/array/data.inc');
+require(dirname(__FILE__) . '/data.inc');
 /*
 ** Create sample arrays
 ** Test alpha, numeric (decimal, hex, octal) and special data

diff --git a/ext/standard/tests/array/002.phpt b/ext/standard/tests/array/002.phpt
@@ -4,7 +4,7 @@ Test arsort, asort, krsort, ksort, rsort, and sort
 precision=14
 --FILE--
 <?php
-require('ext/standard/tests/array/data.inc');
+require(dirname(__FILE__) . '/data.inc');
 
 function test_sort ($sort_function, $data) {
     echo "\n -- Testing $sort_function() -- \n";

diff --git a/ext/standard/tests/array/003.phpt b/ext/standard/tests/array/003.phpt
@@ -4,7 +4,7 @@ Test usort, uksort and uasort
 precision=14
 --FILE--
 <?php
-require('ext/standard/tests/array/data.inc');
+require(dirname(__FILE__) . '/data.inc');
 
 function cmp ($a, $b) {
     is_array ($a)

diff --git a/ext/standard/tests/array/array_search.phpt b/ext/standard/tests/array/array_search.phpt
@@ -17,7 +17,7 @@ TRUE  === in_array('a', \$arr1)
 'key'=== array_search('d', \$arr4)
 TESTS;
 
-include('tests/quicktester.inc');
+include(dirname(__FILE__) . '/../../../../tests/quicktester.inc');
 
 --EXPECT--
 OK
diff --git a/ext/standard/tests/math/abs.phpt b/ext/standard/tests/math/abs.phpt
@@ -20,7 +20,7 @@ $tests = <<<TESTS
 -(LONG_MIN+1) === abs(LONG_MIN+1)
 TESTS;
 
-include('tests/quicktester.inc');
+include(dirname(__FILE__) . '/../../../../tests/quicktester.inc');
 --EXPECT--
 1,1,0,0
 OK
diff --git a/ext/standard/tests/math/pow.phpt b/ext/standard/tests/math/pow.phpt
@@ -143,7 +143,7 @@ LONG_MIN*LONG_MIN ~== pow(LONG_MIN,2.0)
 TESTS;
 
  echo "On failure, please mail result to php-dev@lists.php.net\n";
- include('tests/quicktester.inc');
+ include(dirname(__FILE__) . '/../../../../tests/quicktester.inc');
 
 --EXPECT--
 1,1,0,0

diff --git a/ext/standard/tests/math/round.phpt b/ext/standard/tests/math/round.phpt
@@ -33,7 +33,7 @@ $tests = <<<TESTS
  LONG_MAX   ~== floor(LONG_MAX + 0.5)
 TESTS;
 
-include('tests/quicktester.inc');
+include(dirname(__FILE__) . '/../../../../tests/quicktester.inc');
 --EXPECT--
 1,1,0,0
 OK
diff --git a/ext/standard/tests/strings/trim.phpt b/ext/standard/tests/strings/trim.phpt
@@ -23,7 +23,7 @@ $tests = <<<TESTS
 "ABC" === trim("ABC\\x50\\xC1\\x60\\x90","\\x50..\\xC1")
 TESTS;
 
-include('tests/quicktester.inc');
+include(dirname(__FILE__) . '/../../../../tests/quicktester.inc');
 
 --EXPECT--
 OK
diff --git a/ext/standard/tests/strings/wordwrap.phpt b/ext/standard/tests/strings/wordwrap.phpt
@@ -31,7 +31,7 @@ $tests = <<<TESTS
 
 TESTS;
 
-include('tests/quicktester.inc');
+include(dirname(__FILE__) . '/../../../../tests/quicktester.inc');
 
 --EXPECT--
 OK