Skip to content

Commit 6d4cb73

Browse files
authored
Enable UnitTests on build server (dotnet#57)
1 parent e3ae06f commit 6d4cb73

File tree

4 files changed

+43
-16
lines changed

4 files changed

+43
-16
lines changed

build.proj

+3-4
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,11 @@
9090
<DownloadFilesFromUrl Items="@(TestFile)"
9191
DestinationDir="test/data/external"
9292
TreatErrorsAsWarnings="true"/>
93-
</Target>
93+
</Target>-->
9494

9595
<Target Name="RunTests">
96-
<MSBuild Projects="test\run-tests.proj"
97-
Targets="RunTests" />
98-
</Target> -->
96+
<MSBuild Projects="src\test\run-tests.proj" Targets="RunTests" />
97+
</Target>
9998

10099
<!-- Override CleanAllProjects from dir.traversal.targets and just remove the full BinDir -->
101100
<Target Name="CleanAllProjects">

build/ci/phase-template.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ phases:
3131
- ${{ if eq(parameters.name, 'MacOS') }}:
3232
- script: brew update && brew install libomp mono-libgdiplus gettext && brew link gettext --force
3333
displayName: Install runtime dependencies
34-
# - script: $(_buildScript) -$(_configuration) -runtests
35-
# displayName: Run Tests
36-
# - task: PublishTestResults@2
37-
# displayName: Publish Test Results
38-
# condition: succeededOrFailed()
39-
# inputs:
40-
# testRunner: 'vSTest'
41-
# searchFolder: '$(System.DefaultWorkingDirectory)/bin'
42-
# testResultsFiles: '**/*.trx'
43-
# testRunTitle: Machinelearning_Tests_$(_phaseName)_$(_configuration)_$(Build.BuildNumber)
44-
# configuration: $(_configuration)
45-
# mergeTestResults: true
34+
- script: $(_buildScript) -$(_configuration) -runtests
35+
displayName: Run Tests
36+
- task: PublishTestResults@2
37+
displayName: Publish Test Results
38+
condition: succeededOrFailed()
39+
inputs:
40+
testRunner: 'vSTest'
41+
searchFolder: '$(System.DefaultWorkingDirectory)/bin'
42+
testResultsFiles: '**/*.trx'
43+
testRunTitle: Machinelearning_Tests_$(_phaseName)_$(_configuration)_$(Build.BuildNumber)
44+
configuration: $(_configuration)
45+
mergeTestResults: true
4646
- task: CopyFiles@2
4747
displayName: Stage build logs
4848
condition: not(succeeded())

src/Test/Directory.Build.props

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
<Import Project="..\..\Directory.Build.props" />
3+
4+
<PropertyGroup>
5+
<VSTestLogger>trx</VSTestLogger>
6+
<VSTestResultsDirectory>$(OutputPath)</VSTestResultsDirectory>
7+
</PropertyGroup>
8+
9+
</Project>

src/Test/run-tests.proj

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project>
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
3+
4+
<ItemGroup>
5+
<Project Include="$(MSBuildThisFileDirectory)**\*.csproj" />
6+
</ItemGroup>
7+
8+
<Target Name="RunTests">
9+
<Message Importance="High" Text="Running tests ..." />
10+
<MSBuild Targets="VSTest"
11+
Projects="@(Project)"
12+
Properties="VSTestNoBuild=true" />
13+
</Target>
14+
15+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
16+
17+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
18+
19+
</Project>

0 commit comments

Comments
 (0)