From b53451b99e27646560c91c1c4ce6e0259bd2ca22 Mon Sep 17 00:00:00 2001
From: Christopher Jones <sixd@php.net>
Date: Sat, 13 Aug 2011 00:43:34 +0000
Subject: [PATCH] More test portability fixes mostly for gcov.php.net

---
 ext/oci8/tests/bind_char_1.phpt           | 2 ++
 ext/oci8/tests/bind_char_2.phpt           | 2 ++
 ext/oci8/tests/bind_char_3.phpt           | 2 ++
 ext/oci8/tests/bind_char_4.phpt           | 2 ++
 ext/oci8/tests/bug27303_1.phpt            | 4 +++-
 ext/oci8/tests/bug27303_2.phpt            | 4 +++-
 ext/oci8/tests/bug27303_4.phpt            | 2 ++
 ext/oci8/tests/lob_029.phpt               | 3 ++-
 ext/oci8/tests/pecl_bug10194.phpt         | 1 +
 ext/oci8/tests/pecl_bug10194_blob.phpt    | 1 +
 ext/oci8/tests/pecl_bug10194_blob_64.phpt | 1 +
 11 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ext/oci8/tests/bind_char_1.phpt b/ext/oci8/tests/bind_char_1.phpt
index a5b059ed1d..a668294d4d 100644
--- a/ext/oci8/tests/bind_char_1.phpt
+++ b/ext/oci8/tests/bind_char_1.phpt
@@ -10,6 +10,8 @@ if (preg_match('/Release 1[01]\.2\./', oci_server_version($c), $matches) !== 1)
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bind_char_2.phpt b/ext/oci8/tests/bind_char_2.phpt
index da34230dc7..53785e0665 100644
--- a/ext/oci8/tests/bind_char_2.phpt
+++ b/ext/oci8/tests/bind_char_2.phpt
@@ -10,6 +10,8 @@ if (preg_match('/Release 1[01]\.2\./', oci_server_version($c), $matches) !== 1)
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bind_char_3.phpt b/ext/oci8/tests/bind_char_3.phpt
index 8ae5096273..a459f616b2 100644
--- a/ext/oci8/tests/bind_char_3.phpt
+++ b/ext/oci8/tests/bind_char_3.phpt
@@ -10,6 +10,8 @@ if (preg_match('/Release 1[01]\.2\./', oci_server_version($c), $matches) !== 1)
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bind_char_4.phpt b/ext/oci8/tests/bind_char_4.phpt
index 30e4c3be60..34d703c521 100644
--- a/ext/oci8/tests/bind_char_4.phpt
+++ b/ext/oci8/tests/bind_char_4.phpt
@@ -10,6 +10,8 @@ if (preg_match('/Release 1[01]\.2\./', oci_server_version($c), $matches) !== 1)
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bug27303_1.phpt b/ext/oci8/tests/bug27303_1.phpt
index c4550244aa..028f5b7936 100644
--- a/ext/oci8/tests/bug27303_1.phpt
+++ b/ext/oci8/tests/bug27303_1.phpt
@@ -10,6 +10,8 @@ if (preg_match('/Release 1[01]\.2\./', oci_server_version($c), $matches) !== 1)
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php
 
@@ -251,4 +253,4 @@ string(3) "196"
 string(3) "197"
 string(3) "198"
 string(3) "199"
-Done
\ No newline at end of file
+Done
diff --git a/ext/oci8/tests/bug27303_2.phpt b/ext/oci8/tests/bug27303_2.phpt
index d7df23ba24..e7564ac213 100644
--- a/ext/oci8/tests/bug27303_2.phpt
+++ b/ext/oci8/tests/bug27303_2.phpt
@@ -10,6 +10,8 @@ if (preg_match('/Release 1[01]\.2\./', oci_server_version($c), $matches) !== 1)
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php
 
@@ -253,4 +255,4 @@ string(3) "196"
 string(3) "197"
 string(3) "198"
 string(3) "199"
-Done
\ No newline at end of file
+Done
diff --git a/ext/oci8/tests/bug27303_4.phpt b/ext/oci8/tests/bug27303_4.phpt
index 86b1a8ba5e..0dcfed9133 100644
--- a/ext/oci8/tests/bug27303_4.phpt
+++ b/ext/oci8/tests/bug27303_4.phpt
@@ -10,6 +10,8 @@ if (preg_match('/Release 1[01]\.2\./', oci_server_version($c), $matches) !== 1)
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/lob_029.phpt b/ext/oci8/tests/lob_029.phpt
index 56919e2ba6..85b230e900 100644
--- a/ext/oci8/tests/lob_029.phpt
+++ b/ext/oci8/tests/lob_029.phpt
@@ -11,13 +11,14 @@ if (preg_match('/Compile-time ORACLE_HOME/', $phpinfo) !== 1) {
     // Assume building PHP with an ORACLE_HOME means the tested DB is on the same machine as PHP
     die("skip this test won't work with remote Oracle");
 }
+if (substr(PHP_OS, 0, 3) == 'WIN') die("skip Test script not ported to Windows");
 ?>
 --FILE--
 <?php
 
 require(dirname(__FILE__).'/connect.inc');
 
-$realdirname = dirname(__FILE__);
+$realdirname = "/tmp";  // Use /tmp because a local dir can give ORA-22288 depending on perms
 $realfilename1 = "oci8bfiletest1.txt";
 $fullname1 = $realdirname."/".$realfilename1;
 $realfilename2 = "oci8bfiletest2.txt";
diff --git a/ext/oci8/tests/pecl_bug10194.phpt b/ext/oci8/tests/pecl_bug10194.phpt
index 4bffc7644d..6a9044b1a0 100644
--- a/ext/oci8/tests/pecl_bug10194.phpt
+++ b/ext/oci8/tests/pecl_bug10194.phpt
@@ -4,6 +4,7 @@ PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
 require(dirname(__FILE__).'/skipif.inc');
+if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE');
 ?> 
 --INI--
 memory_limit=10M
diff --git a/ext/oci8/tests/pecl_bug10194_blob.phpt b/ext/oci8/tests/pecl_bug10194_blob.phpt
index 38f6d9ed2f..75632ce473 100644
--- a/ext/oci8/tests/pecl_bug10194_blob.phpt
+++ b/ext/oci8/tests/pecl_bug10194_blob.phpt
@@ -5,6 +5,7 @@ PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
 require(dirname(__FILE__).'/skipif.inc');
 if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platforms only");
+if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE');
 ?> 
 --INI--
 memory_limit=3M
diff --git a/ext/oci8/tests/pecl_bug10194_blob_64.phpt b/ext/oci8/tests/pecl_bug10194_blob_64.phpt
index 9ffc03d320..da7ec592fc 100644
--- a/ext/oci8/tests/pecl_bug10194_blob_64.phpt
+++ b/ext/oci8/tests/pecl_bug10194_blob_64.phpt
@@ -5,6 +5,7 @@ PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on thes
 require(dirname(__FILE__).'/skipif.inc');
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only");
+if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE');
 ?>
 --INI--
 memory_limit=6M
-- 
2.40.0