Skip to content

Commit a202651

Browse files
modification dunit
1 parent 8670c3f commit a202651

File tree

3 files changed

+23
-7
lines changed

3 files changed

+23
-7
lines changed

.github/workflows/build-prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
- name: Run DUnit tests
8686
shell: cmd
8787
run: |
88-
Tests\Win64\Debug\FeedFlow.tests.exe --format=xml --output=resultats_tests.xml
88+
Tests\Win64\Debug\FeedFlow.tests.exe
8989
9090
- name: Publish test results
9191
uses: actions/upload-artifact@v4

Tests/FeedFlow.tests.dproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@
8181
<CfgParent>Base</CfgParent>
8282
<Base>true</Base>
8383
</PropertyGroup>
84+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
85+
<Cfg_2_Win64>true</Cfg_2_Win64>
86+
<CfgParent>Cfg_2</CfgParent>
87+
<Cfg_2>true</Cfg_2>
88+
<Base>true</Base>
89+
</PropertyGroup>
8490
<PropertyGroup Condition="'$(Base)'!=''">
8591
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
8692
<DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
@@ -155,13 +161,20 @@
155161
<VerInfo_Locale>1033</VerInfo_Locale>
156162
<Manifest_File>(vide)</Manifest_File>
157163
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
164+
<DCC_Define>CI;$(DCC_Define)</DCC_Define>
158165
</PropertyGroup>
159166
<PropertyGroup Condition="'$(Cfg_2)'!=''">
160167
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
161168
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
162169
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
163170
<DCC_DebugInformation>0</DCC_DebugInformation>
164171
</PropertyGroup>
172+
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
173+
<DCC_UnitSearchPath>C:\Users\danyleblanc\Documents\DL-Projets\Composants\FastMM4-master;C:\Users\danyleblanc\Documents\DL-Projets\FeedFlow\src\Common;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
174+
<VerInfo_Locale>1033</VerInfo_Locale>
175+
<Manifest_File>(vide)</Manifest_File>
176+
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
177+
</PropertyGroup>
165178
<ItemGroup>
166179
<DelphiCompile Include="$(MainSource)">
167180
<MainSource>MainSource</MainSource>

src/FeedFlowGrp.groupproj

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<Projects Include="FeedFlow.dproj">
1010
<Dependencies/>
1111
</Projects>
12+
<Projects Include="..\Tests\FeedFlow.tests.dproj">
13+
<Dependencies/>
14+
</Projects>
1215
</ItemGroup>
1316
<ProjectExtensions>
1417
<Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -18,13 +21,13 @@
1821
</BorlandProject>
1922
</ProjectExtensions>
2023
<Target Name="FeedFlow_Tests">
21-
<MSBuild Projects="FeedFlow_Tests.dproj"/>
24+
<MSBuild Projects="..\Tests\FeedFlow.tests.dproj"/>
2225
</Target>
2326
<Target Name="FeedFlow_Tests:Clean">
24-
<MSBuild Projects="FeedFlow_Tests.dproj" Targets="Clean"/>
27+
<MSBuild Projects="..\Tests\FeedFlow.tests.dproj" Targets="Clean"/>
2528
</Target>
2629
<Target Name="FeedFlow_Tests:Make">
27-
<MSBuild Projects="FeedFlow_Tests.dproj" Targets="Make"/>
30+
<MSBuild Projects="..\Tests\FeedFlow.tests.dproj" Targets="Make"/>
2831
</Target>
2932
<Target Name="FeedFlow">
3033
<MSBuild Projects="FeedFlow.dproj"/>
@@ -36,13 +39,13 @@
3639
<MSBuild Projects="FeedFlow.dproj" Targets="Make"/>
3740
</Target>
3841
<Target Name="Build">
39-
<CallTarget Targets="FeedFlow_Tests;FeedFlow"/>
42+
<CallTarget Targets="FeedFlow_Tests;FeedFlow;FeedFlow_tests"/>
4043
</Target>
4144
<Target Name="Clean">
42-
<CallTarget Targets="FeedFlow_Tests:Clean;FeedFlow:Clean"/>
45+
<CallTarget Targets="FeedFlow_Tests:Clean;FeedFlow:Clean;FeedFlow_tests:Clean"/>
4346
</Target>
4447
<Target Name="Make">
45-
<CallTarget Targets="FeedFlow_Tests:Make;FeedFlow:Make"/>
48+
<CallTarget Targets="FeedFlow_Tests:Make;FeedFlow:Make;FeedFlow_tests:Make"/>
4649
</Target>
4750
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
4851
</Project>

0 commit comments

Comments
 (0)