sixd                                     Thu, 08 Sep 2011 20:13:32 +0000

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

Log:
Update SKIPIFs for test portability

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_36798.phpt
    U   php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
    U   php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
    U   php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_36798.phpt
    U   php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
    U   php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
    U   php/php-src/trunk/ext/pdo/tests/bug_36798.phpt
    U   php/php-src/trunk/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
    U   php/php-src/trunk/ext/pdo_oci/tests/pdo_oci_stream_1.phpt

Modified: php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_36798.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_36798.phpt   2011-09-08 
19:21:01 UTC (rev 316426)
+++ php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_36798.phpt   2011-09-08 
20:13:32 UTC (rev 316427)
@@ -7,6 +7,12 @@
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))){
+    if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) 
die('skip expected output valid for Oracle with WE8MSWIN1252 character set');
+
+}
+
 ?>
 --FILE--
 <?php

Modified: php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_fread_1.phpt 
2011-09-08 19:21:01 UTC (rev 316426)
+++ php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_fread_1.phpt 
2011-09-08 20:13:32 UTC (rev 316427)
@@ -4,6 +4,7 @@
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not 
loaded');
 require(dirname(__FILE__).'/../../pdo/tests/pdo_test.inc');
+if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) 
die('skip expected output valid for WE8MSWIN1252 character set');
 PDOTest::skip();
 ?>
 --FILE--

Modified: php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_stream_1.phpt        
2011-09-08 19:21:01 UTC (rev 316426)
+++ php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_stream_1.phpt        
2011-09-08 20:13:32 UTC (rev 316427)
@@ -4,6 +4,7 @@
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not 
loaded');
 require(dirname(__FILE__).'/../../pdo/tests/pdo_test.inc');
+if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) 
die('skip expected output valid for WE8MSWIN1252 character set');
 PDOTest::skip();
 ?>
 --FILE--

Modified: php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_36798.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_36798.phpt   2011-09-08 
19:21:01 UTC (rev 316426)
+++ php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_36798.phpt   2011-09-08 
20:13:32 UTC (rev 316427)
@@ -7,6 +7,12 @@
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))){
+    if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) 
die('skip expected output valid for Oracle with WE8MSWIN1252 character set');
+
+}
+
 ?>
 --FILE--
 <?php

Modified: php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_fread_1.phpt 
2011-09-08 19:21:01 UTC (rev 316426)
+++ php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_fread_1.phpt 
2011-09-08 20:13:32 UTC (rev 316427)
@@ -4,6 +4,7 @@
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not 
loaded');
 require(dirname(__FILE__).'/../../pdo/tests/pdo_test.inc');
+if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) 
die('skip expected output valid for WE8MSWIN1252 character set');
 PDOTest::skip();
 ?>
 --FILE--

Modified: php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_stream_1.phpt        
2011-09-08 19:21:01 UTC (rev 316426)
+++ php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_stream_1.phpt        
2011-09-08 20:13:32 UTC (rev 316427)
@@ -4,6 +4,7 @@
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not 
loaded');
 require(dirname(__FILE__).'/../../pdo/tests/pdo_test.inc');
+if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) 
die('skip expected output valid for WE8MSWIN1252 character set');
 PDOTest::skip();
 ?>
 --FILE--

Modified: php/php-src/trunk/ext/pdo/tests/bug_36798.phpt
===================================================================
--- php/php-src/trunk/ext/pdo/tests/bug_36798.phpt      2011-09-08 19:21:01 UTC 
(rev 316426)
+++ php/php-src/trunk/ext/pdo/tests/bug_36798.phpt      2011-09-08 20:13:32 UTC 
(rev 316427)
@@ -7,6 +7,12 @@
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))){
+    if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) 
die('skip expected output valid for Oracle with WE8MSWIN1252 character set');
+
+}
+
 ?>
 --FILE--
 <?php

Modified: php/php-src/trunk/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
===================================================================
--- php/php-src/trunk/ext/pdo_oci/tests/pdo_oci_fread_1.phpt    2011-09-08 
19:21:01 UTC (rev 316426)
+++ php/php-src/trunk/ext/pdo_oci/tests/pdo_oci_fread_1.phpt    2011-09-08 
20:13:32 UTC (rev 316427)
@@ -4,6 +4,7 @@
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not 
loaded');
 require(dirname(__FILE__).'/../../pdo/tests/pdo_test.inc');
+if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) 
die('skip expected output valid for WE8MSWIN1252 character set');
 PDOTest::skip();
 ?>
 --FILE--

Modified: php/php-src/trunk/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
===================================================================
--- php/php-src/trunk/ext/pdo_oci/tests/pdo_oci_stream_1.phpt   2011-09-08 
19:21:01 UTC (rev 316426)
+++ php/php-src/trunk/ext/pdo_oci/tests/pdo_oci_stream_1.phpt   2011-09-08 
20:13:32 UTC (rev 316427)
@@ -4,6 +4,7 @@
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not 
loaded');
 require(dirname(__FILE__).'/../../pdo/tests/pdo_test.inc');
+if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) 
die('skip expected output valid for WE8MSWIN1252 character set');
 PDOTest::skip();
 ?>
 --FILE--

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to