From def5c80e778eb420a19fa40d51047a16b89c2b58 Mon Sep 17 00:00:00 2001 From: andy wharmby Date: Mon, 12 Jan 2009 15:58:41 +0000 Subject: [PATCH] Fix Windows tests after #47037 --- .../file_get_contents_variation8-win32.phpt | 77 +++++++++++------- .../file_put_contents_variation8-win32.phpt | Bin 2147 -> 2583 bytes .../file/readfile_variation10-win32.phpt | Bin 1785 -> 2095 bytes 3 files changed, 46 insertions(+), 31 deletions(-) diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt index de471d30a2..38cbe5d775 100644 --- a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt @@ -1,7 +1,5 @@ --TEST-- Test file_get_contents() function : variation - obscure filenames ---XFAIL-- -Return values are inconsistent (and have changed from previous versions) --CREDITS-- Dave Kelsey --SKIPIF-- @@ -18,67 +16,84 @@ if(substr(PHP_OS, 0, 3) != "WIN") */ echo "*** Testing file_get_contents() : variation ***\n"; + /* An array of filenames */ $names_arr = array( /* Invalid args */ - -1, - TRUE, - FALSE, - NULL, - "", - " ", - "\0", - array(), - - /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir", - "php/php" + "-1" => -1, + "TRUE" => TRUE, + "FALSE" => FALSE, + "NULL" => NULL, + "\"\"" => "", + "\" \"" => " ", + "\\0" => "\0", + "array()" => array(), + + /* prefix with path separator of a non existing directory*/ + "/no/such/file/dir" => "/no/such/file/dir", + "php/php"=> "php/php" ); -for( $i=0; $i$value) { + echo "\n-- Filename: $key --\n"; + var_dump(file_get_contents($value)); } -echo "\n*** Done ***\n"; ?> +===Done=== --EXPECTF-- *** Testing file_get_contents() : variation *** --- Iteration 0 -- + +-- Filename: -1 -- Warning: file_get_contents(-1): failed to open stream: No such file or directory in %s on line %d bool(false) --- Iteration 1 -- + +-- Filename: TRUE -- Warning: file_get_contents(1): failed to open stream: No such file or directory in %s on line %d bool(false) --- Iteration 2 -- + +-- Filename: FALSE -- + +Warning: file_get_contents(): Filename cannot be empty in %s on line %d bool(false) --- Iteration 3 -- + +-- Filename: NULL -- + +Warning: file_get_contents(): Filename cannot be empty in %s on line %d bool(false) --- Iteration 4 -- + +-- Filename: "" -- + +Warning: file_get_contents(): Filename cannot be empty in %s on line %d bool(false) --- Iteration 5 -- + +-- Filename: " " -- Warning: file_get_contents( ): failed to open stream: Permission denied in %s on line %d bool(false) --- Iteration 6 -- + +-- Filename: \0 -- + +Warning: file_get_contents(): Filename cannot be empty in %s on line %d bool(false) --- Iteration 7 -- + +-- Filename: array() -- Notice: Array to string conversion in %s on line %d Warning: file_get_contents(Array): failed to open stream: No such file or directory in %s on line %d bool(false) --- Iteration 8 -- + +-- Filename: /no/such/file/dir -- Warning: file_get_contents(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d bool(false) --- Iteration 9 -- + +-- Filename: php/php -- Warning: file_get_contents(php/php): failed to open stream: No such file or directory in %s on line %d bool(false) - -*** Done *** - +===Done=== \ No newline at end of file diff --git a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt index b762deea85f939513e3d7ba503851865dc53a430..c13b0f73110f738880d2a2329a83bcb4e5729031 100644 GIT binary patch delta 896 zcma)4!EVz)5LN3yi8+AOL<$j7pH@MNE3cf03u@&c1oRX@qV$4{(Bf`ttI6839oh&* z6~Dk95P!iBAU=iz7x)KuH>P0s5=-lydGp@P?C$)y{kiq^&E^H6Ljr#UI&^J-yn1=` z)cD#k$ibuW;R-UA!JZ$D$A+a1g9IcX1|g*M@fSde1cMbp?S{g#j4dwujzNvncU)UF z;q4;L_#{5ZSzJU&nfm2CWf?1y49NrxA`#%{abCpY1jlj4Lls)=deCR^MB?T1F!Cnx zlzS?=s(Tf7VSlo2Zu%p+VQs(QER6a+!Dc*vtJ(p}(L3b}bveEFY&z!-KB(;a<6)G5 z1cFi=s1jPTx8hP72(oWz^0jrhV}vfqVKU=5W(6aTjy9#V=tfh1w|4Fu%B2cT%*8Yo zr~R_1p#w|sY0k?IWVdmTsMh|eux#4PecOIGvVGrwk_fIgnKvHavMWte`KxiKO^0?B z){iZJH@e$Z*gUxWat&Q)@A9MwnGi{VcN~0{77{nyjv>}^>d{z3+t$3Al#n%qEkf!t zXx&+hpdJYZYb5LhgIdCJDCM*3-*&1ub7huve)(YQW4p>rqtsK&M1OA0{(GE1AENsQ delta 673 zcmZ{g$x1^p6o$oCY6A|aD^WRID)!a}+gisuAPyiD1qWPMk+jD4YMYdME~Cby*+(JXQff4+16pFH-xbw3@n-r{5&0qkt;uIjqBl->55jooZk z3zp^IP%pWJUy19ItEe4E3K$y`B?^pQ3P?ebGU^gR;e?zMs8G)%Me2da;ex^uXCne! zS}i*T&FHymN2%K65XhB)wTY0OLFkyfQHVJ6iHy4E3jBsRtCw}z`$U0a6jT4#KGF;6%~jGVks~A6~Gb)hvp2*9|nES zSlMBxKiu^aH3v}B=4Fqn6!IoGoc?P;4b>2;C(N-}ECwr_QBaLhCUGM+nM5@L9k~WPr*4z+YTSadI)--(!xC|1GB*a+gU@$j>&AZK1thFdrrx he0PhfPsxwabEgq_+TZcses9V%@-F<)g?@exLf?o=!v+8V diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt index d9073a76f32e055a37934df6b5435352747e2e8e..1a86c2aa4e92ca6d0ba2f3f2c2145ce3187fc880 100644 GIT binary patch literal 2095 zcmcIkZBHUG5dPj@G1q7UgmoqNZ52HtkRuW#g7K2Wkg{8(VQDvQ7bTbb?>FtPNRA_3 z?$iVsrcdYPnWqy30Z0U|P_q;n=v;!5=?4G7y^x7|GPHU|E?wYm zuix2*4Qnve$|}3bIA9+_?sSORgnR_otz;_>-|H|_DuvwesgQA+Cw%IfL%-%mz z;t4d1^9mA+@LoAgrXLF=01X-xnimi>>WHD^+q;hc?F{efw)&&Oh)c;SKJ8Pm)n-PkAtiHhLQ zqM#`en#XvwK^C!tP^!@6@xqfH;$e|>-(5%Ifubx!{7|G|YZHPpBXflVh!>R|HgR-E zOO!i;kMLRKyb3=si2EzXH<3XA-BM~%0S*E`t^&55X?g#Q{KQl!>1MOpR+8fvs=M=T z*tr_Jck_38Ab4jdZO{O`O75AKsH5mrNI|0-!JJ`ziPNCUxCDG3oUI}lC~&lGb-kq( zpA#G#_XtxVIUFayWphe7knbbXc@-YWhuyu94>6NcS(tI)tITfR>cT1c{iEWW`12(G zqf!cog2LhH4!K?lW89ukxD+`5H>Nr{egDeKSMCE3loc`V$(CPVD8_P6`r)?!S=4*$;s6_axDTkMTu}!qC{N!d@9Pr!1@gIu`v3p{ delta 489 zcmZ24@RN7LWyZ;u7~PC@4RyE_6heYRT|u;)qfaoH;TP)T0}@bD0+R|5D#idrPoB#Z zSFfW0k}b$6&**$VTcKs!w)c7oW_^ z;?9RG4izqCadSi#23gKUnt%etf+wtYC>AiNPwr;36hb!3v8X7q5+poL4p~?~FJHg7 iG&w^bPlmMs -- 2.50.1