Browse Source

MFH: Fix tests to use ENV and re-enable

experimental/5.3-FPM
Christopher Jones 18 years ago
parent
commit
65029f11e9
  1. 6
      ext/oci8/tests/connect_without_oracle_home.phpt
  2. 6
      ext/oci8/tests/connect_without_oracle_home_old.phpt
  3. 7
      ext/oci8/tests/pecl_bug16035.phpt

6
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));
}

6
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));
}

7
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===
Loading…
Cancel
Save