From d21b028281bedc0bccdc82dd2f7833db7892e147 Mon Sep 17 00:00:00 2001
From: Christopher Jones <sixd@php.net>
Date: Wed, 10 Nov 2010 18:46:05 +0000
Subject: [PATCH] Improve test portability

---
 ext/oci8/tests/bind_char_1.phpt | 11 +++++--
 ext/oci8/tests/bind_char_2.phpt | 11 +++++--
 ext/oci8/tests/bind_char_3.phpt | 11 +++++--
 ext/oci8/tests/bind_char_4.phpt | 11 +++++--
 ext/oci8/tests/bug27303_1.phpt  | 11 +++++--
 ext/oci8/tests/bug27303_2.phpt  | 11 +++++--
 ext/oci8/tests/bug27303_4.phpt  | 11 +++++--
 ext/oci8/tests/debug.phpt       | 56 +++------------------------------
 8 files changed, 61 insertions(+), 72 deletions(-)

diff --git a/ext/oci8/tests/bind_char_1.phpt b/ext/oci8/tests/bind_char_1.phpt
index 71cccbfc50..24ab1fc825 100644
--- a/ext/oci8/tests/bind_char_1.phpt
+++ b/ext/oci8/tests/bind_char_1.phpt
@@ -8,14 +8,19 @@ $sv = oci_server_version($c);
 $sv = preg_match('/Release 1[01]\.2\./', $sv, $matches);
 if ($sv !== 1) {
 	die ("skip expected output only valid when using Oracle 10gR2 or 11gR2 databases");
+} else {
+    ob_start();
+    phpinfo(INFO_MODULES);
+    $phpinfo = ob_get_clean();
+    $iv = preg_match('/Oracle .*Version => 1[1]\./', $phpinfo);
+    if ($iv != 1) {
+        die ("skip test expected to work only with Oracle 11g or greater version of client");
+    }
 }
 ?>
 --FILE--
 <?php
 
-// Note: expected output is valid for 32bit clients to 32bit 10gR2 XE or 11.2.0.1 64bit DBs.
-// It will diff on the undefined cases with a 32bit 11.2.0.1 DB
-
 require(dirname(__FILE__).'/connect.inc');
 
 // Initialization
diff --git a/ext/oci8/tests/bind_char_2.phpt b/ext/oci8/tests/bind_char_2.phpt
index 6c7dbafcc5..fa2e547dbe 100644
--- a/ext/oci8/tests/bind_char_2.phpt
+++ b/ext/oci8/tests/bind_char_2.phpt
@@ -8,14 +8,19 @@ $sv = oci_server_version($c);
 $sv = preg_match('/Release 1[01]\.2\./', $sv, $matches);
 if ($sv !== 1) {
 	die ("skip expected output only valid when using Oracle 10gR2 or 11gR2 databases");
+} else {
+    ob_start();
+    phpinfo(INFO_MODULES);
+    $phpinfo = ob_get_clean();
+    $iv = preg_match('/Oracle .*Version => 1[1]\./', $phpinfo);
+    if ($iv != 1) {
+        die ("skip test expected to work only with Oracle 11g or greater version of client");
+    }
 }
 ?>
 --FILE--
 <?php
 
-// Note: expected output is valid for 32bit clients to 32bit 10gR2 XE or 11.2.0.1 64bit DBs.
-// It will diff on the undefined cases with a 32bit 11.2.0.1 DB
-
 require(dirname(__FILE__).'/connect.inc');
 
 // Initialization
diff --git a/ext/oci8/tests/bind_char_3.phpt b/ext/oci8/tests/bind_char_3.phpt
index 8d4e95f6bf..052981acea 100644
--- a/ext/oci8/tests/bind_char_3.phpt
+++ b/ext/oci8/tests/bind_char_3.phpt
@@ -8,14 +8,19 @@ $sv = oci_server_version($c);
 $sv = preg_match('/Release 1[01]\.2\./', $sv, $matches);
 if ($sv !== 1) {
 	die ("skip expected output only valid when using Oracle 10gR2 11gR2 databases");
+} else {
+    ob_start();
+    phpinfo(INFO_MODULES);
+    $phpinfo = ob_get_clean();
+    $iv = preg_match('/Oracle .*Version => 1[1]\./', $phpinfo);
+    if ($iv != 1) {
+        die ("skip test expected to work only with Oracle 11g or greater version of client");
+    }
 }
 ?>
 --FILE--
 <?php
 
-// Note: expected output is valid for 32bit clients to 32bit 10gR2 XE or 11.2.0.1 64bit DBs.
-// It will diff on the undefined cases with a 32bit 11.2.0.1 DB
-
 require(dirname(__FILE__).'/connect.inc');
 
 // Initialization
diff --git a/ext/oci8/tests/bind_char_4.phpt b/ext/oci8/tests/bind_char_4.phpt
index 40221b266f..fd38d902cc 100644
--- a/ext/oci8/tests/bind_char_4.phpt
+++ b/ext/oci8/tests/bind_char_4.phpt
@@ -8,14 +8,19 @@ $sv = oci_server_version($c);
 $sv = preg_match('/Release 1[01]\.2\./', $sv, $matches);
 if ($sv !== 1) {
 	die ("skip expected output only valid when using Oracle 10gR2 or 11gR2 databases");
+} else {
+    ob_start();
+    phpinfo(INFO_MODULES);
+    $phpinfo = ob_get_clean();
+    $iv = preg_match('/Oracle .*Version => 1[1]\./', $phpinfo);
+    if ($iv != 1) {
+        die ("skip test expected to work only with Oracle 11g or greater version of client");
+    }
 }
 ?>
 --FILE--
 <?php
 
-// Note: expected output is valid for 32bit clients to 32bit 10gR2 XE or 11.2.0.1 64bit DBs.
-// It will diff on the undefined cases with a 32bit 11.2.0.1 DB
-
 // Same test as bind_char_3 but the PL/SQL function uses VARCHAR2 instead of CHAR
 
 require(dirname(__FILE__).'/connect.inc');
diff --git a/ext/oci8/tests/bug27303_1.phpt b/ext/oci8/tests/bug27303_1.phpt
index 82c2d6f506..6d491966a7 100644
--- a/ext/oci8/tests/bug27303_1.phpt
+++ b/ext/oci8/tests/bug27303_1.phpt
@@ -8,14 +8,19 @@ $sv = oci_server_version($c);
 $sv = preg_match('/Release 1[01]\.2\./', $sv, $matches);
 if ($sv !== 1) {
 	die ("skip expected output only valid when using Oracle 19gR2 or 11gR2 databases");
+} else {
+    ob_start();
+    phpinfo(INFO_MODULES);
+    $phpinfo = ob_get_clean();
+    $iv = preg_match('/Oracle .*Version => 1[1]\./', $phpinfo);
+    if ($iv != 1) {
+        die ("skip test expected to work only with Oracle 11g or greater version of client");
+    }
 }
 ?>
 --FILE--
 <?php
 
-// Note: expected output is valid for 32bit clients to 32bit 10gR2 XE or 11.2.0.1 64bit DBs.
-// It will diff with a 32bit 11.2.0.1 DB
-
 require dirname(__FILE__).'/connect.inc';
 	
 $create_st = array();
diff --git a/ext/oci8/tests/bug27303_2.phpt b/ext/oci8/tests/bug27303_2.phpt
index 44b9ce6c61..3d0c087703 100644
--- a/ext/oci8/tests/bug27303_2.phpt
+++ b/ext/oci8/tests/bug27303_2.phpt
@@ -8,14 +8,19 @@ $sv = oci_server_version($c);
 $sv = preg_match('/Release 1[01]\.2\./', $sv, $matches);
 if ($sv !== 1) {
 	die ("skip expected output only valid when using Oracle 10gR2 or 11gR2 database");
+} else {
+    ob_start();
+    phpinfo(INFO_MODULES);
+    $phpinfo = ob_get_clean();
+    $iv = preg_match('/Oracle .*Version => 1[1]\./', $phpinfo);
+    if ($iv != 1) {
+        die ("skip test expected to work only with Oracle 11g or greater version of client");
+    }
 }
 ?>
 --FILE--
 <?php
 
-// Note: expected output is valid for 32bit clients to 32bit 10gR2 XE or 11.2.0.1 64bit DBs.
-// It will diff with a 32bit 11.2.0.1 DB
-
 require dirname(__FILE__).'/connect.inc';
 	
 $create_st = array();
diff --git a/ext/oci8/tests/bug27303_4.phpt b/ext/oci8/tests/bug27303_4.phpt
index 3c35c65b77..20dec54dac 100644
--- a/ext/oci8/tests/bug27303_4.phpt
+++ b/ext/oci8/tests/bug27303_4.phpt
@@ -8,14 +8,19 @@ $sv = oci_server_version($c);
 $sv = preg_match('/Release 1[01]\.2\./', $sv, $matches);
 if ($sv !== 1) {
 	die ("skip expected output only valid when using Oracle 10gR2 or 11gR2 databases");
+} else {
+    ob_start();
+    phpinfo(INFO_MODULES);
+    $phpinfo = ob_get_clean();
+    $iv = preg_match('/Oracle .*Version => 1[1]\./', $phpinfo);
+    if ($iv != 1) {
+        die ("skip test expected to work only with Oracle 11g or greater version of client");
+    }
 }
 ?>
 --FILE--
 <?php
 
-// Note: expected output is valid for 32bit clients to 32bit 10gR2 XE or 11.2.0.1 64bit DBs.
-// It will diff with a 32bit 11.2.0.1 DB
-
 require dirname(__FILE__).'/connect.inc';
 	
 $create_st = array();
diff --git a/ext/oci8/tests/debug.phpt b/ext/oci8/tests/debug.phpt
index 49e3d4cfd1..fe96e6e87e 100644
--- a/ext/oci8/tests/debug.phpt
+++ b/ext/oci8/tests/debug.phpt
@@ -1,16 +1,7 @@
 --TEST--
 oci_internal_debug()
 --SKIPIF--
-<?php 
-if (!extension_loaded('oci8')) die("skip no oci8 extension"); 
-ob_start();
-phpinfo(INFO_MODULES);
-$phpinfo = ob_get_clean();
-$iv = preg_match('/Oracle .*Version => (11\.2|12\.)/', $phpinfo);
-if ($iv !== 1) {
-   	die ("skip expected output only valid when using Oracle 11gR2+ client libraries");
-}
-?>
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
 --FILE--
 <?php
 
@@ -27,45 +18,8 @@ else {
 	
 echo "Done\n";
 
+oci_internal_debug(false);
+
 ?>
---EXPECTF--
-OCI8 DEBUG: OCINlsEnvironmentVariableGet at (%s:%d) 
-OCI8 DEBUG L1: Got NO cached connection at (%s:%d) 
-OCI8 DEBUG: OCIEnvNlsCreate at (%s:%d) 
-OCI8 DEBUG: OCIHandleAlloc at (%s:%d) 
-OCI8 DEBUG: OCIHandleAlloc at (%s:%d) 
-OCI8 DEBUG: OCIHandleAlloc at (%s:%d) 
-OCI8 DEBUG: OCIAttrSet at (%s:%d) 
-OCI8 DEBUG: OCIAttrSet at (%s:%d) 
-OCI8 DEBUG: OCISessionPoolCreate at (%s:%d) 
-OCI8 DEBUG: OCIAttrSet at (%s:%d) 
-OCI8 DEBUG: OCIHandleFree at (%s:%d) 
-OCI8 DEBUG L1: create_spool: (%s:%d) 
-OCI8 DEBUG L1: using shared pool: (%s:%d) 
-OCI8 DEBUG: OCIHandleAlloc at (%s:%d) 
-OCI8 DEBUG: OCIHandleAlloc at (%s:%d) 
-OCI8 DEBUG: OCIAttrSet at (%s:%d) 
-OCI8 DEBUG: OCIAttrSet at (%s:%d) 
-OCI8 DEBUG: OCIAttrGet at (%s:%d) 
-OCI8 DEBUG: OCIAttrGet at (%s:%d) 
-OCI8 DEBUG L1: (numopen=0)(numbusy=0) at (%s:%d) 
-OCI8 DEBUG: OCISessionGet at (%s:%d) 
-OCI8 DEBUG: OCIAttrGet at (%s:%d) 
-OCI8 DEBUG: OCIAttrGet at (%s:%d) 
-OCI8 DEBUG: OCIContextGetValue at (%s:%d) 
-OCI8 DEBUG: OCIContextGetValue at (%s:%d) 
-OCI8 DEBUG: OCIMemoryAlloc at (%s:%d) 
-OCI8 DEBUG: OCIContextSetValue at (%s:%d) 
-OCI8 DEBUG: OCIAttrSet at (%s:%d) 
-OCI8 DEBUG L1: New Non-Persistent Connection address: (%s) at (%s:%d) 
-OCI8 DEBUG L1: num_persistent=(%s:%d) 
-OCI8 DEBUG: OCISessionRelease at (%s:%d) 
-OCI8 DEBUG: OCIHandleFree at (%s:%d) 
-OCI8 DEBUG: OCIHandleFree at (%s:%d) 
-Done
-OCI8 DEBUG: OCISessionPoolDestroy at (%s:%d) 
-OCI8 DEBUG: OCIHandleFree at (%s:%d) 
-OCI8 DEBUG: OCIHandleFree at (%s:%d) 
-OCI8 DEBUG: OCIHandleFree at (%s:%d) 
-OCI8 DEBUG: OCIHandleFree at (%s:%d) 
-OCI8 DEBUG: OCIHandleFree at (%s:%d)
+--EXPECTREGEX--
+^OCI8 DEBUG: .*Done$
-- 
2.40.0