uw              Thu Jul 12 20:28:25 2007 UTC

  Modified files:              
    /php-src/ext/mysqli/tests   001.phpt 
  Log:
  All the upcoming changes in the 0*.phpt files are pretty much the same. I'll
  describe them only once in with a bit of detail.
  
  1) Correct Whitespace (space vs. tab) if need be
  2) Recall: you get the connection parameter from connect.inc, no DB name, no
     port no other connection parameter in any of the tests!
  3) At the end of each test you find a "print 'done!'" or similar. This is
     most helpful to detect crashing/segfaulting tests with all run-tests.php
     versions.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/001.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/001.phpt
diff -u php-src/ext/mysqli/tests/001.phpt:1.7 
php-src/ext/mysqli/tests/001.phpt:1.8
--- php-src/ext/mysqli/tests/001.phpt:1.7       Tue Sep 26 13:06:13 2006
+++ php-src/ext/mysqli/tests/001.phpt   Thu Jul 12 20:28:25 2007
@@ -7,41 +7,54 @@
 <?php
        include "connect.inc";
 
-       $dbname = "test";
        $test = "";
 
        /*** test mysqli_connect localhost:port ***/
-       $link = mysqli_connect($host, $user, $passwd, "", 3306);
+       $link = mysqli_connect($host, $user, $passwd, "", $port, $socket);
        $test .= ($link) ? "1" : "0";
        mysqli_close($link);
 
        /*** test mysqli_real_connect ***/
-       $link = mysqli_init();  
-       $test.= (mysqli_real_connect($link, $host, $user, $passwd)) 
+       $link = mysqli_init();
+       $test.= (mysqli_real_connect($link, $host, $user, $passwd, "", $port, 
$socket) )
                ? "1" : "0";
        mysqli_close($link);
 
        /*** test mysqli_real_connect with db ***/
-       $link = mysqli_init();  
-       $test .= (mysqli_real_connect($link, $host, $user, $passwd, $dbname)) 
+       $link = mysqli_init();
+       $test .= (mysqli_real_connect($link, $host, $user, $passwd, $db, $port, 
$socket))
                ? "1" : "0";
        mysqli_close($link);
 
        /*** test mysqli_real_connect with port ***/
-       $link = mysqli_init();  
-       $test .= (mysqli_real_connect($link, $host, $user, $passwd, $dbname, 
3306))
+       $link = mysqli_init();
+       $test .= (mysqli_real_connect($link, $host, $user, $passwd, $db, $port, 
$socket))
                ? "1":"0";
        mysqli_close($link);
 
+       /* temporary addition for Kent's setup, Win32 box */
+       for ($i = 0; $i < 10; $i++) {
+           if (!$link = mysqli_init())
+              printf("[001 + %d] mysqli_init() failed, [%d] %s\n", $i, 
mysqli_connect_errno(), mysqli_connect_error());
+
+           if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, 
$socket))
+              printf("[002 + %d] mysqli_real_connect() failed, [%d] %s\n", $i, 
mysqli_connect_errno(), mysqli_connect_error());
+
+           mysqli_close($link);
+       }
+
        /*** test mysqli_real_connect compressed ***/
-       $link = mysqli_init();  
-       $test .= (mysqli_real_connect($link, $host, $user, $passwd, $dbname, 0, 
NULL, MYSQLI_CLIENT_COMPRESS)) 
+       /*
+       $link = mysqli_init();
+       $test .= (mysqli_real_connect($link, $host, $user, $passwd, $db, $port, 
$socket, MYSQLI_CLIENT_COMPRESS))
                ? "1" : "0";
        mysqli_close($link);
-
+  */
        /* todo ssl connections */
 
        var_dump($test);
+       print "done!";
 ?>
 --EXPECTF--
-%s(5) "11111"
+%s(4) "1111"
+done!
\ No newline at end of file

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

Reply via email to