Replace custom "stress_test" setting with generic SKIP_SLOW_TESTS

15 files changed, 14 insertions, 27 deletions

diff --git a/ext/oci8/tests/bug42496_1.phpt b/ext/oci8/tests/bug42496_1.phpt
index 2b62267c73..d430474fab 100644
--- a/ext/oci8/tests/bug42496_1.phpt
+++ b/ext/oci8/tests/bug42496_1.phpt
@@ -4,7 +4,7 @@ Bug #42496 (LOB fetch leaks cursors, eventually failing with ORA-1000 maximum op
 <?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
diff --git a/ext/oci8/tests/bug42496_2.phpt b/ext/oci8/tests/bug42496_2.phpt
index 195c00b7e7..71854f3d46 100644
--- a/ext/oci8/tests/bug42496_2.phpt
+++ b/ext/oci8/tests/bug42496_2.phpt
@@ -4,7 +4,7 @@ Bug #42496 (LOB fetch leaks cursors, eventually failing with ORA-1000 maximum op
 <?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
diff --git a/ext/oci8/tests/bug43497.phpt b/ext/oci8/tests/bug43497.phpt
index 600fb047bf..8c57fabeef 100644
--- a/ext/oci8/tests/bug43497.phpt
+++ b/ext/oci8/tests/bug43497.phpt
@@ -4,7 +4,7 @@ Bug #43497 (OCI8 XML/getClobVal aka temporary LOBs leak UGA memory)
 <?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");
 }
diff --git a/ext/oci8/tests/bug43497_92.phpt b/ext/oci8/tests/bug43497_92.phpt
index 932a863d7a..d4201257c4 100644
--- a/ext/oci8/tests/bug43497_92.phpt
+++ b/ext/oci8/tests/bug43497_92.phpt
@@ -4,7 +4,7 @@ Bug #43497 (OCI8 XML/getClobVal aka temporary LOBs leak UGA memory)
 <?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");
 }
diff --git a/ext/oci8/tests/bug44113.phpt b/ext/oci8/tests/bug44113.phpt
index aa4f2bb8e7..d441715616 100644
--- a/ext/oci8/tests/bug44113.phpt
+++ b/ext/oci8/tests/bug44113.phpt
@@ -4,7 +4,7 @@ Bug #44113 (New collection creation can fail with OCI-22303)
 <?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
diff --git a/ext/oci8/tests/conn_attr_4.phpt b/ext/oci8/tests/conn_attr_4.phpt
index b1a22858a8..d15b7a38de 100644
--- a/ext/oci8/tests/conn_attr_4.phpt
+++ b/ext/oci8/tests/conn_attr_4.phpt
@@ -4,10 +4,10 @@ Set and get of connection attributes with errors.
 <?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
diff --git a/ext/oci8/tests/details.inc b/ext/oci8/tests/details.inc
index 4c07e636e3..0f03c3a65f 100644
--- a/ext/oci8/tests/details.inc
+++ b/ext/oci8/tests/details.inc
@@ -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 @@ if (file_exists(dirname(__FILE__)."/details_local.inc")) {
 		$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;
 	}
 	
 	/*
diff --git a/ext/oci8/tests/error2.phpt b/ext/oci8/tests/error2.phpt
index 12eab61a6a..48f21f440d 100644
--- a/ext/oci8/tests/error2.phpt
+++ b/ext/oci8/tests/error2.phpt
@@ -4,7 +4,7 @@ Exercise error code for SUCCESS_WITH_INFO
 <?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
diff --git a/ext/oci8/tests/extauth_01.phpt b/ext/oci8/tests/extauth_01.phpt
index 993198c4de..37f8f3834d 100644
--- a/ext/oci8/tests/extauth_01.phpt
+++ b/ext/oci8/tests/extauth_01.phpt
@@ -5,7 +5,7 @@ Test External Authentication errors with oci_connect
 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
diff --git a/ext/oci8/tests/extauth_02.phpt b/ext/oci8/tests/extauth_02.phpt
index d3bee0bfc3..f3b517f730 100644
--- a/ext/oci8/tests/extauth_02.phpt
+++ b/ext/oci8/tests/extauth_02.phpt
@@ -3,9 +3,8 @@ Test External Authentication errors with oci_new_connect
 --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
diff --git a/ext/oci8/tests/extauth_03.phpt b/ext/oci8/tests/extauth_03.phpt
index e159c50f90..e6685eb176 100644
--- a/ext/oci8/tests/extauth_03.phpt
+++ b/ext/oci8/tests/extauth_03.phpt
@@ -3,9 +3,8 @@ Test External Authentication errors with oci_pconnect
 --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
diff --git a/ext/oci8/tests/lob_043.phpt b/ext/oci8/tests/lob_043.phpt
index ade79a200c..4cd159510b 100644
--- a/ext/oci8/tests/lob_043.phpt
+++ b/ext/oci8/tests/lob_043.phpt
@@ -4,7 +4,7 @@ Bug #49560 (LOB resource destructor and refcount test)
 <?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
diff --git a/ext/oci8/tests/pecl_bug10194.phpt b/ext/oci8/tests/pecl_bug10194.phpt
index 6a9044b1a0..9947e15dbc 100644
--- a/ext/oci8/tests/pecl_bug10194.phpt
+++ b/ext/oci8/tests/pecl_bug10194.phpt
@@ -4,7 +4,7 @@ PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside
 <?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
diff --git a/ext/oci8/tests/pecl_bug10194_blob.phpt b/ext/oci8/tests/pecl_bug10194_blob.phpt
index 75632ce473..faf87ab3c1 100644
--- a/ext/oci8/tests/pecl_bug10194_blob.phpt
+++ b/ext/oci8/tests/pecl_bug10194_blob.phpt
@@ -5,7 +5,7 @@ PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside
 $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
diff --git a/ext/oci8/tests/pecl_bug10194_blob_64.phpt b/ext/oci8/tests/pecl_bug10194_blob_64.phpt
index da7ec592fc..45788a41b4 100644
--- a/ext/oci8/tests/pecl_bug10194_blob_64.phpt
+++ b/ext/oci8/tests/pecl_bug10194_blob_64.phpt
@@ -4,8 +4,8 @@ PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside
 <?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