sixd Fri, 02 Sep 2011 22:19:03 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=316060
Log: gcov test fixes Changed paths: U php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_34630.phpt U php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_43130.phpt U php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_44861.phpt U php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_016.phpt U php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_016a.phpt U php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/bug46274.phpt U php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/bug46274_2.phpt U php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_34630.phpt U php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_43130.phpt U php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_44861.phpt U php/php-src/branches/PHP_5_4/ext/pdo/tests/pdo_016.phpt U php/php-src/branches/PHP_5_4/ext/pdo/tests/pdo_016a.phpt U php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/bug46274.phpt U php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/bug46274_2.phpt U php/php-src/trunk/ext/pdo/tests/bug_34630.phpt U php/php-src/trunk/ext/pdo/tests/bug_43130.phpt U php/php-src/trunk/ext/pdo/tests/bug_44861.phpt U php/php-src/trunk/ext/pdo/tests/pdo_016.phpt U php/php-src/trunk/ext/pdo/tests/pdo_016a.phpt U php/php-src/trunk/ext/pdo_oci/tests/bug46274.phpt U php/php-src/trunk/ext/pdo_oci/tests/bug46274_2.phpt
Modified: php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_34630.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_34630.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_34630.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -45,8 +45,6 @@ var_dump($db->query("SELECT * from test")->fetchAll(PDO::FETCH_ASSOC)); ?> ---XFAIL-- -This bug might be still open on aix5.2-ppc64 and hpux11.23-ia64 --EXPECT-- array(1) { [0]=> Modified: php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_43130.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_43130.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_43130.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -7,6 +7,7 @@ if (false == $dir) die('skip no driver'); if (!strncasecmp(getenv('PDOTEST_DSN'), 'sqlite', strlen('sqlite'))) die('skip not relevant for sqlite driver'); if (!strncasecmp(getenv('PDOTEST_DSN'), 'pgsql', strlen('pgsql'))) die('skip not relevant for pgsql driver'); +if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))) die('skip not relevant for oci driver - Hyphen is not legal for bind names in Oracle DB'); require_once $dir . 'pdo_test.inc'; PDOTest::skip(); ?> Modified: php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_44861.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_44861.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_44861.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -28,11 +28,13 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'oci') { $from = 'FROM DUAL'; + $ob = '1'; } else { $from = ''; + $ob = 'r'; } -$query = "SELECT 'row1' AS r $from UNION SELECT 'row2' $from UNION SELECT 'row3' $from UNION SELECT 'row4' $from ORDER BY r"; +$query = "SELECT 'row1' AS r $from UNION SELECT 'row2' $from UNION SELECT 'row3' $from UNION SELECT 'row4' $from ORDER BY $ob"; $aParams = array(PDO::ATTR_CURSOR => PDO::CURSOR_SCROLL); $res = $db->prepare($query, $aParams); Modified: php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_016.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_016.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_016.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -5,6 +5,7 @@ if (!extension_loaded('pdo')) die('skip'); $dir = getenv('REDIR_TEST_DIR'); if (false == $dir) die('skip no driver'); +if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))) die('skip not relevant for oci driver - cannot reexecute after closing cursors without reparse'); require_once $dir . 'pdo_test.inc'; PDOTest::skip(); ?> Modified: php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_016a.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_016a.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/branches/PHP_5_3/ext/pdo/tests/pdo_016a.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -6,6 +6,7 @@ $dir = getenv('REDIR_TEST_DIR'); if (false == $dir) die('skip no driver'); require_once $dir . 'pdo_test.inc'; +if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))) die('skip not relevant for oci driver - cannot reexecute after closing cursors without reparse'); PDOTest::skip(); ?> --FILE-- Modified: php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/bug46274.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/bug46274.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/bug46274.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -56,6 +56,8 @@ $db->exec("DROP TABLE test_one_blob"); ?> +--XFAIL-- +Corrupts memory --EXPECTF-- array(2) { ["blob1"]=> Modified: php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/bug46274_2.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/bug46274_2.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/bug46274_2.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -60,6 +60,8 @@ $db->exec("DROP TABLE test_one_blob"); ?> +--XFAIL-- +Corrupts memory --EXPECTF-- array(2) { ["blob1"]=> Modified: php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_34630.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_34630.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_34630.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -45,8 +45,6 @@ var_dump($db->query("SELECT * from test")->fetchAll(PDO::FETCH_ASSOC)); ?> ---XFAIL-- -This bug might be still open on aix5.2-ppc64 and hpux11.23-ia64 --EXPECT-- array(1) { [0]=> Modified: php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_43130.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_43130.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_43130.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -7,6 +7,7 @@ if (false == $dir) die('skip no driver'); if (!strncasecmp(getenv('PDOTEST_DSN'), 'sqlite', strlen('sqlite'))) die('skip not relevant for sqlite driver'); if (!strncasecmp(getenv('PDOTEST_DSN'), 'pgsql', strlen('pgsql'))) die('skip not relevant for pgsql driver'); +if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))) die('skip not relevant for oci driver - Hyphen is not legal for bind names in Oracle DB'); require_once $dir . 'pdo_test.inc'; PDOTest::skip(); ?> Modified: php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_44861.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_44861.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_44861.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -28,11 +28,13 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'oci') { $from = 'FROM DUAL'; + $ob = '1'; } else { $from = ''; + $ob = 'r'; } -$query = "SELECT 'row1' AS r $from UNION SELECT 'row2' $from UNION SELECT 'row3' $from UNION SELECT 'row4' $from ORDER BY r"; +$query = "SELECT 'row1' AS r $from UNION SELECT 'row2' $from UNION SELECT 'row3' $from UNION SELECT 'row4' $from ORDER BY $ob"; $aParams = array(PDO::ATTR_CURSOR => PDO::CURSOR_SCROLL); $res = $db->prepare($query, $aParams); Modified: php/php-src/branches/PHP_5_4/ext/pdo/tests/pdo_016.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/pdo/tests/pdo_016.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/branches/PHP_5_4/ext/pdo/tests/pdo_016.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -5,6 +5,7 @@ if (!extension_loaded('pdo')) die('skip'); $dir = getenv('REDIR_TEST_DIR'); if (false == $dir) die('skip no driver'); +if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))) die('skip not relevant for oci driver - cannot reexecute after closing cursors without reparse'); require_once $dir . 'pdo_test.inc'; PDOTest::skip(); ?> Modified: php/php-src/branches/PHP_5_4/ext/pdo/tests/pdo_016a.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/pdo/tests/pdo_016a.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/branches/PHP_5_4/ext/pdo/tests/pdo_016a.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -6,6 +6,7 @@ $dir = getenv('REDIR_TEST_DIR'); if (false == $dir) die('skip no driver'); require_once $dir . 'pdo_test.inc'; +if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))) die('skip not relevant for oci driver - cannot reexecute after closing cursors without reparse'); PDOTest::skip(); ?> --FILE-- Modified: php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/bug46274.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/bug46274.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/bug46274.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -56,6 +56,8 @@ $db->exec("DROP TABLE test_one_blob"); ?> +--XFAIL-- +Corrupts memory --EXPECTF-- array(2) { ["blob1"]=> Modified: php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/bug46274_2.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/bug46274_2.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/bug46274_2.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -60,6 +60,8 @@ $db->exec("DROP TABLE test_one_blob"); ?> +--XFAIL-- +Corrupts memory --EXPECTF-- array(2) { ["blob1"]=> Modified: php/php-src/trunk/ext/pdo/tests/bug_34630.phpt =================================================================== --- php/php-src/trunk/ext/pdo/tests/bug_34630.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/trunk/ext/pdo/tests/bug_34630.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -45,8 +45,6 @@ var_dump($db->query("SELECT * from test")->fetchAll(PDO::FETCH_ASSOC)); ?> ---XFAIL-- -This bug might be still open on aix5.2-ppc64 and hpux11.23-ia64 --EXPECT-- array(1) { [0]=> Modified: php/php-src/trunk/ext/pdo/tests/bug_43130.phpt =================================================================== --- php/php-src/trunk/ext/pdo/tests/bug_43130.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/trunk/ext/pdo/tests/bug_43130.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -7,6 +7,7 @@ if (false == $dir) die('skip no driver'); if (!strncasecmp(getenv('PDOTEST_DSN'), 'sqlite', strlen('sqlite'))) die('skip not relevant for sqlite driver'); if (!strncasecmp(getenv('PDOTEST_DSN'), 'pgsql', strlen('pgsql'))) die('skip not relevant for pgsql driver'); +if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))) die('skip not relevant for oci driver - Hyphen is not legal for bind names in Oracle DB'); require_once $dir . 'pdo_test.inc'; PDOTest::skip(); ?> Modified: php/php-src/trunk/ext/pdo/tests/bug_44861.phpt =================================================================== --- php/php-src/trunk/ext/pdo/tests/bug_44861.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/trunk/ext/pdo/tests/bug_44861.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -28,11 +28,13 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'oci') { $from = 'FROM DUAL'; + $ob = '1'; } else { $from = ''; + $ob = 'r'; } -$query = "SELECT 'row1' AS r $from UNION SELECT 'row2' $from UNION SELECT 'row3' $from UNION SELECT 'row4' $from ORDER BY r"; +$query = "SELECT 'row1' AS r $from UNION SELECT 'row2' $from UNION SELECT 'row3' $from UNION SELECT 'row4' $from ORDER BY $ob"; $aParams = array(PDO::ATTR_CURSOR => PDO::CURSOR_SCROLL); $res = $db->prepare($query, $aParams); Modified: php/php-src/trunk/ext/pdo/tests/pdo_016.phpt =================================================================== --- php/php-src/trunk/ext/pdo/tests/pdo_016.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/trunk/ext/pdo/tests/pdo_016.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -5,6 +5,7 @@ if (!extension_loaded('pdo')) die('skip'); $dir = getenv('REDIR_TEST_DIR'); if (false == $dir) die('skip no driver'); +if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))) die('skip not relevant for oci driver - cannot reexecute after closing cursors without reparse'); require_once $dir . 'pdo_test.inc'; PDOTest::skip(); ?> Modified: php/php-src/trunk/ext/pdo/tests/pdo_016a.phpt =================================================================== --- php/php-src/trunk/ext/pdo/tests/pdo_016a.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/trunk/ext/pdo/tests/pdo_016a.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -6,6 +6,7 @@ $dir = getenv('REDIR_TEST_DIR'); if (false == $dir) die('skip no driver'); require_once $dir . 'pdo_test.inc'; +if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))) die('skip not relevant for oci driver - cannot reexecute after closing cursors without reparse'); PDOTest::skip(); ?> --FILE-- Modified: php/php-src/trunk/ext/pdo_oci/tests/bug46274.phpt =================================================================== --- php/php-src/trunk/ext/pdo_oci/tests/bug46274.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/trunk/ext/pdo_oci/tests/bug46274.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -56,6 +56,8 @@ $db->exec("DROP TABLE test_one_blob"); ?> +--XFAIL-- +Corrupts memory --EXPECTF-- array(2) { ["blob1"]=> Modified: php/php-src/trunk/ext/pdo_oci/tests/bug46274_2.phpt =================================================================== --- php/php-src/trunk/ext/pdo_oci/tests/bug46274_2.phpt 2011-09-02 20:46:05 UTC (rev 316059) +++ php/php-src/trunk/ext/pdo_oci/tests/bug46274_2.phpt 2011-09-02 22:19:03 UTC (rev 316060) @@ -60,6 +60,8 @@ $db->exec("DROP TABLE test_one_blob"); ?> +--XFAIL-- +Corrupts memory --EXPECTF-- array(2) { ["blob1"]=>
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php