uw              Wed Oct 10 09:49:38 2007 UTC

  Added files:                 (Branch: PHP_5_3)
    /php-src/ext/mysql/tests    table.inc skipifconnectfailure.inc 
  Log:
  New tests use more helper files.
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/table.inc?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/table.inc
+++ php-src/ext/mysql/tests/table.inc
<?PHP 
require_once('connect.inc');

// connect + select_db
if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) {
    printf("Cannot connect to the server using host=%s/%s, user=%s, passwd=***, 
dbname=%s, port=%s, socket=%s\n",
        $host, $myhost, $user, $db, $port, $socket);
    exit(1);
}   

if (!mysql_query('DROP TABLE IF EXISTS test', $link)) {
    printf("Failed to drop old test table: [%d] %s\n", mysql_errno($link), 
mysql_error($link));
    exit(1);
}        
        
if (!mysql_query('CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id)) 
ENGINE=' . $engine, $link)) {
    printf("Failed to create test table: [%d] %s\n", mysql_errno($link), 
mysql_error($link));
    exit(1);
}

if (!mysql_query('INSERT INTO test(id, label) VALUES (1, "a"), (2, "b"), (3, 
"c"), (4, "d"), (5, "e"), (6, "f")', $link)) {
    printf("[%d] %s\n",  mysql_errno($link), mysql_error($link));        
}
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/skipifconnectfailure.inc?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/skipifconnectfailure.inc
+++ php-src/ext/mysql/tests/skipifconnectfailure.inc
<?php
$skip_on_connect_failure  = getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") ? 
getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") : false;
if ($skip_on_connect_failure) {
        if ($socket)
                $myhost = sprintf("%s:%s", $host, $socket);
        else if ($port)
                $myhost = sprintf("%s:%s", $host, $port);
        
        if (!$link = @mysql_connect($myhost, $user, $passwd, true))
                die(sprintf("skip Can't connect to MySQL Server - [%d] %s", 
mysql_errno(), mysql_error()));

        if ([EMAIL PROTECTED]($db, $link))
                die(sprintf("skip Can't connect to MySQL Server - [%d] %s", 
mysql_errno(), mysql_error()));
                
        mysql_close($link);
}
?>

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

Reply via email to