[PHP-CVS] 14注塑零缺陷解读nu

2011-05-03 Thread 贝海芬 
见-压缩包s...@hp.com
¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô

   ×¢ËÜÁãȱÏݸ߼¶¼¼Êõ--ÑÐÐÞ°à

¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô
¡¾Åàѵʱ¼ä¡¿05ÔÂ21-22ÈÕ  ÉîÛÚ°à   05ÔÂ28-29ÈÕ  ÉϺ£°à

¡¾Åàѵ¶ÔÏó¡¿×¢ËÜÆóÒµ×ܾ­Àí¡¢×¢Ëܳ§³¤¡¢¸±×Ü¡¢×¢Ëܲ¿¾­Àí/Ö÷¹Ü¡¢ ×¢ËÜÆ·Öʾ­Àí/
Ö÷¹Ü¡¢×¢Ëܹ¤³Ì¾­Àí/Ö÷¹Ü¡¢×¢ËÜÊÔÄ£¹¤³Ìʦ¡¢×¢ËÜÉú²ú¹¤³Ìʦ¡¢×¢ËÜÆ·
Öʹ¤³Ìʦ¡¢×¢ËÜ×鳤/Áì°à/¼¼ÊõÔ±µÈ

¡¾Åàѵ·ÑÓá¿£¤2600/ÈË(°üÀ¨Êڿηѡ¢×ÊÁÏ·Ñ¡¢»áÎñ·Ñ¡¢Îç²ÍµÈ)
¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô
Ö÷°ì£ºÖÇ»ÛÊ÷(Öйú)ѧϰ»ú¹¹   ÍøÕ¾£º www.zhihuishu.cn
24Сʱȫ¹úͳһÃâ·Ñ¿Í·þÈÈÏߣº400-700-4248 £¨µç»°»òÊÖ»úÖ±½Ó²¦´ò£© 
ÉϺ£¿Í·þÖÐÐÄ£º021-31263483 ´«Õ棺021-61924199
¹ã¶«¿Í·þÖÐÐÄ£º0755-61287517´«Õæ:0755-61641107
±¨ÃûÓÊÏ䣺1...@4007004248.com £» bm4007004...@126.com
ÇëÌîд²¢´«Õ棨»òÓʼþ£©¸½¼þ±¨Ãû±í±¨Ãû²Î»á£¡

¡ï¡ï¸ü¶à¿Î³ÌÇëµÇ½ÍøÕ¾²éѯ£¡
¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô
×¢ËÜÉú²ú¹ý³ÌÖо­³£³öÏÖ¸÷ÖÖÆ·ÖÊȱÏݺÍÒì³£ÏÖÏó£»³¤ÆÚÒÔÀ´£¬´ó¶àÊý×¢Ëܹ¤×÷Õß½ö
ƾ¾­Ñé´¦Àí£¬Ã¤Ä¿µ÷»úʱ¼ä³¤£¬Ô­ÁÏÀ˷Ѵ󣬶ÔһЩÎÊÌâȱ·¦¿ÆѧϵͳµØ·ÖÎö¡£×¢Ëܼӹ¤
ÊÇÒ»ÃÅ֪ʶÃæ¹ã¡¢¼¼ÊõÐÔÇ¿µÄÐÐÒµ£¬½öƾ¾­ÑéÊDz»¹»µÄ¡£¡°×¢ËÜȱÏÝÔ­Òò·ÖÎöÓë½â¾ö·½°¸¡±
¸ß¼¶Ñ§Êõ½²×ùÊÇרΪѧϰ´¦Àí¸÷ÖÖ×¢ËÜȱÏݺÍÒì³£ÎÊÌâ´¦Àí·½·¨¡¢ Ìá¸ß·ÖÎöÎÊÌâ/´¦ÀíÎÊ
ÌâÄÜÁ¦µÄ×¢Ëܼ¼Êõ/¹ÜÀíÈËÔ±¶ø¿ªÉè¡£

ÄÚÈݶÀÌØ£º
1¡¢»ùÓÚÃÀ¹ú×¢ËܳÉÐÍרҵѵÁ·¶àýÌ壬 È«Ã漯ÖйúÄÚÍâ×¢ËܳÉÐ͹¤ÒÕ¡¢×¢ËܳÉÐÍ»úе¼°
Ëܽº²ÄÁÏ·½ÃæµÄÆóÒµ¡¢×¨¼ÒºÍѧÕßµÄÖÇ»ÝÓë¾­Ñ飻
2¡¢¸ß¶ÈÖÇÄÜ»¯µÄ»¥¶¯Ê½¶àýÌåƽ̨£¬Í¬Ê±¾ßÓÐÉùÒô¡¢Í¼Æ¬ºÍÎÄ×Ö±í´ïЧ¹û£»
3¡¢ºê¹ÛÓë΢¹ÛµÄÈ«·½Î»½âÎö£¬¹ý³ÌµÄ¶¯Ì¬ÏÔʾ£¬È«ÕæÕ¹ÏÖ³ÉÐÍÏÖ³¡Ëù²»ÄÜ¿´µ½µÄÄÚÈÝ

¿Î³ÌÌØÉ«£º
1. È«ÃæÈÚºÏÄ£Ð;ßÉè¼ÆÓë×¢ËÜÏÖ³¡Éú²ú¼¼ÄÜ£¬ÎªÆóÒµÅàÑøÄ£¾ßÓë×¢Ëܵļ¼Êõר¼Ò¡£Ñ§Ô±
¿ÉÒÔ×Ô´øÑùÆ·²Î¼Ó¿Î³Ì£¬¿Î³ÌÖÐÑ¡³öÓдú±íÐԵݸÀý½øÐÐÏêϸ½â´ð£»
2. »ùÓÚÃÀ¹ú×¢ËܳÉÐÍרҵѵ~Á·¶àýÌ壬ȫÃ漯ÖйúÄÚÍâ×¢ËÜÄ£¾ß¡¢×¢ËܳÉÐ͹¤ÒÕ¡¢×¢ËÜ
³ÉÐÍ»úе¼°ËÜÁϲÄÁÏ·½ÃæµÄÆóÒµ¡¢×¨¼ÒºÍѧÕßµÄÖÇÄÜÓë¾­Ñ飻
3. ¸ß¶ÈÖÇÄÜ»¯µÄ½»»¥Ê½¶àýÌåƽ̨£¬Í¬Ê±¾ßÓÐÉùÒô¡¢Í¼Æ¬ºÍÎÄ×Ö±í´ïЧ¹û£»
4. ºê¹ÛÓë΢¹ÛµÄÈ«·½Î»½âÎö£¬¹ý³ÌµÄ¶¯Ì¬ÏÔʾ£¬È«ÕæÕ¹ÏÖ³ÉÐÍÏÖ³¡Ëù²»ÄÜ¿´µ½µÄÄÚÈÝ¡£

¿Î³ÌÄÚÈÝ£º 
µÚÒ»²¿·Ö£º×¢ËܳÉÐ͹¤ÒÕ»ù´¡
1.ζȡ¢Ñ¹Á¦¡¢ËÙ¶ÈÓëÀäÈ´¿ØÖƵÄÄ¿µÄ¡¢²Ù×÷Óë½á¹û£»
2.×¢ËÜ»úÉ趨µÄµ÷ÕûÈçºÎÓ°Ï칤ÒÕÓëÆ·ÖÊ£»
3.ÓÅ»¯Âݸ˿ØÖÆÉ趨£»
4.¶à¶Î³äÌîÓë¶à¶Î±£Ñ¹¿ØÖÆ£»½á¾§¡¢·Ç½á¾§Óë·Ö×Ó/ÏËάÅÅÏò¶Ô¹¤ÒÕ¼°Æ·ÖʵÄÓ°Ï죻
5.ÄÚÓ¦Á¦¡¢ÀäÈ´Ëٶȡ¢ËÜÁÏÊÕËõ¶ÔËܼþÆ·ÖʵÄÓ°Ï죻
6.ËÜÁÏÁ÷±äÁ¦Ñ§£ºËÜÁÏÈçºÎÁ÷¶¯¡¢ÅÅÏòÓë¸Ä±äÕ³¶È£¬¼ôÇÐÓë·Ö×Ó/ÏËάÅÅÏò¹Øϵ£»
7.½½×¢ÏµÍ³¡¢Àäȴϵͳ¡¢Ä£¾ß½á¹¹Óë×¢Ëܹ¤ÒÕÖ®¼äµÄ¹Øϵ¡£

µÚ¶þ²¿·Ö£ºÄ£ËÜÏÖ³¡ÎÊÌâ·ÖÎöÓë½â¾ö¶Ô²ß
Ëõ¿×¡¢ËõË®¡¢²»±¥Ä£¡¢Ã«±ß¡¢ÈÛ½ÓºÛ¡¢ÒøË¿¡¢ÅçºÛ¡¢ÉÕ½¹¡¢ÇÌÇú±äÐΡ¢¿ªÁÑ/ÆÆÁÑ¡¢³ß´ç
³¬²î¼°ÆäËü³£¼û×¢ËÜÎÊÌâÃèÊö¡¢Ô­Òò·ÖÎö£¬ÒÔ¼°ÔÚÄ£¾ßÉè¼Æ¡¢³ÉÐ͹¤ÒÕ¿ØÖÆ¡¢²úÆ·Éè¼Æ¼°
ËÜÁϲÄÁϵȷ½ÃæÖ®½â¾ö¶Ô²ß¡£
1. ×¢ËܼþÖܱßȱ½º¡¢²»±¥Ä£µÄÔ­Òò·ÖÎö¼°½â¾ö¶Ô²ß£»
2. Åú·æ£¨Ã«±ß£©µÄÔ­Òò·ÖÎö¼°½â¾ö¶Ô²ß£»
3. ×¢Ëܼþ±íÃæËõË®¡¢Ëõ¿×£¨Õæ¿ÕÅÝ£©µÄÔ­Òò·ÖÎö¼°½â¾ö¶Ô²ß£»
4. ÒøÎÆ£¨ÁÏ»¨¡¢Ë®»¨£©¡¢ÉÕ½¹¡¢ÆøÎƵÄÔ­Òò·ÖÎö½â¾ö¶Ô²ß£»
5. ×¢Ëܼþ±íÃæË®²¨ÎÆ¡¢Á÷ÎÆ£¨Á÷ºÛ£©µÄÔ­Òò·ÖÎö¼°½â¾ö¶Ô²ß£»
6. ×¢Ëܼþ±íÃæ¼ÐË®ÎÆ£¨ÈÛ½ÓºÛ£©¡¢ÅçÉäÎÆ£¨ÉßÎÆ£©µÄÔ­Òò·ÖÎö¼°½â¾ö¶Ô²ß£»
7. ×¢Ëܼþ±íÃæÁÑÎÆ£¨¹êÁÑ£©¡¢¶¥°×£¨¶¥±¬£©µÄÔ­Òò·ÖÎö¼°½â¾ö¶Ô²ß£»
8. ×¢Ëܼþ±íÃæÉ«²î¡¢¹âÔó²»Á¼¡¢»ìÉ«¡¢ºÚÌõ¡¢ºÚµãµÄÔ­Òò·ÖÎö¼°½â¾ö¶Ô²ß£»
9. ×¢ËܼþÇÌÇú±äÐΡ¢ÄÚÓ¦Á¦¿ªÁѵÄÔ­Òò·ÖÎö¼°½â¾ö¶Ô²ß£»
10. ×¢Ëܼþ³ß´çÆ«²îµÄÔ­Òò·ÖÎö¼°½â¾ö¶Ô²ß£»
11. ×¢Ëܼþճģ¡¢ÍÏ»¨£¨À­ÉË£©¡¢ÍÏ°×µÄÔ­Òò·ÖÎö¼°½â¾ö¶Ô²ß£»
12. ×¢Ëܼþ͸Ã÷¶È²»×㡢ǿ¶È²»×㣨´à¶Ï£©µÄÔ­Òò·ÖÎö¼°½â¾ö¶Ô²ß£»
13. ×¢Ëܼþ±íÃæÀäÁÏ°ß¡¢ÆðƤ£¨·Ö²ã£©µÄÔ­Òò·ÖÎö¼°½â¾ö¶Ô²ß£»
14. ×¢Ëܼþ½ðÊôǶ¼þ²»Á¼µÄÔ­Òò·ÖÎö¼°½â¾ö¶Ô²ß£»
15. Åç×ìÁ÷ÏÑ£¨Á÷Ì飩¡¢Â©½º¡¢Ë®¿ÚÀ­Ë¿¡¢Åç×ì¶ÂÈû¡¢¿ªÄ£À§ÄѵÄÔ­Òò·ÖÎö¼°¸ÄÉÆ´ëÊ©£»
16. ÀûÓÃCAEÄ£Á÷·ÖÎö¼¼Êõ¿ìËÙµØÓÐЧ½â¾ö×¢ËÜÏÖ³¡ÎÊÌâ¡£

µÚÈý²¿·Ö£ºÄ£¾ßÓÅ»¯Éè¼ÆÓëʹÓÃ
1. ×¢ËÜÄ£¾ßµÄ½á¹¹¡¢×é³É¡¢·ÖÀ༰¹¦ÄÜ£»
2. ½½×¢ÏµÍ³£¨½½¿Ú¡¢Á÷µÀ¡¢ÀäÁϾ®µÈ£©ÓÅ»¯Éè¼Æ£»
3. Àäȴϵͳ£¨Ë®Â·¡¢¸ôˮƬ¡¢îëͲµÈ£©ÓÅ»¯Éè¼Æ£»
4. ËõË®ÂʵÄÉ趨Óëµ÷Õû£»
5. ½½×¢ÏµÍ³¡¢Àäȴϵͳ¡¢Ä£¾ß½á¹¹Óë×¢Ëܹ¤ÒÕÖ®¼äµÄ¹Øϵ£»
6. Ä£¾ßµÄ°²×°¡¢µ÷ÊÔ¹¤×÷ºÍά»¤±£Ñø£»
7. ÀûÓÃCAEÄ£Á÷·ÖÎö¼¼Êõ½øÐÐÄ£¾ßÓÅ»¯Éè¼Æ¡£

µÚËIJ¿·Ö£ºÄ£ËÜй¤ÒÕÏà¹Ø
1. ÈÈÁ÷µÀ¼¼ÊõÓ¦Óü°Ïà¹ØÎÊÌâ½â¾ö£»2.Ë«É«³ÉÐͼ¼ÊõÓ¦Óü°Ïà¹ØÎÊÌâ½â¾ö£»
2. ÆøÌ帨Öú³ÉÐͼ¼ÊõÓ¦Óü°Ïà¹ØÎÊÌâ½â¾ö£»

µÚÎ岿·Ö£º°¸Àý·ÖÎö
¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô
¹ËÎʽéÉÜ:
µËÒæÉÆÏÈÉúÖйú½Ü³ö×¢Ëܼ¼Êõ¡¢Ä£¾ßÉè¼ÆÓÅ»¯¼¼ÊõÅàѵʵսר¼Ò£¬Ë¶Ê¿£¬ÏȺóÔÚÃÀ¡¢µÂ¡¢
̨×ÊÍâÆó¡¢´ÓÊÂÏà¹Ø¹¤×÷¶àÄ꣬ÀúÈ餳Ìʦ¡¢Ö÷¹Ü¡¢¾­ÀíµÈÖ°Îñ£¬ÔÚÉè¼ÆÉú²úÒ»Ï߶àÄêÃþ
ÅÀ¹ö´ò£¬²¢ÔÚ×Éѯ¹ËÎÊÖлýÀÛÁ˷ḻµÄ¾­Ñ飬ÓÈÆäÉîÚÏ×¢ËÜȱÏÝÔ­Òò·ÖÎöÓë½â¾ö·½°¸¡¢Ä£
¾ßÉè¼ÆÓÅ»¯¼¼Êõ£¬¶Ô×¢ËÜ»úе¡¢ËÜÁϲÄÁϾßÓÐÏ൱µÄ¼¼Êõ¹¦µ×£¬ÐγÉÁ˶À¾ßÌØÉ«µÄʵ¸ÉÐÍ
Ä£¾ß/×¢Ëܼ¼Êõ·½·¨ºÍÌåϵ¡£µËÀÏʦʵ¼ù¾­Ñé·á¸»¡¢½²ÊÚ¹ý³ÌÁоٴóÁ¿°¸Àý¡¢ ÌرðÇ¿µ÷ʵ
ÓÃÐԺͿɲÙ×÷ÐÔ£¬ÉîÊÜÌý¿ÎÈËÔ±µÄºÃÆÀºÍ×ð¾´¡£ÖÁ½ñÀîÀÏʦΪÂú×ãÆóÒµµÄʵ¼ÊÐèÒª£¬ÏȺó
¾Ù°ìÁË×¢Ëܼ¼Êõ¡¢Ä£¾ßÉè¼ÆÓÅ»¯¼¼Êõ·½ÃæµÄÄÚѵ¡¢¹«¿ª¿Î³Ì¹²¼Æ600¶à³¡£¬ ²ÎѵÆóÒµ4000
¼Ò×óÓÒ£¬ÅàÑøÁËÒ»´óÅúÓÅÐãµÄÆóÒµ¼¼ÊõÈ˲ţ¬Ä¿Ç°Ö÷Òª·Ö²¼ÔÚÉϺ£¡¢ÉîÛÚ¡¢¹ã¶«¡¢½­ÕãµØ
Çø´óÖÐÐÍÉú²úÐÍÆóÒµ¡£Îª¹úÄÚÆóÒµÉú²ú¼¼ÊõÅàѵ¹¤×÷×ö³öÁËÍ»³ö¹±Ï×£¬ÊµÊµÔÚÔÚΪÆóÒµ½â
¾öÁËÉè¼ÆÓëÉú²úÄÑÌâ¡£
¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô¡Ô

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd.h

2011-05-03 Thread Andrey Hristov 
andrey   Tue, 03 May 2011 09:37:53 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=310735

Log:
extend the API in the backward compatible way

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2011-05-03 09:11:07 UTC 
(rev 310734)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2011-05-03 09:37:53 UTC 
(rev 310735)
@@ -27,6 +27,7 @@

 /* This forces inlining of some accessor functions */
 #define MYSQLND_USE_OPTIMISATIONS 0
+#define AUTOCOMMIT_TX_COMMIT_ROLLBACK

 #define MYSQLND_STRING_TO_INT_CONVERSION
 /*

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ext/ sockets/tests/socket_strerror.phpt standard/tests/file/fscanf_variation39.phpt standard/tests/file/fscanf_variation55.phpt standard/tests/strings/printf_64bit.ph

2011-05-03 Thread Antony Dovgal 
tony2001 Tue, 03 May 2011 11:15:30 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=310739

Log:
fix tests

Changed paths:
U   php/php-src/trunk/ext/sockets/tests/socket_strerror.phpt
U   php/php-src/trunk/ext/standard/tests/file/fscanf_variation39.phpt
U   php/php-src/trunk/ext/standard/tests/file/fscanf_variation55.phpt
U   php/php-src/trunk/ext/standard/tests/strings/printf_64bit.phpt
U   php/php-src/trunk/ext/standard/tests/strings/sscanf_basic6.phpt

Modified: php/php-src/trunk/ext/sockets/tests/socket_strerror.phpt
===
--- php/php-src/trunk/ext/sockets/tests/socket_strerror.phpt2011-05-03 
10:27:56 UTC (rev 310738)
+++ php/php-src/trunk/ext/sockets/tests/socket_strerror.phpt2011-05-03 
11:15:30 UTC (rev 310739)
@@ -154,4 +154,4 @@
 string(27) Key was rejected by service
 string(10) Owner died
 string(21) State not recoverable
-string(37) Operation not possible due to RF-kill
+string(%d) %s

Modified: php/php-src/trunk/ext/standard/tests/file/fscanf_variation39.phpt
===
--- php/php-src/trunk/ext/standard/tests/file/fscanf_variation39.phpt   
2011-05-03 10:27:56 UTC (rev 310738)
+++ php/php-src/trunk/ext/standard/tests/file/fscanf_variation39.phpt   
2011-05-03 11:15:30 UTC (rev 310739)
@@ -1,5 +1,11 @@
 --TEST--
 Test fscanf() function: usage variations - unsigned int formats with integer 
values
+--SKIPIF--
+?php
+if (PHP_INT_SIZE != 4) {
+   die(skip this test is for 32bit platform only);
+}
+?
 --FILE--
 ?php


Modified: php/php-src/trunk/ext/standard/tests/file/fscanf_variation55.phpt
===
--- php/php-src/trunk/ext/standard/tests/file/fscanf_variation55.phpt   
2011-05-03 10:27:56 UTC (rev 310738)
+++ php/php-src/trunk/ext/standard/tests/file/fscanf_variation55.phpt   
2011-05-03 11:15:30 UTC (rev 310739)
@@ -1,5 +1,11 @@
 --TEST--
 Test fscanf() function: usage variations - tracking file pointer while reading
+--SKIPIF--
+?php
+if (PHP_INT_SIZE != 4) {
+   die(skip this test is for 32bit platform only);
+}
+?
 --FILE--
 ?php


Modified: php/php-src/trunk/ext/standard/tests/strings/printf_64bit.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/printf_64bit.phpt  
2011-05-03 10:27:56 UTC (rev 310738)
+++ php/php-src/trunk/ext/standard/tests/strings/printf_64bit.phpt  
2011-05-03 11:15:30 UTC (rev 310739)
@@ -671,7 +671,7 @@
 *** Output for precision value more than maximum ***

 Notice: printf(): Requested precision of 988 digits was truncated to PHP 
maximum of %d digits in %s on line %d
-12345678900.
+12345678900.00%d

 *** Output for invalid width(-15) specifier ***
 15s

Modified: php/php-src/trunk/ext/standard/tests/strings/sscanf_basic6.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/sscanf_basic6.phpt 
2011-05-03 10:27:56 UTC (rev 310738)
+++ php/php-src/trunk/ext/standard/tests/strings/sscanf_basic6.phpt 
2011-05-03 11:15:30 UTC (rev 310739)
@@ -1,5 +1,11 @@
 --TEST--
 Test sscanf() function : basic functionality - unsigned format
+--SKIPIF--
+?php
+if (PHP_INT_SIZE != 4) {
+   die(skip this test is for 32bit platform only);
+}
+?
 --FILE--
 ?php


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/ sockets/tests/socket_strerror.phpt standard/tests/file/fscanf_variation39.phpt standard/tests/file/fscanf_variation55.phpt standard/tests/strings/prin

2011-05-03 Thread Antony Dovgal 
tony2001 Tue, 03 May 2011 11:15:45 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=310740

Log:
fix tests

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fscanf_variation39.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fscanf_variation55.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/printf_64bit.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/sscanf_basic6.phpt

Modified: php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt
===
--- php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt 
2011-05-03 11:15:30 UTC (rev 310739)
+++ php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt 
2011-05-03 11:15:45 UTC (rev 310740)
@@ -154,4 +154,4 @@
 string(27) Key was rejected by service
 string(10) Owner died
 string(21) State not recoverable
-string(37) Operation not possible due to RF-kill
+string(%d) %s

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fscanf_variation39.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fscanf_variation39.phpt
2011-05-03 11:15:30 UTC (rev 310739)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fscanf_variation39.phpt
2011-05-03 11:15:45 UTC (rev 310740)
@@ -1,5 +1,11 @@
 --TEST--
 Test fscanf() function: usage variations - unsigned int formats with integer 
values
+--SKIPIF--
+?php
+if (PHP_INT_SIZE != 4) {
+   die(skip this test is for 32bit platform only);
+}
+?
 --FILE--
 ?php


Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fscanf_variation55.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fscanf_variation55.phpt
2011-05-03 11:15:30 UTC (rev 310739)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fscanf_variation55.phpt
2011-05-03 11:15:45 UTC (rev 310740)
@@ -1,5 +1,11 @@
 --TEST--
 Test fscanf() function: usage variations - tracking file pointer while reading
+--SKIPIF--
+?php
+if (PHP_INT_SIZE != 4) {
+   die(skip this test is for 32bit platform only);
+}
+?
 --FILE--
 ?php


Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/printf_64bit.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/printf_64bit.phpt   
2011-05-03 11:15:30 UTC (rev 310739)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/printf_64bit.phpt   
2011-05-03 11:15:45 UTC (rev 310740)
@@ -671,7 +671,7 @@
 *** Output for precision value more than maximum ***

 Notice: printf(): Requested precision of 988 digits was truncated to PHP 
maximum of %d digits in %s on line %d
-12345678900.
+12345678900.00%d

 *** Output for invalid width(-15) specifier ***
 15s

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/sscanf_basic6.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/sscanf_basic6.phpt  
2011-05-03 11:15:30 UTC (rev 310739)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/sscanf_basic6.phpt  
2011-05-03 11:15:45 UTC (rev 310740)
@@ -1,5 +1,11 @@
 --TEST--
 Test sscanf() function : basic functionality - unsigned format
+--SKIPIF--
+?php
+if (PHP_INT_SIZE != 4) {
+   die(skip this test is for 32bit platform only);
+}
+?
 --FILE--
 ?php


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php