From 06cc022740fcd48d1734409e564f58d8dc2cbce6 Mon Sep 17 00:00:00 2001
From: Christopher Jones <sixd@php.net>
Date: Fri, 2 Sep 2011 22:19:03 +0000
Subject: [PATCH] gcov test fixes

---
 ext/pdo/tests/bug_34630.phpt      | 2 --
 ext/pdo/tests/bug_43130.phpt      | 1 +
 ext/pdo/tests/bug_44861.phpt      | 4 +++-
 ext/pdo/tests/pdo_016.phpt        | 1 +
 ext/pdo/tests/pdo_016a.phpt       | 1 +
 ext/pdo_oci/tests/bug46274.phpt   | 2 ++
 ext/pdo_oci/tests/bug46274_2.phpt | 2 ++
 7 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ext/pdo/tests/bug_34630.phpt b/ext/pdo/tests/bug_34630.phpt
index 22ad2e820a..070217bafe 100644
--- a/ext/pdo/tests/bug_34630.phpt
+++ b/ext/pdo/tests/bug_34630.phpt
@@ -45,8 +45,6 @@ $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
 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]=>
diff --git a/ext/pdo/tests/bug_43130.phpt b/ext/pdo/tests/bug_43130.phpt
index bb40f894dd..a35138a07f 100644
--- a/ext/pdo/tests/bug_43130.phpt
+++ b/ext/pdo/tests/bug_43130.phpt
@@ -7,6 +7,7 @@ $dir = getenv('REDIR_TEST_DIR');
 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();
 ?>
diff --git a/ext/pdo/tests/bug_44861.phpt b/ext/pdo/tests/bug_44861.phpt
index 3612561ed6..cb8e657e9b 100644
--- a/ext/pdo/tests/bug_44861.phpt
+++ b/ext/pdo/tests/bug_44861.phpt
@@ -28,11 +28,13 @@ $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
 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);
diff --git a/ext/pdo/tests/pdo_016.phpt b/ext/pdo/tests/pdo_016.phpt
index f3aba13e0e..12c9517233 100644
--- a/ext/pdo/tests/pdo_016.phpt
+++ b/ext/pdo/tests/pdo_016.phpt
@@ -5,6 +5,7 @@ PDO Common: PDO::FETCH_BOUND
 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();
 ?>
diff --git a/ext/pdo/tests/pdo_016a.phpt b/ext/pdo/tests/pdo_016a.phpt
index 00b75aecad..72f4b4224f 100755
--- a/ext/pdo/tests/pdo_016a.phpt
+++ b/ext/pdo/tests/pdo_016a.phpt
@@ -6,6 +6,7 @@ if (!extension_loaded('pdo')) die('skip');
 $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--
diff --git a/ext/pdo_oci/tests/bug46274.phpt b/ext/pdo_oci/tests/bug46274.phpt
index 23ee8ee20f..77f2a01151 100644
--- a/ext/pdo_oci/tests/bug46274.phpt
+++ b/ext/pdo_oci/tests/bug46274.phpt
@@ -56,6 +56,8 @@ var_dump($res->fetch());
 $db->exec("DROP TABLE test_one_blob");
 
 ?>
+--XFAIL--
+Corrupts memory
 --EXPECTF--
 array(2) {
   ["blob1"]=>
diff --git a/ext/pdo_oci/tests/bug46274_2.phpt b/ext/pdo_oci/tests/bug46274_2.phpt
index cbadcef4f8..9e9225415f 100644
--- a/ext/pdo_oci/tests/bug46274_2.phpt
+++ b/ext/pdo_oci/tests/bug46274_2.phpt
@@ -60,6 +60,8 @@ fclose($row[0]);
 $db->exec("DROP TABLE test_one_blob");
 
 ?>
+--XFAIL--
+Corrupts memory
 --EXPECTF--
 array(2) {
   ["blob1"]=>
-- 
2.50.1