cvs: php4 /ext/standard/tests/aggregation aggregate.phpt aggregate_methods.phpt aggregate_methods_by_list.phpt aggregate_methods_by_regexp.phpt
aggregate_properties.phpt aggregate_properties_by_list.phpt aggregate_properties_by_regexp.phpt aggregation_info.phpt deaggregate.phpt
/ext/standard/tests/array 001.phpt array_search.phpt /ext/standard/tests/file 001.phpt /ext/standard/tests/general_functions 004.phpt
/ext/standard/tests/math abs.phpt pow.phpt round.phpt /ext/standard/tests/strings trim.phpt wordwrap.phpt

derick Tue Mar 5 04:00:58 2002 EDT Modified files: /php4/ext/standard/tests/aggregation aggregate.phpt aggregate_methods.phpt aggregate_methods_by_list.phpt aggregate_methods_by_regexp.phpt aggregate_properties.phpt aggregate_properties_by_list.phpt aggregate_properties_by_regexp.phpt aggregation_info.phpt deaggregate.phpt /php4/ext/standard/tests/array 001.phpt array_search.phpt /php4/ext/standard/tests/file 001.phpt /php4/ext/standard/tests/general_functions 004.phpt /php4/ext/standard/tests/math abs.phpt pow.phpt round.phpt /php4/ext/standard/tests/strings trim.phpt wordwrap.phpt Log: - Fix tests to work with CLI #- Not totally done, but this makes it a lot better

Index: php4/ext/standard/tests/aggregation/aggregate.phpt diff -u php4/ext/standard/tests/aggregation/aggregate.phpt:1.1 php4/ext/standard/tests/aggregation/aggregate.phpt:1.2 --- php4/ext/standard/tests/aggregation/aggregate.phpt:1.1 Wed Feb 20 22:32:42 2002 +++ php4/ext/standard/tests/aggregation/aggregate.phpt Tue Mar 5 04:00:53 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib.php"; $obj = new simple(); aggregate($obj, 'helper'); Index: php4/ext/standard/tests/aggregation/aggregate_methods.phpt diff -u php4/ext/standard/tests/aggregation/aggregate_methods.phpt:1.1 php4/ext/standard/tests/aggregation/aggregate_methods.phpt:1.2 --- php4/ext/standard/tests/aggregation/aggregate_methods.phpt:1.1 Wed Feb 20 22:32:42 2002 +++ php4/ext/standard/tests/aggregation/aggregate_methods.phpt Tue Mar 5 04:00:53 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib.php"; $obj = new simple(); aggregate_methods($obj, 'mixin'); Index: php4/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt diff -u php4/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt:1.1 php4/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt:1.2 --- php4/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt:1.1 Wed Feb 20 22:32:42 2002 +++ php4/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt Tue Mar 5 04:00:53 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib.php"; $obj = new simple(); aggregate_methods_by_list($obj, 'helper', array('just_another_method')); Index: php4/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt diff -u php4/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt:1.1 php4/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt:1.2 --- php4/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt:1.1 Wed Feb 20 22:32:42 2002 +++ php4/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt Tue Mar 5 04:00:53 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib.php"; $obj = new simple(); aggregate_methods_by_regexp($obj, 'helper', '/^do/'); Index: php4/ext/standard/tests/aggregation/aggregate_properties.phpt diff -u php4/ext/standard/tests/aggregation/aggregate_properties.phpt:1.1 php4/ext/standard/tests/aggregation/aggregate_properties.phpt:1.2 --- php4/ext/standard/tests/aggregation/aggregate_properties.phpt:1.1 Wed Feb 20 22:32:42 2002 +++ php4/ext/standard/tests/aggregation/aggregate_properties.phpt Tue Mar 5 04:00:53 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib.php"; $obj = new simple(); aggregate_properties($obj, 'mixin'); Index: php4/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt diff -u php4/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt:1.1 php4/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt:1.2 --- php4/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt:1.1 Wed Feb 20 22:32:42 2002 +++ php4/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt Tue Mar 5 04:00:53 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib.php"; $obj = new simple(); aggregate_properties_by_list($obj, 'helper', array('my_prop', 'our_prop')); Index: php4/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt diff -u php4/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt:1.1 php4/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt:1.2 --- php4/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt:1.1 Wed Feb 20 22:32:42 2002 +++ php4/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt Tue Mar 5 04:00:53 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib.php"; $obj = new simple(); aggregate_properties_by_regexp($obj, 'helper', '/^my/'); Index: php4/ext/standard/tests/aggregation/aggregation_info.phpt diff -u php4/ext/standard/tests/aggregation/aggregation_info.phpt:1.1 php4/ext/standard/tests/aggregation/aggregation_info.phpt:1.2 --- php4/ext/standard/tests/aggregation/aggregation_info.phpt:1.1 Wed Feb 20 22:32:42 2002 +++ php4/ext/standard/tests/aggregation/aggregation_info.phpt Tue Mar 5 04:00:53 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib.php"; $obj = new simple(); aggregate($obj, 'mixin'); Index: php4/ext/standard/tests/aggregation/deaggregate.phpt diff -u php4/ext/standard/tests/aggregation/deaggregate.phpt:1.1 php4/ext/standard/tests/aggregation/deaggregate.phpt:1.2 --- php4/ext/standard/tests/aggregation/deaggregate.phpt:1.1 Wed Feb 20 22:32:42 2002 +++ php4/ext/standard/tests/aggregation/deaggregate.phpt Tue Mar 5 04:00:53 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib.php"; $obj = new simple(); aggregate($obj, 'helper'); Index: php4/ext/standard/tests/array/001.phpt diff -u php4/ext/standard/tests/array/001.phpt:1.1 php4/ext/standard/tests/array/001.phpt:1.2 --- php4/ext/standard/tests/array/001.phpt:1.1 Sat Dec 22 06:49:56 2001 +++ php4/ext/standard/tests/array/001.phpt Tue Mar 5 04:00:55 2002 @@ -4,6 +4,7 @@ --GET-- --FILE-- <?php +chdir(dirname(__FILE__)); /* ** Create sample arrays ** Test alpha, numeric (decimal, hex, octal) and special data Index: php4/ext/standard/tests/array/array_search.phpt diff -u php4/ext/standard/tests/array/array_search.phpt:1.1 php4/ext/standard/tests/array/array_search.phpt:1.2 --- php4/ext/standard/tests/array/array_search.phpt:1.1 Fri Oct 5 18:01:04 2001 +++ php4/ext/standard/tests/array/array_search.phpt Tue Mar 5 04:00:56 2002 @@ -3,7 +3,7 @@ --POST-- --GET-- --FILE-- -<?php // by jeroen@php.net +<?php $arr1 = array('a','b','c'); $arr2 = array(); @@ -19,7 +19,7 @@ 'key'=== array_search('d', \$arr4) TESTS; - include('../../../../tests/quicktester.inc'); +include('tests/quicktester.inc'); --EXPECT-- OK Index: php4/ext/standard/tests/file/001.phpt diff -u php4/ext/standard/tests/file/001.phpt:1.5 php4/ext/standard/tests/file/001.phpt:1.6 --- php4/ext/standard/tests/file/001.phpt:1.5 Tue Nov 13 07:39:21 2001 +++ php4/ext/standard/tests/file/001.phpt Tue Mar 5 04:00:56 2002 @@ -4,6 +4,7 @@ --GET-- --FILE-- <?php +chdir(dirname(__FILE__)); @unlink('test.file'); @unlink('test.link'); if (file_exists('test.file')) { Index: php4/ext/standard/tests/general_functions/004.phpt diff -u php4/ext/standard/tests/general_functions/004.phpt:1.1 php4/ext/standard/tests/general_functions/004.phpt:1.2 --- php4/ext/standard/tests/general_functions/004.phpt:1.1 Thu Dec 14 09:18:36 2000 +++ php4/ext/standard/tests/general_functions/004.phpt Tue Mar 5 04:00:56 2002 @@ -4,6 +4,7 @@ --GET-- --FILE-- <?php +chdir(dirname(__FILE__)); $fp=fopen("004.data","r"); while($a=fgetcsv($fp,100,"\t")) { echo join(",",$a)."\n"; Index: php4/ext/standard/tests/math/abs.phpt diff -u php4/ext/standard/tests/math/abs.phpt:1.1 php4/ext/standard/tests/math/abs.phpt:1.2 --- php4/ext/standard/tests/math/abs.phpt:1.1 Mon Oct 22 05:44:27 2001 +++ php4/ext/standard/tests/math/abs.phpt Tue Mar 5 04:00:56 2002 @@ -3,7 +3,7 @@ --POST-- --GET-- --FILE-- -<?php // $Id: abs.phpt,v 1.1 2001/10/22 09:44:27 jeroen Exp $ +<?php // $Id: abs.phpt,v 1.2 2002/03/05 09:00:56 derick 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('tests/quicktester.inc'); --EXPECT-- 1,1,0,0 OK Index: php4/ext/standard/tests/math/pow.phpt diff -u php4/ext/standard/tests/math/pow.phpt:1.10 php4/ext/standard/tests/math/pow.phpt:1.11 --- php4/ext/standard/tests/math/pow.phpt:1.10 Wed Jan 9 18:59:05 2002 +++ php4/ext/standard/tests/math/pow.phpt Tue Mar 5 04:00:56 2002 @@ -3,7 +3,7 @@ --POST-- --GET-- --FILE-- -<?php // $Id: pow.phpt,v 1.10 2002/01/09 23:59:05 jimw Exp $ +<?php // $Id: pow.phpt,v 1.11 2002/03/05 09:00:56 derick Exp $ define('LONG_MAX', is_int(5000000000)? 9223372036854775807 : 0x7FFFFFFF); define('LONG_MIN', -LONG_MAX - 1); @@ -137,7 +137,7 @@ TESTS; echo "On failure, please mail result to php-dev@lists.php.net\n"; - include('../../../../tests/quicktester.inc'); + include('tests/quicktester.inc'); --EXPECT-- 1,1,0,0 Index: php4/ext/standard/tests/math/round.phpt diff -u php4/ext/standard/tests/math/round.phpt:1.1 php4/ext/standard/tests/math/round.phpt:1.2 --- php4/ext/standard/tests/math/round.phpt:1.1 Mon Oct 22 05:44:27 2001 +++ php4/ext/standard/tests/math/round.phpt Tue Mar 5 04:00:56 2002 @@ -3,7 +3,7 @@ --POST-- --GET-- --FILE-- -<?php // $Id: round.phpt,v 1.1 2001/10/22 09:44:27 jeroen Exp $ +<?php // $Id: round.phpt,v 1.2 2002/03/05 09:00:56 derick 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('tests/quicktester.inc'); --EXPECT-- 1,1,0,0 OK Index: php4/ext/standard/tests/strings/trim.phpt diff -u php4/ext/standard/tests/strings/trim.phpt:1.2 php4/ext/standard/tests/strings/trim.phpt:1.3 --- php4/ext/standard/tests/strings/trim.phpt:1.2 Sun Aug 5 15:06:34 2001 +++ php4/ext/standard/tests/strings/trim.phpt Tue Mar 5 04:00:56 2002 @@ -23,7 +23,7 @@ "ABC" === trim("ABC\\x50\\xC1\\x60\\x90","\\x50..\\xC1") TESTS; -include('../../../../tests/quicktester.inc'); +include('tests/quicktester.inc'); --EXPECT-- OK Index: php4/ext/standard/tests/strings/wordwrap.phpt diff -u php4/ext/standard/tests/strings/wordwrap.phpt:1.3 php4/ext/standard/tests/strings/wordwrap.phpt:1.4 --- php4/ext/standard/tests/strings/wordwrap.phpt:1.3 Sat Jan 5 18:49:58 2002 +++ php4/ext/standard/tests/strings/wordwrap.phpt Tue Mar 5 04:00:56 2002 @@ -29,7 +29,7 @@ TESTS; -include('../../../../tests/quicktester.inc'); +include('tests/quicktester.inc'); --EXPECT-- OK