Fixed mysql tests parsing phpinfo()

diff --git a/ext/pdo_mysql/tests/mysql_pdo_test.inc b/ext/pdo_mysql/tests/mysql_pdo_test.inc
index 115aeadc5a658c36783c79a1663771c52772018f..7a97bb4630756c797fe5c7b8bccae2288fed18d5 100644 (file)
--- a/ext/pdo_mysql/tests/mysql_pdo_test.inc
+++ b/ext/pdo_mysql/tests/mysql_pdo_test.inc
@@ -162,8 +162,8 @@ class MySQLPDOTest extends PDOTest {
                        phpinfo();
                        $tmp = ob_get_contents();
                        ob_end_clean();
-                       $tmp = stristr($tmp, "PDO Driver for MySQL => enabled");
-                       return (bool)preg_match('/Client API version.*mysqlnd/', $tmp);
+                       return (preg_match('/PDO Driver for MySQL.*enabled/', $tmp) &&
+                               preg_match('/Client API version.*mysqlnd/', $tmp));
        }
 
        static function dropTestTable($db = NULL) {
@@ -174,4 +174,4 @@ class MySQLPDOTest extends PDOTest {
        }
 
 }
-?>
\ No newline at end of file
+?>

diff --git a/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt b/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt
index a570c1fd49b9c31912fd380fbf04983585ccc58b..9674e85f5e151317a19c145aed63966258814ff8 100644 (file)
--- a/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt
@@ -18,10 +18,9 @@ $db = MySQLPDOTest::factory();
        ob_end_clean();
 
        /*      PDO Driver for MySQL, client library version => 6.0.3-alpha     */
-       $expected = sprintf('Client API version => %s',
-               $db->getAttribute(PDO::ATTR_CLIENT_VERSION));
+       $reg = 'Client API version.*' . pcre_quote($db->getAttribute(PDO::ATTR_CLIENT_VERSION), '/');
 
-       if (false === stristr($tmp, $expected)) {
+       if (!preg_match("/$reg/", $tmp)) {
                printf("[001] Cannot find MySQL PDO driver line in phpinfo() output\n");
        }