More test portability fixes mostly for gcov.php.net

diff --git a/ext/oci8/tests/bind_char_1.phpt b/ext/oci8/tests/bind_char_1.phpt
index a5b059ed1de4361ead9d1548c14f8bff3c63e8e1..a668294d4dfe76dbfefdfbc9b0918b1e78df6c8d 100644 (file)
--- 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 da34230dc77e4675d5e836f795cf62e4256ecc0e..53785e066598e9e3b135fa4c006de3e20fac2ecb 100644 (file)
--- 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 8ae5096273a4df2d0bdb1dcf44773fefb0cb8f75..a459f616b2a1d0954a6b3a56e587f5e395b08502 100644 (file)
--- 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 30e4c3be608e5b3a6bc081b803f1725804ae9879..34d703c5210c15d27a3cc479ba598f506a19e94e 100644 (file)
--- 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 c4550244aa1a2b4fdabbd34a867d3121e338b41f..028f5b79362559278774407bd477ff8a25669943 100644 (file)
--- 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 d7df23ba24ab99bbcf88037ea3efceaabf99f891..e7564ac213e0aca5fbda8d20f16d3467334a4946 100644 (file)
--- 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 86b1a8ba5edea7470fa5f0888bc82ee06412417e..0dcfed9133ab61842d8ffa290c61fbace1529759 100644 (file)
--- 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 56919e2ba644ecff17bfc266de225c7d858fec0c..85b230e9000cc588fc64f4ed2251fe2bf988c1c1 100644 (file)
--- 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 4bffc7644d4261d0e7b0dc70faff907634743334..6a9044b1a0ddfce1107bec10440cb6934540695c 100644 (file)
--- 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 38f6d9ed2f7c71bd2b3590e81b439ea305e48d8c..75632ce47334d6f85ea4fd5b246386f2880c3b6a 100644 (file)
--- 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 9ffc03d3203762202085b7cb3f1f13c7aa3fe583..da7ec592fc63c24ef07a60b16005954fa49ad796 100644 (file)
--- 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