| List: | Commits | « Previous MessageNext Message » | |
| From: | uwendel | Date: | July 2 2007 3:19pm |
| Subject: | PHP mysqlnd svn commit: r580 - trunk/tests/ext/mysqli | ||
| View as plain text | |||
Author: uwendel Date: 2007-07-02 15:19:54 +0200 (Mon, 02 Jul 2007) New Revision: 580 Modified: trunk/tests/ext/mysqli/connect.inc trunk/tests/ext/mysqli/mysqli_class_mysqli_result_interface.phpt trunk/tests/ext/mysqli/mysqli_class_mysqli_warning.phpt trunk/tests/ext/mysqli/mysqli_get_warnings.phpt trunk/tests/ext/mysqli/mysqli_set_local_infile_default.phpt trunk/tests/ext/mysqli/mysqli_set_local_infile_handler.phpt trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_bad_character.phpt trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_buffer_overflow.phpt trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_close_link.phpt trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_closefile.phpt trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_kill_link.phpt trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_negative_len.phpt trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nested_call.phpt trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_new_query.phpt trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nofileop.phpt trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_replace_buffer.phpt trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_short_len.phpt trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_unregister.phpt trunk/tests/ext/mysqli/mysqli_stmt_get_warnings.phpt trunk/tests/ext/mysqli/mysqli_stmt_sqlstate.phpt trunk/tests/ext/mysqli/skipif.inc Log: New environment variable: MYSQL_TEST_EXPERIMENTAL = 1 -> run tests for experimental functions and/or feature requests MYSQL_TEST_EXPERIMENTAL = 0 -> run only tests for documented and supported functionality Modified: trunk/tests/ext/mysqli/connect.inc =================================================================== --- trunk/tests/ext/mysqli/connect.inc 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/connect.inc 2007-07-02 13:19:54 UTC (rev 580) @@ -15,6 +15,11 @@ $db = getenv("MYSQL_TEST_DB") ? getenv("MYSQL_TEST_DB") : "phptest"; $engine = getenv("MYSQL_TEST_ENGINE") ? getenv("MYSQL_TEST_ENGINE") : "MyISAM"; $socket = getenv("MYSQL_TEST_SOCKET") ? getenv("MYSQL_TEST_SOCKET") : null; + + /* Development setting: test experimal features and/or feature requests that never worked before? */ + $TEST_EXPERIMENTAL = (in_array(getenv("MYSQL_TEST_EXPERIMENTAL"), array(0, 1))) ? + ((1 == getenv("MYSQL_TEST_EXPERIMENTAL")) ? true : false) : + false; $IS_MYSQLND = stristr(mysqli_get_client_info(), "mysqlnd"); ?> \ No newline at end of file Modified: trunk/tests/ext/mysqli/mysqli_class_mysqli_result_interface.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_class_mysqli_result_interface.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_class_mysqli_result_interface.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -1,8 +1,10 @@ --TEST-- Interface of the class mysqli_result --SKIPIF-- -<?php require_once('skipif.inc'); ?> -<?php require_once('skipifemb.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifemb.inc'); +?> --FILE-- <?php require('connect.inc'); Modified: trunk/tests/ext/mysqli/mysqli_class_mysqli_warning.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_class_mysqli_warning.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_class_mysqli_warning.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -1,9 +1,13 @@ --TEST-- -Interface of the class mysqli_warning +Interface of the class mysqli_warning - TODO --SKIPIF-- <?php require_once('skipif.inc'); require_once('skipifemb.inc'); +require_once('connect.inc'); + +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_get_warnings.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_get_warnings.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_get_warnings.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -1,9 +1,13 @@ --TEST-- -mysqli_get_warnings() +mysqli_get_warnings() - TODO --SKIPIF-- <?php require_once('skipif.inc'); require_once('skipifemb.inc'); +require_once('connect.inc'); + +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php @@ -137,4 +141,4 @@ print "done!"; ?> --EXPECTF-- -done! +done! \ No newline at end of file Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_default.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_set_local_infile_default.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_set_local_infile_default.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -5,12 +5,12 @@ require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('connect.inc'); + if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); -if (!$IS_MYSQLND) - /* for mysqlnd we want to see the error for libmysql ... */ - die("skip - experimental since years and segfaulting"); +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -8,9 +8,9 @@ if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); -if (!$IS_MYSQLND) - /* for mysqlnd we want to see the error for libmysql ... */ - die("skip - experimental since years and buggy"); + +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_bad_character.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_bad_character.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_bad_character.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -8,10 +8,9 @@ if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); - -if (!$IS_MYSQLND) - /* for mysqlnd we want to see the error for libmysql ... */ - die("skip - experimental since years and segfaulting"); + +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_buffer_overflow.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_buffer_overflow.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_buffer_overflow.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -8,10 +8,9 @@ if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); - -if (!$IS_MYSQLND) - /* for mysqlnd we want to see the error for libmysql ... */ - die("skip - experimental since years and buggy"); + +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_close_link.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_close_link.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_close_link.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -9,9 +9,8 @@ if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); -if (!$IS_MYSLQND) - /* for mysqlnd we want to see the error for libmysql ... */ - die("skip - experimental since years and segfaulting"); +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_closefile.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_closefile.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_closefile.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -4,8 +4,13 @@ <?php require_once('skipif.inc'); require_once('skipifemb.inc'); +require_once('connect.inc'); + if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); + +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_kill_link.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_kill_link.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_kill_link.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -8,9 +8,9 @@ if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); - -if (!$IS_MYSQLND) - die("skip - experimental since years and segfaulting"); + +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_negative_len.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_negative_len.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_negative_len.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -3,9 +3,14 @@ --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); +require_once('connect.inc'); + if (!function_exists('mysqli_set_local_infile_handler')) - die("skip - function not available."); + die("skip - function not available."); + +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nested_call.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nested_call.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nested_call.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -3,9 +3,14 @@ --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); +require_once('connect.inc'); + if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); + +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_new_query.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_new_query.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_new_query.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -9,9 +9,8 @@ if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); -if (!$IS_MYSQLND) - /* for mysqlnd we want to see the error for libmysql ... */ - die("skip - experimental since years and segfaulting"); +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nofileop.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nofileop.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nofileop.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -3,9 +3,14 @@ --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); +require_once('connect.inc'); + if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); + +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_replace_buffer.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_replace_buffer.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_replace_buffer.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -4,8 +4,13 @@ <?php require_once('skipif.inc'); require_once('skipifemb.inc'); +require_once('connect.inc'); + if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); + +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_short_len.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_short_len.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_short_len.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -3,9 +3,14 @@ --SKIPIF-- <?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); +require_once('connect.inc'); + if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); + +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_unregister.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_unregister.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_unregister.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -9,9 +9,8 @@ if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); -if (!$IS_MYSQLND) - /* for mysqlnd we want to see the error for libmysql ... */ - die("skip - experimental since years and segfaulting"); +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_stmt_get_warnings.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_stmt_get_warnings.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_stmt_get_warnings.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -1,9 +1,13 @@ --TEST-- -mysqli_stmt_get_warnings() +mysqli_stmt_get_warnings() - TODO --SKIPIF-- <?php require_once('skipif.inc'); require_once('skipifemb.inc'); +require_once('connect.inc'); + +if (!$TEST_EXPERIMENTAL) + die("skip - experimental (= unsupported) feature"); ?> --FILE-- <?php Modified: trunk/tests/ext/mysqli/mysqli_stmt_sqlstate.phpt =================================================================== --- trunk/tests/ext/mysqli/mysqli_stmt_sqlstate.phpt 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/mysqli_stmt_sqlstate.phpt 2007-07-02 13:19:54 UTC (rev 580) @@ -49,8 +49,7 @@ print "done!"; ?> --EXPECTF-- -Warning: mysqli_stmt_sqlstate(): invalid object or resource mysqli_stmt - in %s on line %d +Warning: mysqli_stmt_sqlstate(): invalid object or resource mysqli_stmt in %s on line %d Warning: mysqli_stmt_sqlstate(): Couldn't fetch mysqli_stmt in %s on line %d done! Modified: trunk/tests/ext/mysqli/skipif.inc =================================================================== --- trunk/tests/ext/mysqli/skipif.inc 2007-07-02 12:29:07 UTC (rev 579) +++ trunk/tests/ext/mysqli/skipif.inc 2007-07-02 13:19:54 UTC (rev 580) @@ -2,5 +2,4 @@ if (!extension_loaded('mysqli')){ die('skip mysqli extension not available'); } -include "connect.inc"; ?>
| Thread | ||
|---|---|---|
| • PHP mysqlnd svn commit: r580 - trunk/tests/ext/mysqli | uwendel | 2 Jul |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.493 sec. using MySQL 5.1.14-beta-log