PHP mysqlnd svn commit: r1015 - trunk/tests/ext/mysqli

[uwendel]

Author: uwendel
Date: 2007-09-12 14:42:14 +0200 (Wed, 12 Sep 2007)
New Revision: 1015

Modified:
   trunk/tests/ext/mysqli/mysqli_autocommit.phpt
   trunk/tests/ext/mysqli/mysqli_autocommit_oo.phpt
Log:
Fixing SKIPIF. Broken skipif's are tricky to detect. You need
to do something like php test.phpt to see problems in them. 
run-tests.php tends to skip problems and ignore SKIPIF, if there
are issues.


Modified: trunk/tests/ext/mysqli/mysqli_autocommit.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_autocommit.phpt	2007-09-12 10:57:32 UTC (rev 1014)
+++ trunk/tests/ext/mysqli/mysqli_autocommit.phpt	2007-09-12 12:42:14 UTC (rev 1015)
@@ -2,28 +2,26 @@
 mysqli_autocommit()
 --SKIPIF--
 <?php
-	require_once('skipif.inc'); 
+	require_once('connect.inc');
+	require_once('skipif.inc');
 	require_once('skipifemb.inc');
 	require_once('skipifconnectfailure.inc');
 
 	if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-		printf("skip Cannot connect to the server using host=%s, user=%s, passwd=***,
dbname=%s, port=%s, socket=%s\n",
-			$host, $user, $db, $port, $socket);
-		exit(1);
+		die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***,
dbname=%s, port=%s, socket=%s\n",
+			$host, $user, $db, $port, $socket));
 	}
 
-	if (!$res = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'")) {
-		printf("skip Cannot fetch have_innodb variable\n");
-		exit(1);
+	if (!$result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'")) {
+		die("skip Cannot check for required InnoDB suppot");
 	}
+	if (!$row = mysqli_fetch_row($result))
+		die("skip Cannot check for required InnoDB suppot");
 
-	$row = mysqli_fetch_row($res);
-	mysqli_free_result($res);
+	mysqli_free_result($result);
 	mysqli_close($link);
-
 	if ($row[1] == "DISABLED" || $row[1] == "NO") {
-		printf ("skip Innodb support is not installed or enabled.");
-		exit(1);
+		die(sprintf ("skip innodb support is not installed or enabled."));
 	}
 ?>
 --FILE--

Modified: trunk/tests/ext/mysqli/mysqli_autocommit_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_autocommit_oo.phpt	2007-09-12 10:57:32 UTC (rev 1014)
+++ trunk/tests/ext/mysqli/mysqli_autocommit_oo.phpt	2007-09-12 12:42:14 UTC (rev 1015)
@@ -2,9 +2,10 @@
 mysqli->autocommit()
 --SKIPIF--
 <?php
-	require_once('skipif.inc'); 
+	require_once('skipif.inc');
 	require_once('skipifemb.inc');
 	require_once('skipifconnectfailure.inc');
+	require_once('connect.inc');
 
 	if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) {
 		printf("skip Cannot connect to the server using host=%s, user=%s, passwd=***,
dbname=%s, port=%s, socket=%s\n",