Skip to content

Commit a5b0b19

Browse files
author
sixd
committed
Replace custom "stress_test" setting with generic SKIP_SLOW_TESTS
git-svn-id: http://svn.php.net/repository/php/php-src/trunk@318759 c90b9560-bf6c-de11-be94-00142212c4b1
1 parent 33f346d commit a5b0b19

15 files changed

+14
-27
lines changed

‎ext/oci8/tests/bug42496_1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bug #42496 (LOB fetch leaks cursors, eventually failing with ORA-1000 maximum op
44
<?php
55
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
66
require(dirname(__FILE__).'/skipif.inc');
7-
if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE');
7+
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
88
?>
99
--FILE--
1010
<?php

‎ext/oci8/tests/bug42496_2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bug #42496 (LOB fetch leaks cursors, eventually failing with ORA-1000 maximum op
44
<?php
55
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
66
require(dirname(__FILE__).'/skipif.inc');
7-
if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE');
7+
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
88
?>
99
--FILE--
1010
<?php

‎ext/oci8/tests/bug43497.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bug #43497 (OCI8 XML/getClobVal aka temporary LOBs leak UGA memory)
44
<?php
55
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
66
require(dirname(__FILE__).'/skipif.inc');
7-
if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE');
7+
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
88
if (preg_match('/^1[01]\./', oci_client_version()) != 1) {
99
die("skip expected output only valid with Oracle 10g or greater version of client");
1010
}

‎ext/oci8/tests/bug43497_92.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bug #43497 (OCI8 XML/getClobVal aka temporary LOBs leak UGA memory)
44
<?php
55
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
66
require(dirname(__FILE__).'/skipif.inc');
7-
if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE');
7+
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
88
if (preg_match('/Unknown/', oci_client_version()) != 1) {
99
die("skip expected output only valid with Oracle 9gR2 clients");
1010
}

‎ext/oci8/tests/bug44113.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bug #44113 (New collection creation can fail with OCI-22303)
44
<?php
55
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
66
require(dirname(__FILE__).'/skipif.inc');
7-
if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE');
7+
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
88
?>
99
--FILE--
1010
<?php

‎ext/oci8/tests/conn_attr_4.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ Set and get of connection attributes with errors.
44
<?php
55
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
66
require(dirname(__FILE__).'/skipif.inc');
7+
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
78

89
if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to be run as a DBA user");
910
if ($test_drcp) die("skip output might vary with DRCP");
10-
if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE');
1111

1212
if (preg_match('/Release (11\.2|12)\./', oci_server_version($c), $matches) !== 1) {
1313
// Bug fixed in 11.2 prevents client_info being rest

‎ext/oci8/tests/details.inc

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
* greater, and $dbase should be set to the tnsnames.ora entry
1010
* corresponding to the POOLED server instance or an Easy Connect
1111
* string like hostname:port/service_name:POOLED
12-
*
13-
* Set $stress_test to TRUE if you want to run some longer/slower/more
14-
* memory intensive tests. External configuration such as increasing
15-
* the timeout of run-tests.php may also be needed.
1612
*/
1713

1814
if (file_exists(dirname(__FILE__)."/details_local.inc")) {
@@ -23,23 +19,16 @@ if (file_exists(dirname(__FILE__)."/details_local.inc")) {
2319
$password = getenv('PHP_OCI8_TEST_PASS'); // Password for $user
2420
$dbase = getenv('PHP_OCI8_TEST_DB'); // Database connection string
2521
$test_drcp = getenv('PHP_OCI8_TEST_DRCP');
26-
$stress_test = getenv('PHP_OCI8_STRESS_TEST');
2722
if (false !== $test_drcp && 0 == strcasecmp($test_drcp,'TRUE')) {
2823
$test_drcp = TRUE;
2924
} else {
3025
$test_drcp = FALSE;
3126
}
32-
if (false !== $stress_test && 0 == strcasecmp($stress_test,'TRUE')) {
33-
$stress_test = TRUE;
34-
} else {
35-
$stress_test = FALSE;
36-
}
3727
} else {
3828
$user = "system";
3929
$password = "oracle";
4030
$dbase = "localhost/XE";
4131
$test_drcp = FALSE;
42-
$stress_test = FALSE;
4332
}
4433

4534
/*

‎ext/oci8/tests/error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Exercise error code for SUCCESS_WITH_INFO
44
<?php
55
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
66
require(dirname(__FILE__).'/skipif.inc');
7-
if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE');
7+
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
88
?>
99
--FILE--
1010
<?php

‎ext/oci8/tests/extauth_01.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Test External Authentication errors with oci_connect
55
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
66
if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms");
77
require(dirname(__FILE__).'/details.inc');
8-
if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE');
8+
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
99
?>
1010
--INI--
1111
oci8.privileged_connect=1

‎ext/oci8/tests/extauth_02.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ Test External Authentication errors with oci_new_connect
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
6+
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
67
if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms");
7-
require(dirname(__FILE__).'/details.inc');
8-
if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE');
98
?>
109
--INI--
1110
oci8.privileged_connect=1

‎ext/oci8/tests/extauth_03.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ Test External Authentication errors with oci_pconnect
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
6+
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
67
if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms");
7-
require(dirname(__FILE__).'/details.inc');
8-
if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE');
98
?>
109
--INI--
1110
oci8.privileged_connect=1

‎ext/oci8/tests/lob_043.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bug #49560 (LOB resource destructor and refcount test)
44
<?php
55
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
66
require(dirname(__FILE__).'/skipif.inc');
7-
if ($stress_test !== true) die ('skip Slow test not run when $stress_test is FALSE');
7+
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
88
?>
99
--FILE--
1010
<?php

‎ext/oci8/tests/pecl_bug10194.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside
44
<?php
55
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
66
require(dirname(__FILE__).'/skipif.inc');
7-
if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE');
7+
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
88
?>
99
--INI--
1010
memory_limit=10M

‎ext/oci8/tests/pecl_bug10194_blob.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside
55
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
66
require(dirname(__FILE__).'/skipif.inc');
77
if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platforms only");
8-
if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE');
8+
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
99
?>
1010
--INI--
1111
memory_limit=3M

‎ext/oci8/tests/pecl_bug10194_blob_64.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside
44
<?php
55
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on thes
66
require(dirname(__FILE__).'/skipif.inc');
7+
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
78
if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only");
8-
if ($stress_test !== true) die ('skip Test not run when $stress_test is FALSE');
99
?>
1010
--INI--
1111
memory_limit=6M

0 commit comments

Comments
 (0)