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

[uwendel]

Author: uwendel
Date: 2007-08-29 19:47:59 +0200 (Wed, 29 Aug 2007)
New Revision: 963

Modified:
   trunk/tests/ext/mysqli/mysqli_debug_mysqlnd_control_string.phpt
Log:
'd' is meaningless with mysqlnd. Removing it. Now the test
has only control strings that are meaningful both for
mysqlnd and libmysql.



Modified: trunk/tests/ext/mysqli/mysqli_debug_mysqlnd_control_string.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_debug_mysqlnd_control_string.phpt	2007-08-29 17:06:07
UTC (rev 962)
+++ trunk/tests/ext/mysqli/mysqli_debug_mysqlnd_control_string.phpt	2007-08-29 17:47:59
UTC (rev 963)
@@ -1,5 +1,5 @@
 --TEST--
-mysqli_debug() - control string options supported by both mysqlnd and libmysql
+mysqli_debug() - all control string options supported by both mysqlnd and libmysql except
oOaA
 --SKIPIF--
 <?php
 require_once('skipif.inc');
@@ -49,13 +49,13 @@
 
 	$trace_file = sprintf('%s%s%s', sys_get_temp_dir(), DIRECTORY_SEPARATOR,
'mysqli_debug_phpt.trace');
 
-	$trace = try_control_string($link, ':d:t:O,' . $trace_file, $trace_file, 10);
-	if (!strstr($trace, 'SELECT * FROM test'))
+	$trace = try_control_string($link, 't:O,' . $trace_file, $trace_file, 10);
+	if (!strstr($trace, 'SELECT * FROM test') && !strstr($trace,
'mysql_real_query'))
 		printf("[015] SELECT query cannot be found in trace. Trace contents seems wrong.\n");
 
 	// T - gettimeofday() system call, system dependent format
 	// 16:57:03.350734 >mysql_real_query
-	$trace = try_control_string($link, ':d:t:O,' . $trace_file . ':T', $trace_file, 20);
+	$trace = try_control_string($link, 't:O,' . $trace_file . ':T', $trace_file, 20);
 	if (!preg_match('@^[012]{0,1}[0-9]{1}:[0-5]{0,1}[0-9]{1}:[0-5]{0,1}[0-9]{1}@ismU',
$trace))
 		printf("[025] Timestamp not found. One reason could be that the test is borked and does
not recognize the format of the gettimeofday() system call. Check manually (and fix the
test, if needed :-)). First characters from trace are '%s'\n", substr($trace, 0, 80));
 
@@ -64,28 +64,27 @@
 	if (false === ($pid = getmypid()))
 		$pid = "[\d]+";
 
-	$trace = try_control_string($link, ':d:t:O,' . $trace_file . ':i', $trace_file, 30);
+	$trace = try_control_string($link, 't:O,' . $trace_file . ':i', $trace_file, 30);
 	if (!preg_match("@^" . $pid . "*@ismU", $trace))
 		printf("[035] Process ID has not been found, first characters from trace are '%s'\n",
substr($trace, 0, 80));
 
 	// L - line numbers
-	$trace = try_control_string($link, ':d:t:O,' . $trace_file . ':L', $trace_file, 40);
+	$trace = try_control_string($link, 't:O,' . $trace_file . ':L', $trace_file, 40);
 	if (!preg_match("@^[\d]+@ismU", $trace))
 		printf("[045] Line numbers have not been found, first characters from trace are
'%s'\n", substr($trace, 0, 80));
 
 	// F - file name
-	$trace = try_control_string($link, ':d:t:O,' . $trace_file . ':F', $trace_file, 50);
+	$trace = try_control_string($link, 't:O,' . $trace_file . ':F', $trace_file, 50);
 	// hopefully we'll never see a file name that's not covered by this regular
expression...
 	if (!preg_match("@^\s*[/\w\\\\d]+\.[ch]@ismU", $trace))
 		printf("[055] File names seem to be missing, first characters from trace are '%s'\n",
substr($trace, 0, 80));
 
 	// -n - print function nesting depth
-	$trace = try_control_string($link, ':d:t:O,' . $trace_file . ':n', $trace_file, 60);
+	$trace = try_control_string($link, 't:O,' . $trace_file . ':n', $trace_file, 60);
 	if (!preg_match("@^\d+:@ismU", $trace))
 		printf("[065] Nesting level seem to be missing, first characters from trace are
'%s'\n", substr($trace, 0, 80));
 
 
-
 	mysqli_close($link);
 	print "done";
 	if ($IS_MYSQLND)