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

MFH: Previously made fixes to tests that address bug #25635

diff --git a/ext/bz2/tests/with_strings.phpt b/ext/bz2/tests/with_strings.phpt
index 09f2291bb4765a3f29ae39cc9abcb3e08014ef64..7c6ca78ce4f796248d62429626264d216cbd6435 100644 (file)
--- 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 4c7518545460aefff4c03e9f176a13bf5087346d..af70a8e23d43d74b5c54d821bf455b0256aceed6 100644 (file)
--- 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 f3048ddefaee2b78724f547303213fb4e4250f8d..34dee474bc682ca7f4b8694f211cfee7c9a3b278 100644 (file)
--- 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 545c6b71bbb159af2ee6fd92ca212256225d8a23..3113d8e2bac27d10315b9925284673b18a03346e 100644 (file)
--- 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 9b8b53633b1ed89a1d57c260d19ffb84442939d5..468a1e367bf30852cb160c18e8fc39c86402698f 100644 (file)
--- 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 46aa9133b6feddde4608afa08d3d6ff37f57d1c6..ecd7bf31f98e7175f8d6151a7c67842cdbf0c587 100644 (file)
--- 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 b612881c59319420fde4ac6586c4b16986b8352b..a09f5d237d7179374eb715e1facfbef9ca04de64 100644 (file)
--- 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 312a57d1b2710e443c0872719101a6fad30ee350..958ce095f6f64d739d9b7c0242e8fc954d9fb4d9 100644 (file)
--- 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 1b67b1b93fc3c5b9be9993caa0a2e63327cb2d07..4197cfb1ec0a9fa0ae30884c8f4f8fa8a90e5a66 100644 (file)
--- 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 2a976c71a77cfb51f5d782db55b98906fd31bdb3..71b1c5ceeb77b6e0fcbafe245b08c6ab0c6c559e 100644 (file)
--- 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 fa12d36bcb47b29820d60549feb98a984aac5413..1e83116d8beddde7d6653345c07b8d9751ddac7e 100644 (file)
--- 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 9a74f5536d763076f9238b2230717c8a3ae94d1f..7ee6631624146cc650fee84ab4b586037e91c664 100644 (file)
--- 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 8dd943cbccade37564cb1ece5ec7a9983feabb5c..73dd87e741c2497ac5bb97d8ef9ccbf1cd82ceb7 100644 (file)
--- 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 5c551d75bd7fc671d5968489fef938df664b83d6..3fe7680cb07ff338ddeb50eaeb16a8ac67ad6cad 100644 (file)
--- 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 060367d1122cf10cf7818b8b0702aae776ee0e52..3b72b331d22691d8275d0a1bd0b7f9bf7865f84d 100644 (file)
--- 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 676554ea33e88ac4e54d7d84832c9979236a3b56..f33cf4206746387d351db70c44a2ab0839179e6a 100644 (file)
--- 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 baca8d40557c11ead7803b9bb40f20591f049b94..f307186553378a688fb1cd81afd752bc20f8b8ae 100644 (file)
--- 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 9c21de94e44fc7cbf9d9c680b8c7249f288ad1bf..e95fda1286ba1b82b8f296afcbf5cb0896334bcd 100644 (file)
--- 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 e4e5587897921a1421eeda27ba37a33584a6d756..3b70e7dc4726ab9c2db4a28a1697e8b4b9f351ef 100644 (file)
--- 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 12170f4f3a1981d96fc9cfff167adc556b3fc8d0..deda5a94b0905604ed83c9e024bb32c04f692493 100644 (file)
--- 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 49eabed6068a414c7c4345d30105b7792d7a0418..23032e906cee5402fec78137dbb7e1c0a9ac70d4 100644 (file)
--- 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 881064d7e455d24a58d614dda514ba097d1169d2..c4f5860e2fb171db6a1396f9c5d47e6c3cae80c5 100644 (file)
--- 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 3fc8f1d8805a814b73881675aa2d5e8dbec1d3a1..eb85d32dc9dd8201c6c74d2090ba58567837f79f 100644 (file)
--- 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