[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Mar 5 01:32:57 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3334r2=1.3335diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3334 php-src/ChangeLog:1.3335 --- php-src/ChangeLog:1.3334Wed Mar 4 01:32:42 2009 +++ php-src/ChangeLog Thu Mar 5 01:32:56 2009 @@ -1,3 +1,9 @@ +2009-03-04 Zoe Slattery zoe.slatt...@googlemail.com + +* (PHP_5_3) + ext/standard/tests/general_functions/phpinfo.phpt: + fixed test + 2009-03-03 Ilia Alshanetsky i...@prohost.org * (PHP_5_3) @@ -31010,7 +31016,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3334 2009/03/04 01:32:42 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3335 2009/03/05 01:32:56 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/general_functions phpinfo.phpt
zoe Wed Mar 4 10:23:01 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/general_functions phpinfo.phpt Log: fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpinfo.phpt?r1=1.1.2.2.2.8r2=1.1.2.2.2.9diff_format=u Index: php-src/ext/standard/tests/general_functions/phpinfo.phpt diff -u php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2.2.8 php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2.2.9 --- php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2.2.8 Sun Feb 15 21:46:01 2009 +++ php-src/ext/standard/tests/general_functions/phpinfo.phpt Wed Mar 4 10:23:01 2009 @@ -46,27 +46,17 @@ Configuration - -%a - +%A Core - -%a - +%A Additional Modules - -%a - +%A Environment - -%a - +%A PHP Variables - -%a - +%A PHP License -%a +%A bool(true) -- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src(PHP_5_3) /ext/standard/tests/general_functions phpinfo.phpt
Zoe Slattery wrote: zoe Wed Mar 4 10:23:01 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/general_functions phpinfo.phpt Log: fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpinfo.phpt?r1=1.1.2.2.2.8r2=1.1.2.2.2.9diff_format=u Index: php-src/ext/standard/tests/general_functions/phpinfo.phpt diff -u php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2.2.8 php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2.2.9 --- php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2.2.8 Sun Feb 15 21:46:01 2009 +++ php-src/ext/standard/tests/general_functions/phpinfo.phpt Wed Mar 4 10:23:01 2009 @@ -46,27 +46,17 @@ Configuration - -%a - +%A Hi Zoe, Is there documentation on this change? I'm finding it a little bit arbitrary that run-tests keeps changing basic stuff so often, it's making me split tests simply to have a different EXPECTF for php 5.2 vs. 5.3. First it was %s, then %a, and now %A to match multi-line? Thanks, Greg -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src(PHP_5_3) /ext/standard/tests/general_functions phpinfo.phpt
Hi Zoe, Is there documentation on this change? Hi Greg - you mean the change I made to the phpinfo.phpt test? If so I changed it because it was failing and should not have been. Or do you mean changes to run-tests.php options? I'm finding it a little bit arbitrary that run-tests keeps changing basic stuff so often, it's making me split tests simply to have a different EXPECTF for php 5.2 vs. 5.3. First it was %s, then %a, and now %A to match multi-line? Sure - all the --EXPECTF-- options are documented here http://qa.php.net/expectf_details.php, and, as far as I'm aware all the EXPECTF options should be common to PHP 52, PHP 53 and PHP 6. If they aren't then it's an oversight and I'll be happy to fix. I don't think any of them should require changes to existing tests. Zoe -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src(PHP_5_3) /ext/standard/tests/general_functions phpinfo.phpt
zoe wrote: Hi Zoe, Is there documentation on this change? Hi Greg - you mean the change I made to the phpinfo.phpt test? If so I changed it because it was failing and should not have been. Or do you mean changes to run-tests.php options? I meant to run-tests.php. I'm finding it a little bit arbitrary that run-tests keeps changing basic stuff so often, it's making me split tests simply to have a different EXPECTF for php 5.2 vs. 5.3. First it was %s, then %a, and now %A to match multi-line? Sure - all the --EXPECTF-- options are documented here http://qa.php.net/expectf_details.php, and, as far as I'm aware all the EXPECTF options should be common to PHP 52, PHP 53 and PHP 6. If they aren't then it's an oversight and I'll be happy to fix. I don't think any of them should require changes to existing tests. Thanks, this is very helpful, and answers all of my questions. Greg -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-internals-win /script snapshot.bat snapshot_5_3_vc9x64.bat
pajoye Wed Mar 4 22:56:36 2009 UTC
Modified files:
/php-internals-win/script snapshot.bat snapshot_5_3_vc9x64.bat
Log:
- fix snaps for x64
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.15r2=1.16diff_format=u
Index: php-internals-win/script/snapshot.bat
diff -u php-internals-win/script/snapshot.bat:1.15
php-internals-win/script/snapshot.bat:1.16
--- php-internals-win/script/snapshot.bat:1.15 Thu Jan 1 03:59:56 2009
+++ php-internals-win/script/snapshot.bat Wed Mar 4 22:56:36 2009
@@ -80,7 +80,7 @@
:CONFIG_VC9_X64
ECHO Setting environment for VC9-x64
SET INCLUDE=%VC9_X64_INCLUDE%
-SET LIB=%VC9_LIB%
+SET LIB=%VC9_X64_LIB%
SET PATH=%VC9_X64_PATH%;%PATH%
SET VC_VERS=VC9
SET ARCH=x64
@@ -134,6 +134,11 @@
cd %DEST%
IF EXIST Release_TS GOTO RELEASE_TS
IF EXIST Release GOTO RELEASE_NTS
+IF EXIST x64\Release GOTO X64_RELEASE_NTS
+IF EXIST x64\Release_TS GOTO X64_RELEASE_TS
+
+ECHO Build Error, no release, relase_ts (or x64/) directory
+GOTO EXIT
:RELEASE_TS
SET PHP_BUILD_DIR=Release_TS
@@ -155,6 +160,31 @@
ECHO Build error.
GOTO EXIT
)
+GOTO REMOTE_COPY
+
+:X64_RELEASE_NTS
+SET PHP_BUILD_DIR=x64\Release
+SET PHP_EXE=x64\Release\php.exe
+SET NTS_POSTFIX=-nts
+SET NTS=nts
+IF NOT EXIST %PHP_EXE% (
+ ECHO Build error.
+ GOTO EXIT
+)
+GOTO REMOTE_COPY
+
+:X64_RELEASE_TS
+SET PHP_BUILD_DIR=x64\Release_TS
+SET PHP_EXE=x64\Release_TS\php.exe
+SET NTS_POSTFIX=
+SET NTS=ts
+IF NOT EXIST %PHP_EXE% (
+ ECHO Build error.
+ GOTO EXIT
+)
+GOTO REMOTE_COPY
+
+
:REMOTE_COPY
FOR /F tokens=* %%A IN ('%PHP_EXE% -r echo substr(phpversion(),0,3);') DO
SET _PHPVERSION_SHORT=%%A
FOR /F tokens=* %%A IN ('%PHP_EXE% -r echo phpversion();') DO SET
_PHPVERSION_STRING=%%A
@@ -170,8 +200,10 @@
FOR %%A IN (%PHP_BUILD_DIR%\*.zip) DO (
echo Copying %%~nA-%SNAPDATETIME%.zip ...
- %PUTTYBASE%pscp.exe -batch -q -i %SSH_KEY% -l %SSH_USER%
%PHP_BUILD_DIR%\%%~nA.zip %SSH_URL%:%REMOTE_PATH%/%%~nA-%SNAPDATETIME%.zip
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
+ echo %SSH_URL%:%REMOTE_PATH%/%%~nA-%SNAPDATETIME%.zip
+ echo %PUTTYBASE%pscp.exe -batch -q -i %SSH_KEY% -l %SSH_USER%
%PHP_BUILD_DIR%\%%~nA.zip %SSH_URL%:%REMOTE_PATH%/%%~nA-%SNAPDATETIME%.zip
copy %PHP_BUILD_DIR%\%%~nA.zip %PHP_BUILD_DIR%\%%~nA-%SNAPDATETIME%.zip
+ %PUTTYBASE%pscp.exe -batch -q -i %SSH_KEY% -l %SSH_USER%
%PHP_BUILD_DIR%\%%~nA.zip %SSH_URL%:%REMOTE_PATH%/%%~nA-%SNAPDATETIME%.zip
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
)
@@ -192,9 +224,9 @@
%PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s
%REMOTE_PATH%/php-%VERSION_INFO%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.zip
%REMOTE_PATH%/php-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.zip
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
%PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s
%REMOTE_PATH%/php-debug-pack-%VERSION_INFO%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.zip
%REMOTE_PATH%/php-debug-pack-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.zip
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
%PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s
%REMOTE_PATH%/php-test-pack-%_PHPVERSION_STRING%-%SNAPDATETIME%.zip
%REMOTE_PATH%/php-test-pack-%_PHPVERSION_SHORT%-latest.zip
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
-%PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s
%REMOTE_PATH%/compile-%PHP_VERSION%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log
%REMOTE_PATH%/compile-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
-%PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s
%REMOTE_PATH%/buildconf-%PHP_VERSION%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log
%REMOTE_PATH%/buildconf-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
-%PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s
%REMOTE_PATH%/configure-%PHP_VERSION%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log
%REMOTE_PATH%/configure-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
+%PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s
%REMOTE_PATH%/compile-%PHP_VERSION%-%VC_VERS%-%ARCH%%NTS_POSTFIX%-%SNAPDATETIME%.log
%REMOTE_PATH%/compile-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
+%PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s
%REMOTE_PATH%/buildconf-%PHP_VERSION%-%VC_VERS%-%ARCH%%NTS_POSTFIX%-%SNAPDATETIME%.log
%REMOTE_PATH%/buildconf-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log
%LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 21
+%PUTTYBASE%plink.exe -i %SSH_KEY% -l %SSH_USER%
