From 65029f11e99214155d5d8f3974f9b577f41b330f Mon Sep 17 00:00:00 2001
From: Christopher Jones <sixd@php.net>
Date: Thu, 12 Mar 2009 14:50:29 +0000
Subject: [PATCH] MFH: Fix tests to use ENV and re-enable

---
 ext/oci8/tests/connect_without_oracle_home.phpt     | 6 ++----
 ext/oci8/tests/connect_without_oracle_home_old.phpt | 6 ++----
 ext/oci8/tests/pecl_bug16035.phpt                   | 7 +++----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/ext/oci8/tests/connect_without_oracle_home.phpt b/ext/oci8/tests/connect_without_oracle_home.phpt
index 6839ec7d95..41c9f5e284 100644
--- a/ext/oci8/tests/connect_without_oracle_home.phpt
+++ b/ext/oci8/tests/connect_without_oracle_home.phpt
@@ -3,8 +3,6 @@ oci_connect() without ORACLE_HOME set (OCIServerAttach() segfaults)
 --SKIPIF--
 <?php 
 if (!extension_loaded('oci8')) die("skip no oci8 extension"); 
-/* Disabled: Fix for PECL Bug #16035 stops a crash if ORACLE_HOME is not set when PHP starts. Using putenv('ORACLE_HOME=""') at runtime will still segfault */
-die("skip can't be tested with run-tests.php");
 ob_start();
 phpinfo(INFO_MODULES);
 $phpinfo = ob_get_clean();
@@ -13,13 +11,13 @@ if ($ov !== 1) {
 	die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
 }
 ?>
+--ENV--
+ORACLE_HOME=""
 --FILE--
 <?php
 
 require dirname(__FILE__)."/details.inc";
 
-putenv('ORACLE_HOME=""');
-
 if (!empty($dbase)) {
 	var_dump(oci_connect($user, $password, $dbase));
 }
diff --git a/ext/oci8/tests/connect_without_oracle_home_old.phpt b/ext/oci8/tests/connect_without_oracle_home_old.phpt
index 0affa01b8a..f6f44ddc16 100644
--- a/ext/oci8/tests/connect_without_oracle_home_old.phpt
+++ b/ext/oci8/tests/connect_without_oracle_home_old.phpt
@@ -3,8 +3,6 @@ ocilogon() without ORACLE_HOME set (OCIServerAttach() segfaults)
 --SKIPIF--
 <?php 
 if (!extension_loaded('oci8')) die("skip no oci8 extension"); 
-/* Disabled: Fix for PECL Bug #16035 stops a crash if ORACLE_HOME is not set when PHP starts. Using putenv('ORACLE_HOME=""') at runtime will still segfault */
-die("skip can't be tested with run-tests.php");
 ob_start();
 phpinfo(INFO_MODULES);
 $phpinfo = ob_get_clean();
@@ -13,13 +11,13 @@ if ($ov !== 1) {
 	die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
 }
 ?>
+--ENV--
+ORACLE_HOME=""
 --FILE--
 <?php
 
 require dirname(__FILE__)."/details.inc";
 
-putenv('ORACLE_HOME=""');
-
 if (!empty($dbase)) {
 	var_dump(ocilogon($user, $password, $dbase));
 }
diff --git a/ext/oci8/tests/pecl_bug16035.phpt b/ext/oci8/tests/pecl_bug16035.phpt
index 017a4883ad..7f5e9dd388 100644
--- a/ext/oci8/tests/pecl_bug16035.phpt
+++ b/ext/oci8/tests/pecl_bug16035.phpt
@@ -3,8 +3,6 @@ PECL Bug #16035 (Crash with Oracle 10.2 connecting with a character set but ORAC
 --SKIPIF--
 <?php 
 if (!extension_loaded('oci8')) die ("skip no oci8 extension"); 
-/* Disabled: Fix for PECL Bug #16035 stops a crash if ORACLE_HOME is not set when PHP starts. Using putenv('ORACLE_HOME=""') at runtime will still segfault */
-die("skip can't be tested with run-tests.php");
 ob_start();
 phpinfo(INFO_MODULES);
 $phpinfo = ob_get_clean();
@@ -13,15 +11,16 @@ if ($ov !== 1) {
 	die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
 }
 ?>
+--ENV--
+ORACLE_HOME=""
 --FILE--
 <?php
 
-putenv('ORACLE_HOME=""');
 oci_connect('abc', 'def', 'ghi', 'jkl');
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-PHP Warning:  oci_connect(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME is set and points to the right directory in %s on line %d
+Warning: oci_connect(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME is set and points to the right directory in %s on line %d
 ===DONE===
-- 
2.50.1