cvs: php-src /ext/mysqli/tests mysqli_class_mysqli_driver_interface.phpt
| From: | Ulf Wendel | Date: | Fri, 29 May 2009 10:25:37 +0000 |
| Subject: | cvs: php-src /ext/mysqli/tests mysqli_class_mysqli_driver_interface.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-58387@lists.php.net to get a copy of this message | ||
uw Fri May 29 10:25:37 2009 UTC
Modified files:
/php-src/ext/mysqli/tests mysqli_class_mysqli_driver_interface.phpt
Log:
Weaker test: functions are only available if HAVE_EMBEDDED_MYSQLI is set. There is probably no
proper way to check this condition in the user land.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt
diff -u php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt:1.3
php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt:1.4
--- php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt:1.3 Tue Mar 18 16:58:43 2008
+++ php-src/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt Fri May 29 10:25:37 2009
@@ -1,7 +1,7 @@
--TEST--
Interface of the class mysqli_driver
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
require_once('skipifconnectfailure.inc');
@@ -20,11 +20,12 @@
$methods = get_class_methods($driver);
$expected_methods = array();
- if (!$IS_MYSQLND) {
- /* libmysql only */
+ if (!$IS_MYSQLND && (isset($methods['embedded_server_start']))) {
+ /* libmysql only - needs extra compile flag, no way to check properly in the
+ PHP user land if its compiled in or not */
$expected_methods = array_merge($expected_methods, array(
- 'embedded_server_start' => true,
- 'embedded_server_end' => true,
+ 'embedded_server_start' => true,
+ 'embedded_server_end' => true,
));
}