summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2011-09-08 20:13:32 +0000
committerChristopher Jones <sixd@php.net>2011-09-08 20:13:32 +0000
commit4840a4a28b86466202072a67a9a8f0fd4a145353 (patch)
tree3ef2ebb0a9991b91eeeea3d1091adccd824e9791
parente77138f7aee1632821189f4c8934391353d3bad7 (diff)
downloadphp-git-4840a4a28b86466202072a67a9a8f0fd4a145353.tar.gz
Update SKIPIFs for test portability
-rw-r--r--ext/pdo/tests/bug_36798.phpt6
-rw-r--r--ext/pdo_oci/tests/pdo_oci_fread_1.phpt1
-rw-r--r--ext/pdo_oci/tests/pdo_oci_stream_1.phpt1
3 files changed, 8 insertions, 0 deletions
diff --git a/ext/pdo/tests/bug_36798.phpt b/ext/pdo/tests/bug_36798.phpt
index 5a40bb78c7..9da703e84f 100644
--- a/ext/pdo/tests/bug_36798.phpt
+++ b/ext/pdo/tests/bug_36798.phpt
@@ -7,6 +7,12 @@ $dir = getenv('REDIR_TEST_DIR');
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
diff --git a/ext/pdo_oci/tests/pdo_oci_fread_1.phpt b/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
index 9604ef586d..26a92f01b4 100644
--- a/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
+++ b/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
@@ -4,6 +4,7 @@ PDO_OCI: check fread() EOF
<?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--
diff --git a/ext/pdo_oci/tests/pdo_oci_stream_1.phpt b/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
index d054f88d4b..27a28b9bb8 100644
--- a/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
+++ b/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
@@ -4,6 +4,7 @@ PDO_OCI: stream_get_contents length & offset test
<?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--