Skip to content

Commit 1b3c958

Browse files
committed
Test case fail to execute in parallel for firebird 4.0.0, 4.0.1 and 4.0.2
Reference: FirebirdSQL/firebird#7347
1 parent eb5a6b2 commit 1b3c958

1 file changed

Lines changed: 40 additions & 3 deletions

File tree

source/testcase/build.xml

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
22

3-
<project name="DBX Test Cases" default="build" basedir=".">
4-
3+
<project name="DBX Test Cases" default="build" xmlns:if="ant:if" xmlns:unless="ant:unless">
54
<taskdef resource="net/sf/antcontrib/antlib.xml"/>
65

76
<fail unless="program" message="missing 'program' property. Example: ant -Dprogram=..\..\project\win32\debug\dbxfbTests.exe -Ddrivers=Y:\firebird" />
@@ -11,9 +10,22 @@
1110
<property name="program.conf" location="dbxfbTests.ini" />
1211

1312
<target name="build" depends="t.platform,t.platform.testcount">
13+
<for param="i" begin="1" end="${p.embedded.end}" parallel="true" keepgoing="true">
14+
<sequential>
15+
<antcall target="dbx.test">
16+
<param name="execute_fb_400_402" value="@{execute_fb_400_402}" />
17+
<param name="index" value="@{i}" />
18+
<param name="test" value="embedded_@{i}" />
19+
<param name="suite" value="1" />
20+
</antcall>
21+
</sequential>
22+
</for>
23+
1424
<for param="i" begin="1" end="${p.embedded.end}" parallel="true" keepgoing="true">
1525
<sequential>
1626
<antcall target="dbx.test">
27+
<param name="execute_fb_400_402" value="true" />
28+
<param name="index" value="@{i}" />
1729
<param name="test" value="embedded_@{i}" />
1830
<param name="suite" value="1" />
1931
</antcall>
@@ -43,7 +55,7 @@
4355
</for>
4456
</target>
4557

46-
<target name="dbx.test">
58+
<target name="dbx.test" depends="commit#d0e33f1" if="p.execute">
4759
<tempfile property="p.script" destdir="${env.TEMP}" suffix=".cmd"/>
4860

4961
<condition property="p.config" value="" else="release">
@@ -65,6 +77,31 @@
6577
<delete file="${p.script}" />
6678
</target>
6779

80+
<target name="commit#d0e33f1" description="https://github.com/FirebirdSQL/firebird/issues/7347 commit d0e33f1: Use Windows private namespace for kernel objects used in server-to-server IPC">
81+
<condition property="is.win32">
82+
<contains string="${program}" substring="win32" casesensitive="false" />
83+
</condition>
84+
85+
<condition property="is.win64">
86+
<contains string="${program}" substring="win64" casesensitive="false" />
87+
</condition>
88+
89+
<condition property="p.execute">
90+
<xor>
91+
<isfalse value="${execute_fb_400_402}" />
92+
<or>
93+
<equals if:set="is.win32" arg1="${index}" arg2="44" /> <!-- Firebird 4.0.0 -->
94+
<equals if:set="is.win32" arg1="${index}" arg2="45" /> <!-- Firebird 4.0.1 -->
95+
<equals if:set="is.win32" arg1="${index}" arg2="46" /> <!-- Firebird 4.0.2 -->
96+
97+
<equals if:set="is.win64" arg1="${index}" arg2="29" /> <!-- Firebird 4.0.0 -->
98+
<equals if:set="is.win64" arg1="${index}" arg2="30" /> <!-- Firebird 4.0.1 -->
99+
<equals if:set="is.win64" arg1="${index}" arg2="31" /> <!-- Firebird 4.0.2 -->
100+
</or>
101+
</xor>
102+
</condition>
103+
</target>
104+
68105
<target name="t.platform">
69106
<fail unless="program" />
70107
<condition property="p.platform" value="Win32" else="Win64">

0 commit comments

Comments
 (0)