com php-src: Fix skipifs: ext/oci8/tests/bind_char_2_ 11gR1.phpt ext/oci8/tests/bind_char_3_1 1gR1.phpt ext/oci8/tests/bind_char_4_11gR 1.phpt
| From: | Christopher Jones | Date: | Tue, 14 Aug 2012 21:10:20 +0000 |
| Subject: | com php-src: Fix skipifs: ext/oci8/tests/bind_char_2_ 11gR1.phpt ext/oci8/tests/bind_char_3_1 1gR1.phpt ext/oci8/tests/bind_char_4_11gR 1.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69838@lists.php.net to get a copy of this message | ||
Commit: 6524a530dfd3c8766c02f317cc5bf711d561c635
Author: Christopher Jones <sixd@php.net> Tue, 14 Aug 2012 14:10:20 -0700
Parents: 8c3bf96022ff6fb6be1e7bc87b794cab9e9bf90c
Branches: PHP-5.3 PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6524a530dfd3c8766c02f317cc5bf711d561c635
Log:
Fix skipifs
Skipifs were referencing an unset variable
Changed paths:
M ext/oci8/tests/bind_char_2_11gR1.phpt
M ext/oci8/tests/bind_char_3_11gR1.phpt
M ext/oci8/tests/bind_char_4_11gR1.phpt
Diff:
diff --git a/ext/oci8/tests/bind_char_2_11gR1.phpt b/ext/oci8/tests/bind_char_2_11gR1.phpt
index 8bb2873..edb2a12 100644
--- a/ext/oci8/tests/bind_char_2_11gR1.phpt
+++ b/ext/oci8/tests/bind_char_2_11gR1.phpt
@@ -5,7 +5,7 @@ SELECT oci_bind_by_name with SQLT_AFC aka CHAR and dates
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
require(dirname(__FILE__)."/connect.inc");
// The bind buffer size edge cases seem to change each DB version.
-if (preg_match('/Release 11\.1\./', $sv, $matches) !== 1) {
+if (preg_match('/Release 11\.1\./', oci_server_version($c), $matches) !== 1) {
if (preg_match('/Release 11\.2\.0\.3/', oci_server_version($c), $matches) !== 1) {
die("skip expected output only valid when using Oracle 11gR1 or 11.2.0.3
databases");
}
diff --git a/ext/oci8/tests/bind_char_3_11gR1.phpt b/ext/oci8/tests/bind_char_3_11gR1.phpt
index 4c6241c..fea7775 100644
--- a/ext/oci8/tests/bind_char_3_11gR1.phpt
+++ b/ext/oci8/tests/bind_char_3_11gR1.phpt
@@ -5,7 +5,7 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to CHAR parameter
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
require(dirname(__FILE__)."/connect.inc");
// The bind buffer size edge cases seem to change each DB version.
-if (preg_match('/Release 11\.1\./', $sv, $matches) !== 1) {
+if (preg_match('/Release 11\.1\./', oci_server_version($c), $matches) !== 1) {
if (preg_match('/Release 11\.2\.0\.3/', oci_server_version($c), $matches) !== 1) {
die("skip expected output only valid when using Oracle 11gR1 or 11.2.0.3
databases");
}
diff --git a/ext/oci8/tests/bind_char_4_11gR1.phpt b/ext/oci8/tests/bind_char_4_11gR1.phpt
index 14d5878..2bc2f14 100644
--- a/ext/oci8/tests/bind_char_4_11gR1.phpt
+++ b/ext/oci8/tests/bind_char_4_11gR1.phpt
@@ -5,7 +5,7 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to VARCHAR2 parameter
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
require(dirname(__FILE__)."/connect.inc");
// The bind buffer size edge cases seem to change each DB version.
-if (preg_match('/Release 11\.1\./', $sv, $matches) !== 1) {
+if (preg_match('/Release 11\.1\./', oci_server_version($c), $matches) !== 1) {
if (preg_match('/Release 11\.2\..0\.3/', oci_server_version($c), $matches) !== 1) {
die("skip expected output only valid when using Oracle 11gR1 or 11.2.0.3
databases");
}