From ee3c85162fd2c78d2be370b10f2650007f3fea16 Mon Sep 17 00:00:00 2001
From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 24 Sep 2003 02:29:15 +0000
Subject: [PATCH] MFH: Specify full path for the cat utility for mbstring
 e-mail tests. MFH: Previously made fixes to tests that address bug #25635

---
 ext/bz2/tests/with_strings.phpt                                | 3 +--
 ext/mbstring/tests/mb_send_mail01.phpt                         | 2 +-
 ext/mbstring/tests/mb_send_mail02.phpt                         | 2 +-
 ext/mbstring/tests/mb_send_mail03.phpt                         | 2 +-
 ext/mbstring/tests/mb_send_mail04.phpt                         | 2 +-
 ext/standard/tests/aggregation/aggregate.phpt                  | 2 +-
 ext/standard/tests/aggregation/aggregate_methods.phpt          | 2 +-
 ext/standard/tests/aggregation/aggregate_methods_by_list.phpt  | 2 +-
 .../tests/aggregation/aggregate_methods_by_regexp.phpt         | 2 +-
 ext/standard/tests/aggregation/aggregate_properties.phpt       | 2 +-
 .../tests/aggregation/aggregate_properties_by_list.phpt        | 2 +-
 .../tests/aggregation/aggregate_properties_by_regexp.phpt      | 2 +-
 ext/standard/tests/aggregation/aggregation_info.phpt           | 2 +-
 ext/standard/tests/aggregation/deaggregate.phpt                | 2 +-
 ext/standard/tests/array/001.phpt                              | 2 +-
 ext/standard/tests/array/002.phpt                              | 2 +-
 ext/standard/tests/array/003.phpt                              | 2 +-
 ext/standard/tests/array/array_search.phpt                     | 2 +-
 ext/standard/tests/math/abs.phpt                               | 2 +-
 ext/standard/tests/math/pow.phpt                               | 2 +-
 ext/standard/tests/math/round.phpt                             | 2 +-
 ext/standard/tests/strings/trim.phpt                           | 2 +-
 ext/standard/tests/strings/wordwrap.phpt                       | 2 +-
 23 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/ext/bz2/tests/with_strings.phpt b/ext/bz2/tests/with_strings.phpt
index 09f2291bb4..7c6ca78ce4 100644
--- 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
index 4c75185454..af70a8e23d 100644
--- 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
index f3048ddefa..34dee474bc 100644
--- 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
index 545c6b71bb..3113d8e2ba 100644
--- 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
index 9b8b53633b..468a1e367b 100644
--- 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
index 46aa9133b6..ecd7bf31f9 100644
--- 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
index b612881c59..a09f5d237d 100644
--- 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
index 312a57d1b2..958ce095f6 100644
--- 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
index 1b67b1b93f..4197cfb1ec 100644
--- 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
index 2a976c71a7..71b1c5ceeb 100644
--- 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
index fa12d36bcb..1e83116d8b 100644
--- 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
index 9a74f5536d..7ee6631624 100644
--- 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
index 8dd943cbcc..73dd87e741 100644
--- 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
index 5c551d75bd..3fe7680cb0 100644
--- 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
index 060367d112..3b72b331d2 100644
--- 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
index 676554ea33..f33cf42067 100644
--- 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
index baca8d4055..f307186553 100644
--- 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
index 9c21de94e4..e95fda1286 100644
--- 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
index e4e5587897..3b70e7dc47 100644
--- 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
index 12170f4f3a..deda5a94b0 100644
--- 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
index 49eabed606..23032e906c 100644
--- 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
index 881064d7e4..c4f5860e2f 100644
--- 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
index 3fc8f1d880..eb85d32dc9 100644
--- 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
-- 
2.50.1