sixd                                     Sat, 13 Aug 2011 00:43:34 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=314857

Log:
More test portability fixes mostly for gcov.php.net

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_1.phpt
    U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_2.phpt
    U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_3.phpt
    U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_4.phpt
    U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_1.phpt
    U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_2.phpt
    U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_4.phpt
    U   php/php-src/branches/PHP_5_3/ext/oci8/tests/lob_029.phpt
    U   php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194.phpt
    U   php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob.phpt
    U   php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob_64.phpt
    U   php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_1.phpt
    U   php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_2.phpt
    U   php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_3.phpt
    U   php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_4.phpt
    U   php/php-src/branches/PHP_5_4/ext/oci8/tests/bug27303_1.phpt
    U   php/php-src/branches/PHP_5_4/ext/oci8/tests/bug27303_2.phpt
    U   php/php-src/branches/PHP_5_4/ext/oci8/tests/bug27303_4.phpt
    U   php/php-src/branches/PHP_5_4/ext/oci8/tests/lob_029.phpt
    U   php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194.phpt
    U   php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob.phpt
    U   php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob_64.phpt
    U   php/php-src/trunk/ext/oci8/tests/bind_char_1.phpt
    U   php/php-src/trunk/ext/oci8/tests/bind_char_2.phpt
    U   php/php-src/trunk/ext/oci8/tests/bind_char_3.phpt
    U   php/php-src/trunk/ext/oci8/tests/bind_char_4.phpt
    U   php/php-src/trunk/ext/oci8/tests/bug27303_1.phpt
    U   php/php-src/trunk/ext/oci8/tests/bug27303_2.phpt
    U   php/php-src/trunk/ext/oci8/tests/bug27303_4.phpt
    U   php/php-src/trunk/ext/oci8/tests/lob_029.phpt
    U   php/php-src/trunk/ext/oci8/tests/pecl_bug10194.phpt
    U   php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob.phpt
    U   php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob_64.phpt

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_1.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_1.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_2.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_2.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_3.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_3.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_4.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_4.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_4.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_1.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_1.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     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) "197"
 string(3) "198"
 string(3) "199"
-Done
\ No newline at end of file
+Done

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_2.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_2.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     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) "197"
 string(3) "198"
 string(3) "199"
-Done
\ No newline at end of file
+Done

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_4.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_4.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_4.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/lob_029.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/lob_029.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/lob_029.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -11,13 +11,14 @@
     // 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";

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -4,6 +4,7 @@
 <?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

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -5,6 +5,7 @@
 $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

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob_64.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob_64.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob_64.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -5,6 +5,7 @@
 $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

Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_1.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_1.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_2.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_2.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_3.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_3.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_4.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_4.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_char_4.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bug27303_1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/bug27303_1.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bug27303_1.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     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) "197"
 string(3) "198"
 string(3) "199"
-Done
\ No newline at end of file
+Done

Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bug27303_2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/bug27303_2.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bug27303_2.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     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) "197"
 string(3) "198"
 string(3) "199"
-Done
\ No newline at end of file
+Done

Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bug27303_4.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/bug27303_4.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bug27303_4.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/lob_029.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/lob_029.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/lob_029.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -11,13 +11,14 @@
     // 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";

Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -4,6 +4,7 @@
 <?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

Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -5,6 +5,7 @@
 $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

Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob_64.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob_64.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob_64.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -5,6 +5,7 @@
 $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

Modified: php/php-src/trunk/ext/oci8/tests/bind_char_1.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/bind_char_1.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/trunk/ext/oci8/tests/bind_char_1.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/trunk/ext/oci8/tests/bind_char_2.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/bind_char_2.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/trunk/ext/oci8/tests/bind_char_2.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/trunk/ext/oci8/tests/bind_char_3.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/bind_char_3.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/trunk/ext/oci8/tests/bind_char_3.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/trunk/ext/oci8/tests/bind_char_4.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/bind_char_4.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/trunk/ext/oci8/tests/bind_char_4.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/trunk/ext/oci8/tests/bug27303_1.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/bug27303_1.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/trunk/ext/oci8/tests/bug27303_1.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     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) "197"
 string(3) "198"
 string(3) "199"
-Done
\ No newline at end of file
+Done

Modified: php/php-src/trunk/ext/oci8/tests/bug27303_2.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/bug27303_2.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/trunk/ext/oci8/tests/bug27303_2.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     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) "197"
 string(3) "198"
 string(3) "199"
-Done
\ No newline at end of file
+Done

Modified: php/php-src/trunk/ext/oci8/tests/bug27303_4.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/bug27303_4.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/trunk/ext/oci8/tests/bug27303_4.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -10,6 +10,8 @@
     die("skip test expected to work only with Oracle 11g or greater version of client");
 }
 ?>
+--ENV--
+NLS_LANG=
 --FILE--
 <?php


Modified: php/php-src/trunk/ext/oci8/tests/lob_029.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/lob_029.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/trunk/ext/oci8/tests/lob_029.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -11,13 +11,14 @@
     // 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";

Modified: php/php-src/trunk/ext/oci8/tests/pecl_bug10194.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/pecl_bug10194.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/trunk/ext/oci8/tests/pecl_bug10194.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -4,6 +4,7 @@
 <?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

Modified: php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -5,6 +5,7 @@
 $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

Modified: php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob_64.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob_64.phpt	2011-08-13 00:00:40 UTC (rev 314856)
+++ php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob_64.phpt	2011-08-13 00:43:34 UTC (rev 314857)
@@ -5,6 +5,7 @@
 $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
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to