Skip to content

Commit af91b9c

Browse files
authored
[ci] Use descriptive test run titles. (#926)
Add `testRunTitle:` information to the [`DotNetCoreCLI@2`][0] invocation for our tests, so that test names are easier to read in the Azure Pipelines Tests tab. This results in test groups such as: * NUnit test results (Mono - Mac) * generator (.NET - MacOS) * generator (.NET - Windows) * java-source-utils (.NET - Windows) Additionally, after auditing the test suites we run revealed we are not currently running the `Java.Interop.Tools.JavaTypeSystem-Tests.dll` unit test assembly (f658ab2); update CI to run this test suite. [0]: https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/build/dotnet-core-cli?view=azure-devops
1 parent aae8f25 commit af91b9c

File tree

4 files changed

+39
-3
lines changed

4 files changed

+39
-3
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ TESTS = \
2727
bin/Test$(CONFIGURATION)/logcat-parse-Tests.dll \
2828
bin/Test$(CONFIGURATION)/generator-Tests.dll \
2929
bin/Test$(CONFIGURATION)/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll \
30+
bin/Test$(CONFIGURATION)/Java.Interop.Tools.JavaTypeSystem-Tests.dll \
3031
bin/Test$(CONFIGURATION)/Xamarin.Android.Tools.Bytecode-Tests.dll \
3132
bin/Test$(CONFIGURATION)/Java.Interop.Tools.Generator-Tests.dll \
3233
bin/Test$(CONFIGURATION)/Xamarin.SourceWriter-Tests.dll

build-tools/automation/azure-pipelines.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,12 @@ jobs:
6767
inputs:
6868
solution: build-tools/scripts/RunNUnitTests.targets
6969
configuration: $(Build.Configuration)
70-
msbuildArguments: /p:TestAssembly="bin\Test$(Build.Configuration)\generator-Tests.dll;bin\Test$(Build.Configuration)\Java.Interop.Tools.JavaCallableWrappers-Tests.dll;bin\Test$(Build.Configuration)\logcat-parse-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.Android.Tools.Bytecode-Tests.dll;bin\Test$(Build.Configuration)\Java.Interop.Tools.Generator-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.SourceWriter-Tests.dll"
70+
msbuildArguments: /p:TestAssembly="bin\Test$(Build.Configuration)\generator-Tests.dll;bin\Test$(Build.Configuration)\Java.Interop.Tools.JavaCallableWrappers-Tests.dll;bin\Test$(Build.Configuration)\logcat-parse-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll;bin\Test$(Build.Configuration)\Java.Interop.Tools.JavaTypeSystem-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.Android.Tools.Bytecode-Tests.dll;bin\Test$(Build.Configuration)\Java.Interop.Tools.Generator-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.SourceWriter-Tests.dll"
7171
condition: succeededOrFailed()
7272

7373
- template: templates\publish-test-results.yaml
74+
parameters:
75+
platformName: .NET Framework - Windows
7476

7577
- job: windows_dotnet_build
7678
displayName: Windows - .NET Core
@@ -90,6 +92,7 @@ jobs:
9092
- template: templates\core-tests.yaml
9193
parameters:
9294
runNativeDotnetTests: true
95+
platformName: .NET - Windows
9396

9497
- template: templates\fail-on-issue.yaml
9598

@@ -141,6 +144,8 @@ jobs:
141144
displayName: Run Tests
142145
143146
- template: templates\publish-test-results.yaml
147+
parameters:
148+
platformName: Mono - Mac
144149

145150
- task: CopyFiles@2
146151
displayName: 'Copy Files to: Artifact Staging Directory'
@@ -179,5 +184,6 @@ jobs:
179184
- template: templates\core-tests.yaml
180185
parameters:
181186
runNativeTests: true
187+
platformName: .NET - MacOS
182188

183189
- template: templates\fail-on-issue.yaml

build-tools/automation/templates/core-tests.yaml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,78 @@
11
parameters:
22
condition: succeeded()
33
runNativeTests: false
4+
platformName:
45

56
steps:
67
- task: DotNetCoreCLI@2
78
displayName: 'Tests: generator'
89
inputs:
910
command: test
11+
testRunTitle: generator (${{ parameters.platformName }})
1012
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/generator-Tests.dll
1113
continueOnError: true
1214

1315
- task: DotNetCoreCLI@2
1416
displayName: 'Tests: JavaCallableWrappers'
1517
inputs:
1618
command: test
19+
testRunTitle: Java.Interop.Tools.JavaCallableWrappers (${{ parameters.platformName }})
1720
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Tools.JavaCallableWrappers-Tests.dll
1821
continueOnError: true
1922

2023
- task: DotNetCoreCLI@2
2124
displayName: 'Tests: logcat-parse'
2225
inputs:
2326
command: test
27+
testRunTitle: logcat-parse (${{ parameters.platformName }})
2428
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/logcat-parse-Tests.dll
2529
continueOnError: true
2630

2731
- task: DotNetCoreCLI@2
2832
displayName: 'Tests: ApiXmlAdjuster'
2933
inputs:
3034
command: test
35+
testRunTitle: Xamarin.Android.Tools.ApiXmlAdjuster (${{ parameters.platformName }})
3136
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll
3237
continueOnError: true
3338

39+
- task: DotNetCoreCLI@2
40+
displayName: 'Tests: JavaTypeSystem'
41+
inputs:
42+
command: test
43+
testRunTitle: Xamarin.Android.Tools.JavaTypeSystem (${{ parameters.platformName }})
44+
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Tools.JavaTypeSystem-Tests.dll
45+
continueOnError: true
46+
3447
- task: DotNetCoreCLI@2
3548
displayName: 'Tests: Bytecode'
3649
inputs:
3750
command: test
51+
testRunTitle: Xamarin.Android.Tools.Bytecode (${{ parameters.platformName }})
3852
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Xamarin.Android.Tools.Bytecode-Tests.dll
3953
continueOnError: true
4054

4155
- task: DotNetCoreCLI@2
4256
displayName: 'Tests: Java.Interop.Tools.Generator'
4357
inputs:
4458
command: test
59+
testRunTitle: Java.Interop.Tools.Generator (${{ parameters.platformName }})
4560
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Tools.Generator-Tests.dll
4661
continueOnError: true
4762

4863
- task: DotNetCoreCLI@2
4964
displayName: 'Tests: Java.Interop.Tools.JavaSource'
5065
inputs:
5166
command: test
67+
testRunTitle: Java.Interop.Tools.JavaSource (${{ parameters.platformName }})
5268
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Tools.JavaSource-Tests.dll
5369
continueOnError: true
5470

5571
- task: DotNetCoreCLI@2
5672
displayName: 'Tests: Xamarin.SourceWriter'
5773
inputs:
5874
command: test
75+
testRunTitle: Xamarin.SourceWriter (${{ parameters.platformName }})
5976
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Xamarin.SourceWriter-Tests.dll
6077
continueOnError: true
6178

@@ -64,6 +81,7 @@ steps:
6481
condition: eq('${{ parameters.runNativeTests }}', 'true')
6582
inputs:
6683
command: test
84+
testRunTitle: Java.Interop (netstandard2.0 - ${{ parameters.platformName }})
6785
arguments: bin/Test$(Build.Configuration)/Java.Interop-Tests.dll
6886
continueOnError: true
6987

@@ -72,6 +90,7 @@ steps:
7290
condition: or(eq('${{ parameters.runNativeDotnetTests }}', 'true'), eq('${{ parameters.runNativeTests }}', 'true'))
7391
inputs:
7492
command: test
93+
testRunTitle: Java.Interop (net6.0 - ${{ parameters.platformName }})
7594
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop-Tests.dll
7695
continueOnError: true
7796

@@ -80,6 +99,7 @@ steps:
8099
condition: eq('${{ parameters.runNativeTests }}', 'true')
81100
inputs:
82101
command: test
102+
testRunTitle: Java.Interop.Dynamic (${{ parameters.platformName }})
83103
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Dynamic-Tests.dll
84104
continueOnError: true
85105

@@ -88,22 +108,25 @@ steps:
88108
condition: eq('${{ parameters.runNativeTests }}', 'true')
89109
inputs:
90110
command: test
111+
testRunTitle: Java.Interop.Export (${{ parameters.platformName }})
91112
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Export-Tests.dll
92113
continueOnError: true
93114

94115
- task: DotNetCoreCLI@2
95-
displayName: 'Tests: Java.Interop'
116+
displayName: 'Tests: Java.Interop-Performance-net472'
96117
condition: eq('${{ parameters.runNativeTests }}', 'true')
97118
inputs:
98119
command: test
120+
testRunTitle: Java.Interop-Performance (net472 - ${{ parameters.platformName }})
99121
arguments: bin/Test$(Build.Configuration)/Java.Interop-PerformanceTests.dll
100122
continueOnError: true
101123

102124
- task: DotNetCoreCLI@2
103-
displayName: 'Tests: Java.Interop'
125+
displayName: 'Tests: Java.Interop-Performance-net6.0'
104126
condition: eq('${{ parameters.runNativeTests }}', 'true')
105127
inputs:
106128
command: test
129+
testRunTitle: Java.Interop-Performance (net6.0 - ${{ parameters.platformName }})
107130
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop-PerformanceTests.dll
108131
continueOnError: true
109132

@@ -119,4 +142,5 @@ steps:
119142
inputs:
120143
testResultsFormat: JUnit
121144
testResultsFiles: 'tools/java-source-utils/build/test-results/**/TEST-*.xml'
145+
testRunTitle: java-source-utils (${{ parameters.platformName }})
122146
continueOnError: true
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1+
parameters:
2+
platformName:
3+
14
steps:
25
- task: PublishTestResults@2
36
displayName: Publish NUnit Test Results
47
condition: succeededOrFailed()
58
inputs:
69
testResultsFormat: NUnit
710
testResultsFiles: TestResult-*.xml
11+
testRunTitle: NUnit test results (${{ parameters.platformName }})
812
continueOnError: true
913

1014
- task: PublishTestResults@2
1115
displayName: Publish JUnit Test Results
1216
inputs:
1317
testResultsFormat: JUnit
1418
testResultsFiles: '**/TEST-*.xml'
19+
testRunTitle: JUnit test results (${{ parameters.platformName }})
1520
continueOnError: true

0 commit comments

Comments
 (0)