Skip to content

Commit 771a21b

Browse files
committed
Another attempt to fix Firebird + debug
1 parent 13760c2 commit 771a21b

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

ext/pdo/tests/pdo_017.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
2424
}
2525
}
2626
?>
27+
--CONFLICTS--
28+
firebird
2729
--FILE--
2830
<?php
2931
if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../../pdo/tests/');

ext/pdo_dblib/tests/bug_45876.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pdo_dblib
77
require __DIR__ . '/config.inc';
88
?>
99
--CONFLICTS--
10-
pdo_dblib
10+
all
1111
--FILE--
1212
<?php
1313
require __DIR__ . '/config.inc';

ext/pdo_dblib/tests/bug_50755.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if (getenv('SKIP_REPEAT')) die('skip May fail on repeat');
88
require __DIR__ . '/config.inc';
99
?>
1010
--CONFLICTS--
11-
pdo_dblib
11+
all
1212
--FILE--
1313
<?php
1414
require __DIR__ . '/config.inc';

ext/pdo_firebird/tests/ddl.phpt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ LSAN_OPTIONS=detect_leaks=0
1212
require("testdb.inc");
1313

1414
$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
15+
@$dbh->exec('DROP TABLE test_ddl');
16+
@$dbh->exec('DROP GENERATOR gen_test_ddl_id');
17+
@$dbh->exec('DROP TRIGGER test_ddl_bi');
1518

1619
$dbh->exec("CREATE TABLE test_ddl (id INT NOT NULL PRIMARY KEY, text BLOB SUB_TYPE 1)");
1720
$dbh->exec("CREATE GENERATOR gen_test_ddl_id");
@@ -29,18 +32,12 @@ $dbh->beginTransaction();
2932
var_dump($dbh->exec("DELETE FROM test_ddl"));
3033
$dbh->commit();
3134

32-
unset($dbh);
33-
echo "done\n";
34-
?>
35-
--CLEAN--
36-
<?php
37-
require("testdb.inc");
38-
$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
3935
@$dbh->exec('DROP TABLE test_ddl');
4036
@$dbh->exec('DROP GENERATOR gen_test_ddl_id');
4137
@$dbh->exec('DROP TRIGGER test_ddl_bi');
42-
unset($dbh);
4338

39+
unset($dbh);
40+
echo "done\n";
4441
?>
4542
--EXPECT--
4643
int(1)

0 commit comments

Comments
 (0)