Skip to content

Commit 81bedb0

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Skip some OCI tests with repeat
2 parents 28ccf9f + 93e509f commit 81bedb0

File tree

5 files changed

+7
-1
lines changed

5 files changed

+7
-1
lines changed

ext/oci8/tests/conn_attr_1.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Set and get of connection attributes with all types of connections.
33
--EXTENSIONS--
44
oci8
55
--SKIPIF--
6-
<?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
6+
<?php
7+
if (getenv('SKIP_REPEAT')) die('skip fails with repeat');
8+
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
79
require(__DIR__.'/skipif.inc');
810

911
if (strcasecmp($user, "system") && strcasecmp($user, "sys"))

ext/oci8/tests/conn_attr_2.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Set and get of connection attributes across persistent connections and sysdba co
44
oci8
55
--SKIPIF--
66
<?php
7+
if (getenv('SKIP_REPEAT')) die('skip fails with repeat');
78
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
89
require(__DIR__.'/skipif.inc');
910

ext/oci8/tests/conn_attr_3.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Set and get of connection attributes with oci_close().
44
oci8
55
--SKIPIF--
66
<?php
7+
if (getenv('SKIP_REPEAT')) die('skip fails with repeat');
78
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
89
require(__DIR__.'/skipif.inc');
910

ext/oci8/tests/conn_attr_5.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Set and get connection attributes with scope end.
44
oci8
55
--SKIPIF--
66
<?php
7+
if (getenv('SKIP_REPEAT')) die('skip fails with repeat');
78
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
89
require(__DIR__.'/skipif.inc');
910

ext/oci8/tests/edition_2.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Set and check Oracle 11gR2 "edition" attribute
44
oci8
55
--SKIPIF--
66
<?php
7+
if (getenv('SKIP_REPEAT')) die('skip fails with repeat');
78
require(__DIR__."/connect.inc");
89
if (strcasecmp($user, "system") && strcasecmp($user, "sys"))
910
die("skip needs to be run as a DBA user");

0 commit comments

Comments
 (0)