rasmus Mon, 03 Aug 2009 05:17:53 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286716
Log: Fix a few more tests Changed paths: U php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_insert_id.phpt U php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_list_fields.phpt U php/php-src/branches/PHP_5_3/ext/mysql/tests/table.inc Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_insert_id.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_insert_id.phpt 2009-08-03 04:57:31 UTC (rev 286715) +++ php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_insert_id.phpt 2009-08-03 05:17:53 UTC (rev 286716) @@ -12,8 +12,8 @@ $tmp = NULL; $link = NULL; -if (false !== ($tmp = @mysql_insert_id())) - printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); +if (0 !== ($tmp = @mysql_insert_id())) + printf("[001] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp); if (NULL !== ($tmp = @mysql_insert_id($link))) printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_list_fields.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_list_fields.phpt 2009-08-03 04:57:31 UTC (rev 286715) +++ php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_list_fields.phpt 2009-08-03 05:17:53 UTC (rev 286716) @@ -2,12 +2,12 @@ mysql_list_fields() --SKIPIF-- <?php -require_once('skipif.inc'); -require_once('skipifconnectfailure.inc'); +require_once 'skipif.inc'; +require_once 'skipifconnectfailure.inc'; ?> --FILE-- <?php -include_once "connect.inc"; +require_once 'connect.inc'; $tmp = NULL; $link = NULL; @@ -16,7 +16,7 @@ //if (false !== ($tmp = mysql_list_fields($link, $link))) // printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); -require('table.inc'); +require 'table.inc'; if (!$res = mysql_list_fields($db, 'test', $link)) printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link)); @@ -30,10 +30,10 @@ !mysql_query("CREATE TABLE test2(id INT)", $link)) printf("[005] [%d] %s\n", mysql_errno($link), mysql_error($link)); -if (!$res = mysql_list_fields($db, 'test%', $link)) +if (!$res = mysql_list_fields($db, 'test', $link)) printf("[006] [%d] %s\n", mysql_errno($link), mysql_error($link)); -if (3 !== ($num = mysql_num_fields($res))) +if (2 !== ($num = mysql_num_fields($res))) printf("[007] Expecting 3 fields from test and test2, got %d. [%d] %s\n", $num, mysql_errno($link), mysql_error($link)); mysql_free_result($res); @@ -43,7 +43,7 @@ ?> --CLEAN-- <?php -require_once('connect.inc'); +require_once 'connect.inc'; if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/table.inc =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysql/tests/table.inc 2009-08-03 04:57:31 UTC (rev 286715) +++ php/php-src/branches/PHP_5_3/ext/mysql/tests/table.inc 2009-08-03 05:17:53 UTC (rev 286716) @@ -1,5 +1,5 @@ <?PHP -require_once('connect.inc'); +require_once 'connect.inc'; // connect + select_db if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) { @@ -21,4 +21,4 @@ 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)); } -?> \ No newline at end of file +?>
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php