sixd Thu Mar 12 14:47:47 2009 UTC Modified files: /php-src/ext/oci8/tests connect_without_oracle_home.phpt connect_without_oracle_home_old.phpt pecl_bug16035.phpt Log: Fix tests to use ENV and re-enable http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect_without_oracle_home.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/oci8/tests/connect_without_oracle_home.phpt diff -u php-src/ext/oci8/tests/connect_without_oracle_home.phpt:1.5 php-src/ext/oci8/tests/connect_without_oracle_home.phpt:1.6 --- php-src/ext/oci8/tests/connect_without_oracle_home.phpt:1.5 Mon Mar 9 18:59:20 2009 +++ php-src/ext/oci8/tests/connect_without_oracle_home.phpt Thu Mar 12 14:47:47 2009 @@ -3,8 +3,6 @@ --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,6 +11,8 @@ die ("skip Test only valid when OCI8 is built with an ORACLE_HOME"); } ?> +--ENV-- +ORACLE_HOME="" --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt diff -u php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt:1.5 php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt:1.6 --- php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt:1.5 Mon Mar 9 18:59:20 2009 +++ php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt Thu Mar 12 14:47:47 2009 @@ -3,8 +3,6 @@ --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,6 +11,8 @@ die ("skip Test only valid when OCI8 is built with an ORACLE_HOME"); } ?> +--ENV-- +ORACLE_HOME="" --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/pecl_bug16035.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/oci8/tests/pecl_bug16035.phpt diff -u php-src/ext/oci8/tests/pecl_bug16035.phpt:1.1 php-src/ext/oci8/tests/pecl_bug16035.phpt:1.2 --- php-src/ext/oci8/tests/pecl_bug16035.phpt:1.1 Mon Mar 9 18:59:20 2009 +++ php-src/ext/oci8/tests/pecl_bug16035.phpt Thu Mar 12 14:47:47 2009 @@ -3,8 +3,6 @@ --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,6 +11,8 @@ die ("skip Test only valid when OCI8 is built with an ORACLE_HOME"); } ?> +--ENV-- +ORACLE_HOME="" --FILE-- <?php @@ -23,5 +23,5 @@ ===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===
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php