Hello Jani, yep, more reason to rename it to server-tests-config.php so one knows it belongs to server-tests.php :-)
marcus Wednesday, August 31, 2005, 9:13:41 AM, you wrote: > Due the lack of documentation, I had no idea the file was not needed. :-p > --Jani > On Wed, 31 Aug 2005, Marcus Boerger wrote: >> Hello Jani, >> >> sorry, i didn't saw that you put the unneeded file into >> scripts/Makefile.frag. >> >> regards >> marcus >> >> Wednesday, August 31, 2005, 8:02:15 AM, you wrote: >> >> >>> Test before commit? (make install fails now..) >> >>> --Jani >> >> >>> On Tue, 30 Aug 2005, Marcus Boerger wrote: >> >>>> helly Tue Aug 30 14:41:44 2005 EDT >>>> >>>> Added files: >>>> /php-src server-tests-config.php >>>> >>>> Removed files: >>>> /php-src run-tests-config.php >>>> >>>> Modified files: >>>> /php-src server-tests.php >>>> Log: >>>> - run-tests2.php was renamed into server-tests.php (missing part) >>>> >>>> >>>> http://cvs.php.net/diff.php/php-src/server-tests.php?r1=1.3&r2=1.4&ty=u >>>> Index: php-src/server-tests.php >>>> diff -u php-src/server-tests.php:1.3 php-src/server-tests.php:1.4 >>>> --- php-src/server-tests.php:1.3 Mon Aug 15 18:30:39 2005 >>>> +++ php-src/server-tests.php Tue Aug 30 14:41:42 2005 >>>> @@ -420,7 +420,7 @@ >>>> public $cwd; >>>> public $xargs = array( >>>> #arg env var value default >>>> description >>>> - 'c' => array('' ,'file' ,NULL >>>> ,'configuration file, see run-tests-config.php for example'), >>>> + 'c' => array('' ,'file' ,NULL >>>> ,'configuration file, see server-tests-config.php for example'), >>>> 'd' => array('TEST_PATHS' ,'paths' >>>> ,NULL ,'colon seperate path list'), >>>> 'e' => array('TEST_PHP_ERROR_STYLE','EMACS|MSVC' ,'EMACS' >>>> ,'editor error style'), >>>> 'h' => array('' ,'' ,NULL >>>> ,'this help'), >>>> >>>> http://cvs.php.net/co.php/php-src/server-tests-config.php?r=1.1&p=1 >>>> Index: php-src/server-tests-config.php >>>> +++ php-src/server-tests-config.php >>>> <?php >>>> /* this file may be duplicated to provide testing for >>>> multiple php binaries or configurations. It is used >>>> with the -c option on server_tests.php. All these >>>> settings will also go into the environment for tests >>>> that are directly executed, so you can also set things >>>> like PHPRC here to force an executable to use a >>>> specific php.ini file. */ >>>> >>>> $conf = array( >>>> /* path to the php source tree */ >>>> 'TEST_PHP_SRCDIR' => NULL, >>>> >>>> /* executable that will be tested. Not used for >>>> web based tests */ >>>> 'TEST_PHP_EXECUTABLE' => NULL, >>>> >>>> /* php.ini to use when executing php */ >>>> 'PHPRC' => NULL, >>>> >>>> /* log format */ >>>> 'TEST_PHP_LOG_FORMAT' => 'LEODC', >>>> >>>> /* debugging detail in output. */ >>>> 'TEST_PHP_DETAILED' => 0, >>>> >>>> /* error style for editors or IDE's */ >>>> 'TEST_PHP_ERROR_STYLE' => 'EMACS', >>>> >>>> 'REPORT_EXIT_STATUS' => 0, >>>> 'NO_PHPTEST_SUMMARY' => 0, >>>> >>>> /* don't ask, and don't send results to QA if true */ >>>> 'NO_INTERACTION' => true, >>>> >>>> /* base url prefixed to any requests */ >>>> 'TEST_WEB_BASE_URL' => NULL, >>>> >>>> /* if set, copy phpt files into this directory, >>>> which should be accessable via an http server. The >>>> TEST_WEB_BASE_URL setting should be the base url >>>> to access this path. If this is not used, >>>> TEST_WEB_BASE_URL should be the base url pointing >>>> to TEST_PHP_SRCDIR, which should then be accessable via >>>> an http server. >>>> >>>> An example would be: >>>> TEST_WEB_BASE_URL=http://localhost/test >>>> TEST_BASE_PATH=/path/to/htdocs/test >>>> */ >>>> 'TEST_BASE_PATH' => NULL, >>>> >>>> /* file extension of pages requested via http >>>> this allows for php to be configured to parse >>>> extensions other than php, usefull for multiple >>>> configurations under a single webserver */ >>>> 'TEST_WEB_EXT' => 'php', >>>> >>>> /* if true doesn't run tests, just outputs executable info */ >>>> 'TEST_CONTEXT_INFO' => false, >>>> >>>> /* : or ; seperated list of paths */ >>>> 'TEST_PATHS' => NULL >>>> /* additional configuration items that may be set >>>> to provide proxy support for testes: >>>> timeout >>>> proxy_host >>>> proxy_port >>>> proxy_user >>>> proxy_pass >>>> */ >>>> ); >>>> >>>> ?> >>>> >>>> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php