Date: Wednesday, February 1, 2006 @ 13:37:31
Author: csaba
Path: /cvsroot/carob/libmysequoia/test-suite/php5/mysqli
Modified: connect.inc (1.1 -> 1.2) skipif.inc (1.1 -> 1.2) skipifemb.inc
(1.1 -> 1.2)
Tailored the connect, skipif and skipifemb for our purpose.
---------------+
connect.inc | 20 +++-----------------
skipif.inc | 8 +++++---
skipifemb.inc | 3 ---
3 files changed, 8 insertions(+), 23 deletions(-)
Index: libmysequoia/test-suite/php5/mysqli/connect.inc
diff -u libmysequoia/test-suite/php5/mysqli/connect.inc:1.1
libmysequoia/test-suite/php5/mysqli/connect.inc:1.2
--- libmysequoia/test-suite/php5/mysqli/connect.inc:1.1 Wed Feb 1 10:57:20 2006
+++ libmysequoia/test-suite/php5/mysqli/connect.inc Wed Feb 1 13:37:31 2006
@@ -2,22 +2,8 @@
/* default values are localhost, root and empty password
Change the values if you use another configuration */
- $driver = new mysqli_driver;
-
- if (!$driver->embedded) {
- $host = "localhost";
- $user = "root";
- $passwd = "rootpass";
- } else {
- $path = dirname(__FILE__);
- $host = $user = $passwd = NULL;
- $args = array(
- "--datadir=$path",
- "--innodb_data_home_dir=$path",
-
"--innodb_data_file_path=ibdata1:10M:autoextend",
- "--log-error=$path/testrun.log"
- );
- $driver->embedded_server_start(TRUE, $args, NULL);
- }
+ $host = "localhost";
+ $user = "root";
+ $passwd = "rootpass";
?>
Index: libmysequoia/test-suite/php5/mysqli/skipif.inc
diff -u libmysequoia/test-suite/php5/mysqli/skipif.inc:1.1
libmysequoia/test-suite/php5/mysqli/skipif.inc:1.2
--- libmysequoia/test-suite/php5/mysqli/skipif.inc:1.1 Wed Feb 1 10:57:20 2006
+++ libmysequoia/test-suite/php5/mysqli/skipif.inc Wed Feb 1 13:37:31 2006
@@ -2,9 +2,11 @@
if (!extension_loaded('mysqli')){
die('skip mysqli extension not available');
}
+
include "connect.inc";
-$driver = new mysqli_driver();
-if (!$driver->embedded && [EMAIL PROTECTED]($host, $user, $passwd, "", 3306)) {
- die('skip could not connect to MySQL');
+$mysqli = new mysqli($host, $user, $passwd, "");
+if (mysqli_connect_errno()){
+ die('skip could not connect to MySQL:' . mysqli_connect_error());
}
+$link->mysql_close();
?>
Index: libmysequoia/test-suite/php5/mysqli/skipifemb.inc
diff -u libmysequoia/test-suite/php5/mysqli/skipifemb.inc:1.1
libmysequoia/test-suite/php5/mysqli/skipifemb.inc:1.2
--- libmysequoia/test-suite/php5/mysqli/skipifemb.inc:1.1 Wed Feb 1
10:57:20 2006
+++ libmysequoia/test-suite/php5/mysqli/skipifemb.inc Wed Feb 1 13:37:31 2006
@@ -1,5 +1,2 @@
<?php
- $driver = new mysqli_driver();
- if ($driver->embedded)
- die("skip test doesn't run with embedded server");
?>
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
