sixd Thu, 03 Nov 2011 21:52:59 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=318759
Log: Replace custom "stress_test" setting with generic SKIP_SLOW_TESTS Changed paths: U php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_2.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497_92.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/bug44113.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/conn_attr_4.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/details.inc U php/php-src/branches/PHP_5_3/ext/oci8/tests/error2.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_01.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_02.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_03.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/lob_043.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob_64.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_1.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_2.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/bug43497.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/bug43497_92.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/bug44113.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/conn_attr_4.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/details.inc U php/php-src/branches/PHP_5_4/ext/oci8/tests/error2.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/extauth_01.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/extauth_02.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/extauth_03.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/lob_043.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob_64.phpt U php/php-src/trunk/ext/oci8/tests/bug42496_1.phpt U php/php-src/trunk/ext/oci8/tests/bug42496_2.phpt U php/php-src/trunk/ext/oci8/tests/bug43497.phpt U php/php-src/trunk/ext/oci8/tests/bug43497_92.phpt U php/php-src/trunk/ext/oci8/tests/bug44113.phpt U php/php-src/trunk/ext/oci8/tests/conn_attr_4.phpt U php/php-src/trunk/ext/oci8/tests/details.inc U php/php-src/trunk/ext/oci8/tests/error2.phpt U php/php-src/trunk/ext/oci8/tests/extauth_01.phpt U php/php-src/trunk/ext/oci8/tests/extauth_02.phpt U php/php-src/trunk/ext/oci8/tests/extauth_03.phpt U php/php-src/trunk/ext/oci8/tests/lob_043.phpt U php/php-src/trunk/ext/oci8/tests/pecl_bug10194.phpt U php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob.phpt U php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob_64.phpt
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_2.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_2.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_2.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (preg_match('/^1[01]\./', oci_client_version()) != 1) { die("skip expected output only valid with Oracle 10g or greater version of client"); } Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497_92.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497_92.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497_92.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (preg_match('/Unknown/', oci_client_version()) != 1) { die("skip expected output only valid with Oracle 9gR2 clients"); } Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug44113.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug44113.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug44113.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/conn_attr_4.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/conn_attr_4.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/conn_attr_4.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,10 +4,10 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to be run as a DBA user"); if ($test_drcp) die("skip output might vary with DRCP"); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); if (preg_match('/Release (11\.2|12)\./', oci_server_version($c), $matches) !== 1) { // Bug fixed in 11.2 prevents client_info being rest Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/details.inc =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/details.inc 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/details.inc 2011-11-03 21:52:59 UTC (rev 318759) @@ -9,10 +9,6 @@ * greater, and $dbase should be set to the tnsnames.ora entry * corresponding to the POOLED server instance or an Easy Connect * string like hostname:port/service_name:POOLED - * - * Set $stress_test to TRUE if you want to run some longer/slower/more - * memory intensive tests. External configuration such as increasing - * the timeout of run-tests.php may also be needed. */ if (file_exists(dirname(__FILE__)."/details_local.inc")) { @@ -23,23 +19,16 @@ $password = getenv('PHP_OCI8_TEST_PASS'); // Password for $user $dbase = getenv('PHP_OCI8_TEST_DB'); // Database connection string $test_drcp = getenv('PHP_OCI8_TEST_DRCP'); - $stress_test = getenv('PHP_OCI8_STRESS_TEST'); if (false !== $test_drcp && 0 == strcasecmp($test_drcp,'TRUE')) { $test_drcp = TRUE; } else { $test_drcp = FALSE; } - if (false !== $stress_test && 0 == strcasecmp($stress_test,'TRUE')) { - $stress_test = TRUE; - } else { - $stress_test = FALSE; - } } else { $user = "system"; $password = "oracle"; $dbase = "localhost/XE"; $test_drcp = FALSE; - $stress_test = FALSE; } /* Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/error2.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/error2.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/error2.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_01.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_01.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_01.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -5,7 +5,7 @@ if (!extension_loaded('oci8')) die ("skip no oci8 extension"); if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms"); require(dirname(__FILE__).'/details.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --INI-- oci8.privileged_connect=1 Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_02.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_02.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_02.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -3,9 +3,8 @@ --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms"); -require(dirname(__FILE__).'/details.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); ?> --INI-- oci8.privileged_connect=1 Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_03.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_03.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/extauth_03.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -3,9 +3,8 @@ --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms"); -require(dirname(__FILE__).'/details.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); ?> --INI-- oci8.privileged_connect=1 Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/lob_043.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/lob_043.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/lob_043.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --INI-- memory_limit=10M Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -5,7 +5,7 @@ $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platforms only"); -if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --INI-- memory_limit=3M Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob_64.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob_64.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug10194_blob_64.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,8 +4,8 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on thes require(dirname(__FILE__).'/skipif.inc'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only"); -if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE'); ?> --INI-- memory_limit=6M Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_1.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_1.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_1.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_2.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_2.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_2.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bug43497.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/bug43497.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bug43497.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (preg_match('/^1[01]\./', oci_client_version()) != 1) { die("skip expected output only valid with Oracle 10g or greater version of client"); } Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bug43497_92.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/bug43497_92.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bug43497_92.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (preg_match('/Unknown/', oci_client_version()) != 1) { die("skip expected output only valid with Oracle 9gR2 clients"); } Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bug44113.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/bug44113.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bug44113.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/conn_attr_4.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/conn_attr_4.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/conn_attr_4.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,10 +4,10 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to be run as a DBA user"); if ($test_drcp) die("skip output might vary with DRCP"); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); if (preg_match('/Release (11\.2|12)\./', oci_server_version($c), $matches) !== 1) { // Bug fixed in 11.2 prevents client_info being rest Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/details.inc =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/details.inc 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/details.inc 2011-11-03 21:52:59 UTC (rev 318759) @@ -9,10 +9,6 @@ * greater, and $dbase should be set to the tnsnames.ora entry * corresponding to the POOLED server instance or an Easy Connect * string like hostname:port/service_name:POOLED - * - * Set $stress_test to TRUE if you want to run some longer/slower/more - * memory intensive tests. External configuration such as increasing - * the timeout of run-tests.php may also be needed. */ if (file_exists(dirname(__FILE__)."/details_local.inc")) { @@ -23,23 +19,16 @@ $password = getenv('PHP_OCI8_TEST_PASS'); // Password for $user $dbase = getenv('PHP_OCI8_TEST_DB'); // Database connection string $test_drcp = getenv('PHP_OCI8_TEST_DRCP'); - $stress_test = getenv('PHP_OCI8_STRESS_TEST'); if (false !== $test_drcp && 0 == strcasecmp($test_drcp,'TRUE')) { $test_drcp = TRUE; } else { $test_drcp = FALSE; } - if (false !== $stress_test && 0 == strcasecmp($stress_test,'TRUE')) { - $stress_test = TRUE; - } else { - $stress_test = FALSE; - } } else { $user = "system"; $password = "oracle"; $dbase = "localhost/XE"; $test_drcp = FALSE; - $stress_test = FALSE; } /* Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/error2.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/error2.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/error2.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/extauth_01.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/extauth_01.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/extauth_01.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -5,7 +5,7 @@ if (!extension_loaded('oci8')) die ("skip no oci8 extension"); if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms"); require(dirname(__FILE__).'/details.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --INI-- oci8.privileged_connect=1 Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/extauth_02.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/extauth_02.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/extauth_02.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -3,9 +3,8 @@ --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms"); -require(dirname(__FILE__).'/details.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); ?> --INI-- oci8.privileged_connect=1 Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/extauth_03.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/extauth_03.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/extauth_03.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -3,9 +3,8 @@ --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms"); -require(dirname(__FILE__).'/details.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); ?> --INI-- oci8.privileged_connect=1 Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/lob_043.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/lob_043.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/lob_043.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --INI-- memory_limit=10M Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -5,7 +5,7 @@ $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platforms only"); -if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --INI-- memory_limit=3M Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob_64.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob_64.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug10194_blob_64.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,8 +4,8 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on thes require(dirname(__FILE__).'/skipif.inc'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only"); -if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE'); ?> --INI-- memory_limit=6M Modified: php/php-src/trunk/ext/oci8/tests/bug42496_1.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/bug42496_1.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/bug42496_1.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/trunk/ext/oci8/tests/bug42496_2.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/bug42496_2.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/bug42496_2.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/trunk/ext/oci8/tests/bug43497.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/bug43497.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/bug43497.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (preg_match('/^1[01]\./', oci_client_version()) != 1) { die("skip expected output only valid with Oracle 10g or greater version of client"); } Modified: php/php-src/trunk/ext/oci8/tests/bug43497_92.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/bug43497_92.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/bug43497_92.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (preg_match('/Unknown/', oci_client_version()) != 1) { die("skip expected output only valid with Oracle 9gR2 clients"); } Modified: php/php-src/trunk/ext/oci8/tests/bug44113.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/bug44113.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/bug44113.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/trunk/ext/oci8/tests/conn_attr_4.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/conn_attr_4.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/conn_attr_4.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,10 +4,10 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to be run as a DBA user"); if ($test_drcp) die("skip output might vary with DRCP"); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); if (preg_match('/Release (11\.2|12)\./', oci_server_version($c), $matches) !== 1) { // Bug fixed in 11.2 prevents client_info being rest Modified: php/php-src/trunk/ext/oci8/tests/details.inc =================================================================== --- php/php-src/trunk/ext/oci8/tests/details.inc 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/details.inc 2011-11-03 21:52:59 UTC (rev 318759) @@ -9,10 +9,6 @@ * greater, and $dbase should be set to the tnsnames.ora entry * corresponding to the POOLED server instance or an Easy Connect * string like hostname:port/service_name:POOLED - * - * Set $stress_test to TRUE if you want to run some longer/slower/more - * memory intensive tests. External configuration such as increasing - * the timeout of run-tests.php may also be needed. */ if (file_exists(dirname(__FILE__)."/details_local.inc")) { @@ -23,23 +19,16 @@ $password = getenv('PHP_OCI8_TEST_PASS'); // Password for $user $dbase = getenv('PHP_OCI8_TEST_DB'); // Database connection string $test_drcp = getenv('PHP_OCI8_TEST_DRCP'); - $stress_test = getenv('PHP_OCI8_STRESS_TEST'); if (false !== $test_drcp && 0 == strcasecmp($test_drcp,'TRUE')) { $test_drcp = TRUE; } else { $test_drcp = FALSE; } - if (false !== $stress_test && 0 == strcasecmp($stress_test,'TRUE')) { - $stress_test = TRUE; - } else { - $stress_test = FALSE; - } } else { $user = "system"; $password = "oracle"; $dbase = "localhost/XE"; $test_drcp = FALSE; - $stress_test = FALSE; } /* Modified: php/php-src/trunk/ext/oci8/tests/error2.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/error2.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/error2.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/trunk/ext/oci8/tests/extauth_01.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/extauth_01.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/extauth_01.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -5,7 +5,7 @@ if (!extension_loaded('oci8')) die ("skip no oci8 extension"); if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms"); require(dirname(__FILE__).'/details.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --INI-- oci8.privileged_connect=1 Modified: php/php-src/trunk/ext/oci8/tests/extauth_02.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/extauth_02.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/extauth_02.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -3,9 +3,8 @@ --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms"); -require(dirname(__FILE__).'/details.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); ?> --INI-- oci8.privileged_connect=1 Modified: php/php-src/trunk/ext/oci8/tests/extauth_03.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/extauth_03.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/extauth_03.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -3,9 +3,8 @@ --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms"); -require(dirname(__FILE__).'/details.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); ?> --INI-- oci8.privileged_connect=1 Modified: php/php-src/trunk/ext/oci8/tests/lob_043.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/lob_043.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/lob_043.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php Modified: php/php-src/trunk/ext/oci8/tests/pecl_bug10194.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/pecl_bug10194.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/pecl_bug10194.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,7 +4,7 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --INI-- memory_limit=10M Modified: php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -5,7 +5,7 @@ $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platforms only"); -if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --INI-- memory_limit=3M Modified: php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob_64.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob_64.phpt 2011-11-03 21:45:58 UTC (rev 318758) +++ php/php-src/trunk/ext/oci8/tests/pecl_bug10194_blob_64.phpt 2011-11-03 21:52:59 UTC (rev 318759) @@ -4,8 +4,8 @@ <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on thes require(dirname(__FILE__).'/skipif.inc'); +if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only"); -if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE'); ?> --INI-- memory_limit=6M
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php