From 717860ad40e691c0d6ec4867b7fe555f34b11dae Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Sat, 28 Oct 2023 13:34:48 +0100
Subject: [PATCH] See if this fixes Firbird parallel issues

---
 ext/pdo/tests/pdo_017.phpt       | 3 ++-
 ext/pdo_firebird/tests/CONFLICTS | 1 -
 ext/pdo_firebird/tests/ddl.phpt  | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
 delete mode 100644 ext/pdo_firebird/tests/CONFLICTS

diff --git a/ext/pdo/tests/pdo_017.phpt b/ext/pdo/tests/pdo_017.phpt
index bc514bff2c32b..0ee173a1182a9 100644
--- a/ext/pdo/tests/pdo_017.phpt
+++ b/ext/pdo/tests/pdo_017.phpt
@@ -2,13 +2,14 @@
 PDO Common: transactions
 --EXTENSIONS--
 pdo
+--CONFLICTS--
+pdo_transactions
 --SKIPIF--
 <?php
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
-if (str_starts_with(getenv('PDOTEST_DSN'), "firebird")) die('xfail firebird driver does not behave as expected');
 
 $db = PDOTest::factory();
 try {
diff --git a/ext/pdo_firebird/tests/CONFLICTS b/ext/pdo_firebird/tests/CONFLICTS
deleted file mode 100644
index 4667cdfa07662..0000000000000
--- a/ext/pdo_firebird/tests/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-firebird
diff --git a/ext/pdo_firebird/tests/ddl.phpt b/ext/pdo_firebird/tests/ddl.phpt
index 4c5ee3d38a409..7c29b42a4805a 100644
--- a/ext/pdo_firebird/tests/ddl.phpt
+++ b/ext/pdo_firebird/tests/ddl.phpt
@@ -2,6 +2,8 @@
 PDO_Firebird: DDL/transactions
 --EXTENSIONS--
 pdo_firebird
+--CONFLICTS--
+pdo_transactions
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--