Re: [PATCH] Changes in support of updated run-test.php

Please repost these patches as an attachment. My lousy mailer screwed up the line feeds on the patch for the dsw. Joseph ----- Original Message ----- From: "Preston L. Bannister" <preston.bannister@cox.net> To: "PHP Quality Assurance Team Mailing List" <php-qa@lists.php.net> Cc: "PHP Developers Mailing List" <php-dev@lists.php.net> Sent: Tuesday, May 07, 2002 9:55 PM Subject: [PHP-DEV] [PATCH] Changes in support of updated run-test.php > Changes to the Win32 workspace and the in support of the updated > run-tests.php in the prior message. > > > Index: ext/standard/tests/aggregation/aggregate.phpt > =================================================================== > RCS file: /repository/php4/ext/standard/tests/aggregation/aggregate.phpt,v > retrieving revision 1.3 > diff -u -b -r1.3 aggregate.phpt > --- ext/standard/tests/aggregation/aggregate.phpt 10 Mar 2002 02:38:06 -0000 1.3 > +++ ext/standard/tests/aggregation/aggregate.phpt 8 May 2002 01:39:06 -0000 > @@ -4,7 +4,7 @@ > --GET-- > --FILE-- > <?php > -include "./ext/standard/tests/aggregation/aggregate.lib"; > +include $_ENV['TEST_PHP_ROOT'] . "/ext/standard/tests/aggregation/aggregate.lib"; > > $obj = new simple(); > aggregate($obj, 'helper'); > Index: ext/standard/tests/aggregation/aggregate_methods.phpt > =================================================================== > RCS file: /repository/php4/ext/standard/tests/aggregation/aggregate_methods.phpt,v > retrieving revision 1.3 > diff -u -b -r1.3 aggregate_methods.phpt > --- ext/standard/tests/aggregation/aggregate_methods.phpt 10 Mar 2002 02:38:06 -0000 1.3 > +++ ext/standard/tests/aggregation/aggregate_methods.phpt 8 May 2002 01:39:06 -0000 > @@ -4,7 +4,7 @@ > --GET-- > --FILE-- > <?php > -include "./ext/standard/tests/aggregation/aggregate.lib"; > +include $_ENV['TEST_PHP_ROOT'] . "/ext/standard/tests/aggregation/aggregate.lib"; > > $obj = new simple(); > aggregate_methods($obj, 'mixin'); > Index: ext/standard/tests/aggregation/aggregate_methods_by_list.phpt > =================================================================== > RCS file: /repository/php4/ext/standard/tests/aggregation/aggregate_methods_by_list.ph pt,v > retrieving revision 1.3 > diff -u -b -r1.3 aggregate_methods_by_list.phpt > --- ext/standard/tests/aggregation/aggregate_methods_by_list.phpt 10 Mar 2002 02:38:06 -0000 1.3 > +++ ext/standard/tests/aggregation/aggregate_methods_by_list.phpt 8 May 2002 01:39:06 -0000 > @@ -4,7 +4,7 @@ > --GET-- > --FILE-- > <?php > -include "./ext/standard/tests/aggregation/aggregate.lib"; > +include $_ENV['TEST_PHP_ROOT'] . "/ext/standard/tests/aggregation/aggregate.lib"; > > $obj = new simple(); > aggregate_methods_by_list($obj, 'helper', array('just_another_method')); > Index: ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt > =================================================================== > RCS file: /repository/php4/ext/standard/tests/aggregation/aggregate_methods_by_regexp. phpt,v > retrieving revision 1.3 > diff -u -b -r1.3 aggregate_methods_by_regexp.phpt > --- ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt 10 Mar 2002 02:38:06 -0000 1.3 > +++ ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt 8 May 2002 01:39:06 -0000 > @@ -4,7 +4,7 @@ > --GET-- > --FILE-- > <?php > -include "./ext/standard/tests/aggregation/aggregate.lib"; > +include $_ENV['TEST_PHP_ROOT'] . "/ext/standard/tests/aggregation/aggregate.lib"; > > $obj = new simple(); > aggregate_methods_by_regexp($obj, 'helper', '/^do/'); > Index: ext/standard/tests/aggregation/aggregate_properties.phpt > =================================================================== > RCS file: /repository/php4/ext/standard/tests/aggregation/aggregate_properties.phpt,v > retrieving revision 1.3 > diff -u -b -r1.3 aggregate_properties.phpt > --- ext/standard/tests/aggregation/aggregate_properties.phpt 10 Mar 2002 02:38:06 -0000 1.3 > +++ ext/standard/tests/aggregation/aggregate_properties.phpt 8 May 2002 01:39:06 -0000 > @@ -4,7 +4,7 @@ > --GET-- > --FILE-- > <?php > -include "./ext/standard/tests/aggregation/aggregate.lib"; > +include $_ENV['TEST_PHP_ROOT'] . "/ext/standard/tests/aggregation/aggregate.lib"; > > $obj = new simple(); > aggregate_properties($obj, 'mixin'); > Index: ext/standard/tests/aggregation/aggregate_properties_by_list.phpt > =================================================================== > RCS file: /repository/php4/ext/standard/tests/aggregation/aggregate_properties_by_list .phpt,v > retrieving revision 1.3 > diff -u -b -r1.3 aggregate_properties_by_list.phpt > --- ext/standard/tests/aggregation/aggregate_properties_by_list.phpt 10 Mar 2002 02:38:06 -0000 1.3 > +++ ext/standard/tests/aggregation/aggregate_properties_by_list.phpt 8 May 2002 01:39:06 -0000 > @@ -4,7 +4,7 @@ > --GET-- > --FILE-- > <?php > -include "./ext/standard/tests/aggregation/aggregate.lib"; > +include $_ENV['TEST_PHP_ROOT'] . "/ext/standard/tests/aggregation/aggregate.lib"; > > $obj = new simple(); > aggregate_properties_by_list($obj, 'helper', array('my_prop', 'our_prop')); > Index: ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt > =================================================================== > RCS file: /repository/php4/ext/standard/tests/aggregation/aggregate_properties_by_rege xp.phpt,v > retrieving revision 1.3 > diff -u -b -r1.3 aggregate_properties_by_regexp.phpt > --- ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt 10 Mar 2002 02:38:06 -0000 1.3 > +++ ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt 8 May 2002 01:39:06 -0000 > @@ -4,7 +4,7 @@ > --GET-- > --FILE-- > <?php > -include "./ext/standard/tests/aggregation/aggregate.lib"; > +include $_ENV['TEST_PHP_ROOT'] . "/ext/standard/tests/aggregation/aggregate.lib"; > > $obj = new simple(); > aggregate_properties_by_regexp($obj, 'helper', '/^my/'); > Index: ext/standard/tests/aggregation/aggregation_info.phpt > =================================================================== > RCS file: /repository/php4/ext/standard/tests/aggregation/aggregation_info.phpt,v > retrieving revision 1.3 > diff -u -b -r1.3 aggregation_info.phpt > --- ext/standard/tests/aggregation/aggregation_info.phpt 10 Mar 2002 02:38:06 -0000 1.3 > +++ ext/standard/tests/aggregation/aggregation_info.phpt 8 May 2002 01:39:06 -0000 > @@ -4,7 +4,7 @@ > --GET-- > --FILE-- > <?php > -include "./ext/standard/tests/aggregation/aggregate.lib"; > +include $_ENV['TEST_PHP_ROOT'] . "/ext/standard/tests/aggregation/aggregate.lib"; > > $obj = new simple(); > aggregate($obj, 'mixin'); > Index: ext/standard/tests/aggregation/deaggregate.phpt > =================================================================== > RCS file: /repository/php4/ext/standard/tests/aggregation/deaggregate.phpt,v > retrieving revision 1.3 > diff -u -b -r1.3 deaggregate.phpt > --- ext/standard/tests/aggregation/deaggregate.phpt 10 Mar 2002 02:38:06 -0000 1.3 > +++ ext/standard/tests/aggregation/deaggregate.phpt 8 May 2002 01:39:06 -0000 > @@ -4,7 +4,7 @@ > --GET-- > --FILE-- > <?php > -include "./ext/standard/tests/aggregation/aggregate.lib"; > +include $_ENV['TEST_PHP_ROOT'] . "/ext/standard/tests/aggregation/aggregate.lib"; > > $obj = new simple(); > aggregate($obj, 'helper'); > Index: ext/standard/tests/array/001.phpt > =================================================================== > RCS file: /repository/php4/ext/standard/tests/array/001.phpt,v > retrieving revision 1.3 > diff -u -b -r1.3 001.phpt > --- ext/standard/tests/array/001.phpt 26 Mar 2002 18:17:38 -0000 1.3 > +++ ext/standard/tests/array/001.phpt 8 May 2002 01:39:06 -0000 > @@ -4,7 +4,7 @@ > --GET-- > --FILE-- > <?php > -require('ext/standard/tests/array/data.inc'); > +require($_ENV['TEST_PHP_ROOT'] . '/ext/standard/tests/array/data.inc'); > /* > ** Create sample arrays > ** Test alpha, numeric (decimal, hex, octal) and special data > Index: ext/standard/tests/array/002.phpt > =================================================================== > RCS file: /repository/php4/ext/standard/tests/array/002.phpt,v > retrieving revision 1.1 > diff -u -b -r1.1 002.phpt > --- ext/standard/tests/array/002.phpt 26 Mar 2002 18:17:38 -0000 1.1 > +++ ext/standard/tests/array/002.phpt 8 May 2002 01:39:06 -0000 > @@ -4,7 +4,7 @@ > --GET-- > --FILE-- > <?php > -require('ext/standard/tests/array/data.inc'); > +require($_ENV['TEST_PHP_ROOT'] . '/ext/standard/tests/array/data.inc'); > > function test_sort ($sort_function, $data) { > echo "\n -- Testing $sort_function() -- \n"; > Index: ext/standard/tests/array/003.phpt > =================================================================== > RCS file: /repository/php4/ext/standard/tests/array/003.phpt,v > retrieving revision 1.1 > diff -u -b -r1.1 003.phpt > --- ext/standard/tests/array/003.phpt 26 Mar 2002 18:17:38 -0000 1.1 > +++ ext/standard/tests/array/003.phpt 8 May 2002 01:39:06 -0000 > @@ -4,7 +4,7 @@ > --GET-- > --FILE-- > <?php > -require('ext/standard/tests/array/data.inc'); > +require($_ENV['TEST_PHP_ROOT'] . '/ext/standard/tests/array/data.inc'); > > function cmp ($a, $b) { > is_array ($a) > Index: win32/php4ts.dsw > =================================================================== > RCS file: /repository/php4/win32/php4ts.dsw,v > retrieving revision 1.11 > diff -u -b -r1.11 php4ts.dsw > --- win32/php4ts.dsw 23 Jan 2002 13:42:46 -0000 1.11 > +++ win32/php4ts.dsw 8 May 2002 01:39:15 -0000 > @@ -168,7 +168,7 @@ > > > ############################################################################ ### > > > > -Project: "servlet"="..\sapi\servlet\servlet.dsp" - Package Owner=<4> > > +Project: "php4ts_cli"=".\php4ts_cli.dsp" - Package Owner=<4> > > > > Package=<5> > > {{{ > > @@ -180,7 +180,7 @@ > > > ############################################################################ ### > > > > -Project: "cli"=".\php4ts_cli.dsp" - Package Owner=<4> > > +Project: "servlet"="..\sapi\servlet\servlet.dsp" - Package Owner=<4> > > > > Package=<5> > > {{{ > > @@ -191,7 +191,8 @@ > }}} > > > > ############################################################################ ### > > -Project: "testsuite"=".\testsuite.dsp" - Package Owner=<4> > > + > > +Project: "tests"="..\tests\tests.dsp" - Package Owner=<4> > > > > Package=<5> > > {{{ > > > -- > Preston L. Bannister > http://members.cox.net/preston.bannister/ > pbannister on Yahoo Messenger > > -- > PHP Development Mailing List <http://www.php.net/> > To unsubscribe, visit: http://www.php.net/unsub.php