iliaa Tue Sep 23 22:29:16 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/standard/tests/strings wordwrap.phpt trim.phpt /php-src/ext/standard/tests/math round.phpt pow.phpt abs.phpt /php-src/ext/standard/tests/array array_search.phpt 003.phpt 002.phpt 001.phpt /php-src/ext/standard/tests/aggregation deaggregate.phpt aggregation_info.phpt aggregate_properties_by_regexp.phpt aggregate_properties_by_list.phpt aggregate_properties.phpt aggregate_methods_by_regexp.phpt aggregate_methods_by_list.phpt aggregate_methods.phpt aggregate.phpt /php-src/ext/mbstring/tests mb_send_mail04.phpt mb_send_mail03.phpt mb_send_mail02.phpt mb_send_mail01.phpt /php-src/ext/bz2/tests with_strings.phpt Log: MFH: Specify full path for the cat utility for mbstring e-mail tests. MFH: Previously made fixes to tests that address bug #25635
Index: php-src/ext/standard/tests/strings/wordwrap.phpt diff -u php-src/ext/standard/tests/strings/wordwrap.phpt:1.5 php-src/ext/standard/tests/strings/wordwrap.phpt:1.5.4.1 --- php-src/ext/standard/tests/strings/wordwrap.phpt:1.5 Sun Mar 17 21:00:57 2002 +++ php-src/ext/standard/tests/strings/wordwrap.phpt Tue Sep 23 22:29:11 2003 @@ -31,7 +31,7 @@ TESTS; -include('tests/quicktester.inc'); +include(dirname(__FILE__) . '/../../../../tests/quicktester.inc'); --EXPECT-- OK Index: php-src/ext/standard/tests/strings/trim.phpt diff -u php-src/ext/standard/tests/strings/trim.phpt:1.4 php-src/ext/standard/tests/strings/trim.phpt:1.4.2.1 --- php-src/ext/standard/tests/strings/trim.phpt:1.4 Sun Oct 6 15:12:22 2002 +++ php-src/ext/standard/tests/strings/trim.phpt Tue Sep 23 22:29:11 2003 @@ -23,7 +23,7 @@ "ABC" === trim("ABC\\x50\\xC1\\x60\\x90","\\x50..\\xC1") TESTS; -include('tests/quicktester.inc'); +include(dirname(__FILE__) . '/../../../../tests/quicktester.inc'); --EXPECT-- OK Index: php-src/ext/standard/tests/math/round.phpt diff -u php-src/ext/standard/tests/math/round.phpt:1.2 php-src/ext/standard/tests/math/round.phpt:1.2.8.1 --- php-src/ext/standard/tests/math/round.phpt:1.2 Tue Mar 5 04:00:56 2002 +++ php-src/ext/standard/tests/math/round.phpt Tue Sep 23 22:29:12 2003 @@ -3,7 +3,7 @@ --POST-- --GET-- --FILE-- -<?php // $Id: round.phpt,v 1.2 2002/03/05 09:00:56 derick Exp $ +<?php // $Id: round.phpt,v 1.2.8.1 2003/09/24 02:29:12 iliaa Exp $ define('LONG_MAX', is_int(5000000000)? 9223372036854775807 : 0x7FFFFFFF); define('LONG_MIN', -LONG_MAX - 1); @@ -33,7 +33,7 @@ LONG_MAX ~== floor(LONG_MAX + 0.5) TESTS; -include('tests/quicktester.inc'); +include(dirname(__FILE__) . '/../../../../tests/quicktester.inc'); --EXPECT-- 1,1,0,0 OK Index: php-src/ext/standard/tests/math/pow.phpt diff -u php-src/ext/standard/tests/math/pow.phpt:1.12 php-src/ext/standard/tests/math/pow.phpt:1.12.4.1 --- php-src/ext/standard/tests/math/pow.phpt:1.12 Thu Mar 21 09:18:30 2002 +++ php-src/ext/standard/tests/math/pow.phpt Tue Sep 23 22:29:12 2003 @@ -3,7 +3,7 @@ --POST-- --GET-- --FILE-- -<?php // $Id: pow.phpt,v 1.12 2002/03/21 14:18:30 sander Exp $ +<?php // $Id: pow.phpt,v 1.12.4.1 2003/09/24 02:29:12 iliaa Exp $ define('LONG_MAX', is_int(5000000000)? 9223372036854775807 : 0x7FFFFFFF); define('LONG_MIN', -LONG_MAX - 1); @@ -143,7 +143,7 @@ TESTS; echo "On failure, please mail result to [EMAIL PROTECTED]"; - include('tests/quicktester.inc'); + include(dirname(__FILE__) . '/../../../../tests/quicktester.inc'); --EXPECT-- 1,1,0,0 Index: php-src/ext/standard/tests/math/abs.phpt diff -u php-src/ext/standard/tests/math/abs.phpt:1.2 php-src/ext/standard/tests/math/abs.phpt:1.2.8.1 --- php-src/ext/standard/tests/math/abs.phpt:1.2 Tue Mar 5 04:00:56 2002 +++ php-src/ext/standard/tests/math/abs.phpt Tue Sep 23 22:29:12 2003 @@ -3,7 +3,7 @@ --POST-- --GET-- --FILE-- -<?php // $Id: abs.phpt,v 1.2 2002/03/05 09:00:56 derick Exp $ +<?php // $Id: abs.phpt,v 1.2.8.1 2003/09/24 02:29:12 iliaa Exp $ define('LONG_MAX', is_int(5000000000)? 9223372036854775807 : 0x7FFFFFFF); define('LONG_MIN', -LONG_MAX - 1); @@ -20,7 +20,7 @@ -(LONG_MIN+1) === abs(LONG_MIN+1) TESTS; -include('tests/quicktester.inc'); +include(dirname(__FILE__) . '/../../../../tests/quicktester.inc'); --EXPECT-- 1,1,0,0 OK Index: php-src/ext/standard/tests/array/array_search.phpt diff -u php-src/ext/standard/tests/array/array_search.phpt:1.2.8.1 php-src/ext/standard/tests/array/array_search.phpt:1.2.8.2 --- php-src/ext/standard/tests/array/array_search.phpt:1.2.8.1 Sat Nov 16 12:30:10 2002 +++ php-src/ext/standard/tests/array/array_search.phpt Tue Sep 23 22:29:12 2003 @@ -17,7 +17,7 @@ 'key'=== array_search('d', \$arr4) TESTS; -include('tests/quicktester.inc'); +include(dirname(__FILE__) . '/../../../../tests/quicktester.inc'); --EXPECT-- OK Index: php-src/ext/standard/tests/array/003.phpt diff -u php-src/ext/standard/tests/array/003.phpt:1.4.2.2 php-src/ext/standard/tests/array/003.phpt:1.4.2.3 --- php-src/ext/standard/tests/array/003.phpt:1.4.2.2 Mon Aug 11 19:56:18 2003 +++ php-src/ext/standard/tests/array/003.phpt Tue Sep 23 22:29:12 2003 @@ -4,7 +4,7 @@ precision=14 --FILE-- <?php -require('ext/standard/tests/array/data.inc'); +require(dirname(__FILE__) . '/data.inc'); function cmp ($a, $b) { is_array ($a) Index: php-src/ext/standard/tests/array/002.phpt diff -u php-src/ext/standard/tests/array/002.phpt:1.3.2.2 php-src/ext/standard/tests/array/002.phpt:1.3.2.3 --- php-src/ext/standard/tests/array/002.phpt:1.3.2.2 Mon Aug 11 19:56:18 2003 +++ php-src/ext/standard/tests/array/002.phpt Tue Sep 23 22:29:12 2003 @@ -4,7 +4,7 @@ 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"; Index: php-src/ext/standard/tests/array/001.phpt diff -u php-src/ext/standard/tests/array/001.phpt:1.5.2.2 php-src/ext/standard/tests/array/001.phpt:1.5.2.3 --- php-src/ext/standard/tests/array/001.phpt:1.5.2.2 Wed Aug 13 06:40:56 2003 +++ php-src/ext/standard/tests/array/001.phpt Tue Sep 23 22:29:12 2003 @@ -6,7 +6,7 @@ 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 Index: php-src/ext/standard/tests/aggregation/deaggregate.phpt diff -u php-src/ext/standard/tests/aggregation/deaggregate.phpt:1.4 php-src/ext/standard/tests/aggregation/deaggregate.phpt:1.4.4.1 --- php-src/ext/standard/tests/aggregation/deaggregate.phpt:1.4 Thu May 16 17:53:18 2002 +++ php-src/ext/standard/tests/aggregation/deaggregate.phpt Tue Sep 23 22:29:13 2003 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "ext/standard/tests/aggregation/aggregate.lib"; +include dirname(__FILE__) . "/aggregate.lib"; $obj = new simple(); aggregate($obj, 'helper'); Index: php-src/ext/standard/tests/aggregation/aggregation_info.phpt diff -u php-src/ext/standard/tests/aggregation/aggregation_info.phpt:1.4 php-src/ext/standard/tests/aggregation/aggregation_info.phpt:1.4.4.1 --- php-src/ext/standard/tests/aggregation/aggregation_info.phpt:1.4 Thu May 16 17:53:18 2002 +++ php-src/ext/standard/tests/aggregation/aggregation_info.phpt Tue Sep 23 22:29:13 2003 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "ext/standard/tests/aggregation/aggregate.lib"; +include dirname(__FILE__) . "/aggregate.lib"; $obj = new simple(); aggregate($obj, 'mixin'); Index: php-src/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt diff -u php-src/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt:1.5 php-src/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt:1.5.2.1 --- php-src/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt:1.5 Tue Oct 8 05:46:31 2002 +++ php-src/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt Tue Sep 23 22:29:13 2003 @@ -6,7 +6,7 @@ --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/'); Index: php-src/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt diff -u php-src/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt:1.4 php-src/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt:1.4.4.1 --- php-src/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt:1.4 Thu May 16 17:53:18 2002 +++ php-src/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt Tue Sep 23 22:29:13 2003 @@ -4,7 +4,7 @@ --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')); Index: php-src/ext/standard/tests/aggregation/aggregate_properties.phpt diff -u php-src/ext/standard/tests/aggregation/aggregate_properties.phpt:1.4 php-src/ext/standard/tests/aggregation/aggregate_properties.phpt:1.4.4.1 --- php-src/ext/standard/tests/aggregation/aggregate_properties.phpt:1.4 Thu May 16 17:53:18 2002 +++ php-src/ext/standard/tests/aggregation/aggregate_properties.phpt Tue Sep 23 22:29:13 2003 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "ext/standard/tests/aggregation/aggregate.lib"; +include dirname(__FILE__) . "/aggregate.lib"; $obj = new simple(); aggregate_properties($obj, 'mixin'); Index: php-src/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt diff -u php-src/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt:1.4.4.1 php-src/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt:1.4.4.2 --- php-src/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt:1.4.4.1 Thu Jul 31 22:15:56 2003 +++ php-src/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt Tue Sep 23 22:29:13 2003 @@ -6,7 +6,7 @@ --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/'); Index: php-src/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt diff -u php-src/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt:1.4 php-src/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt:1.4.4.1 --- php-src/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt:1.4 Thu May 16 17:53:18 2002 +++ php-src/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt Tue Sep 23 22:29:13 2003 @@ -4,7 +4,7 @@ --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')); Index: php-src/ext/standard/tests/aggregation/aggregate_methods.phpt diff -u php-src/ext/standard/tests/aggregation/aggregate_methods.phpt:1.4 php-src/ext/standard/tests/aggregation/aggregate_methods.phpt:1.4.4.1 --- php-src/ext/standard/tests/aggregation/aggregate_methods.phpt:1.4 Thu May 16 17:53:18 2002 +++ php-src/ext/standard/tests/aggregation/aggregate_methods.phpt Tue Sep 23 22:29:13 2003 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "ext/standard/tests/aggregation/aggregate.lib"; +include dirname(__FILE__) . "/aggregate.lib"; $obj = new simple(); aggregate_methods($obj, 'mixin'); Index: php-src/ext/standard/tests/aggregation/aggregate.phpt diff -u php-src/ext/standard/tests/aggregation/aggregate.phpt:1.4 php-src/ext/standard/tests/aggregation/aggregate.phpt:1.4.4.1 --- php-src/ext/standard/tests/aggregation/aggregate.phpt:1.4 Thu May 16 17:53:18 2002 +++ php-src/ext/standard/tests/aggregation/aggregate.phpt Tue Sep 23 22:29:13 2003 @@ -3,7 +3,7 @@ --FILE-- <?php -include "ext/standard/tests/aggregation/aggregate.lib"; +include dirname(__FILE__) . "/aggregate.lib"; $obj = new simple(); aggregate($obj, 'helper'); Index: php-src/ext/mbstring/tests/mb_send_mail04.phpt diff -u php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.1.2.3 php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.1.2.4 --- php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.1.2.3 Tue May 13 20:37:45 2003 +++ php-src/ext/mbstring/tests/mb_send_mail04.phpt Tue Sep 23 22:29:14 2003 @@ -7,7 +7,7 @@ } ?> --INI-- -sendmail_path=cat +sendmail_path=/bin/cat --FILE-- <?php $to = '[EMAIL PROTECTED]'; Index: php-src/ext/mbstring/tests/mb_send_mail03.phpt diff -u php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.2.2.3 php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.2.2.4 --- php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.2.2.3 Tue May 13 20:37:45 2003 +++ php-src/ext/mbstring/tests/mb_send_mail03.phpt Tue Sep 23 22:29:14 2003 @@ -7,7 +7,7 @@ } ?> --INI-- -sendmail_path=cat +sendmail_path=/bin/cat --FILE-- <?php $to = '[EMAIL PROTECTED]'; Index: php-src/ext/mbstring/tests/mb_send_mail02.phpt diff -u php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.2.2.2 php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.2.2.3 --- php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.2.2.2 Tue May 13 20:37:45 2003 +++ php-src/ext/mbstring/tests/mb_send_mail02.phpt Tue Sep 23 22:29:14 2003 @@ -7,7 +7,7 @@ } ?> --INI-- -sendmail_path=cat +sendmail_path=/bin/cat --FILE-- <?php $to = '[EMAIL PROTECTED]'; Index: php-src/ext/mbstring/tests/mb_send_mail01.phpt diff -u php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.1.2.3 php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.1.2.4 --- php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.1.2.3 Tue May 13 20:37:45 2003 +++ php-src/ext/mbstring/tests/mb_send_mail01.phpt Tue Sep 23 22:29:14 2003 @@ -7,7 +7,7 @@ } ?> --INI-- -sendmail_path=cat +sendmail_path=/usr/cat --FILE-- <?php $to = '[EMAIL PROTECTED]'; Index: php-src/ext/bz2/tests/with_strings.phpt diff -u php-src/ext/bz2/tests/with_strings.phpt:1.1.2.1 php-src/ext/bz2/tests/with_strings.phpt:1.1.2.2 --- php-src/ext/bz2/tests/with_strings.phpt:1.1.2.1 Tue Jul 1 04:08:43 2003 +++ php-src/ext/bz2/tests/with_strings.phpt Tue Sep 23 22:29:15 2003 @@ -5,7 +5,7 @@ --POST-- --GET-- --FILE-- -<?php // $Id: with_strings.phpt,v 1.1.2.1 2003/07/01 08:08:43 edink Exp $ +<?php // $Id: with_strings.phpt,v 1.1.2.2 2003/09/24 02:29:15 iliaa Exp $ error_reporting(E_ALL); @@ -22,8 +22,7 @@ $tests = <<<TESTS \$blaat === \$blaat2 TESTS; - - include('tests/quicktester.inc'); + include(dirname(__FILE__) . '/../../../tests/quicktester.inc'); --EXPECT-- OK
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php