Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ TESTS = \
bin/Test$(CONFIGURATION)/logcat-parse-Tests.dll \
bin/Test$(CONFIGURATION)/generator-Tests.dll \
bin/Test$(CONFIGURATION)/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll \
bin/Test$(CONFIGURATION)/Java.Interop.Tools.JavaTypeSystem-Tests.dll \
bin/Test$(CONFIGURATION)/Xamarin.Android.Tools.Bytecode-Tests.dll \
bin/Test$(CONFIGURATION)/Java.Interop.Tools.Generator-Tests.dll \
bin/Test$(CONFIGURATION)/Xamarin.SourceWriter-Tests.dll
Expand Down
8 changes: 7 additions & 1 deletion build-tools/automation/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,12 @@ jobs:
inputs:
solution: build-tools/scripts/RunNUnitTests.targets
configuration: $(Build.Configuration)
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"
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"
condition: succeededOrFailed()

- template: templates\publish-test-results.yaml
parameters:
platformName: .NET Framework - Windows

- job: windows_dotnet_build
displayName: Windows - .NET Core
Expand All @@ -90,6 +92,7 @@ jobs:
- template: templates\core-tests.yaml
parameters:
runNativeDotnetTests: true
platformName: .NET - Windows

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

Expand Down Expand Up @@ -141,6 +144,8 @@ jobs:
displayName: Run Tests

- template: templates\publish-test-results.yaml
parameters:
platformName: Mono - Mac

- task: CopyFiles@2
displayName: 'Copy Files to: Artifact Staging Directory'
Expand Down Expand Up @@ -179,5 +184,6 @@ jobs:
- template: templates\core-tests.yaml
parameters:
runNativeTests: true
platformName: .NET - MacOS

- template: templates\fail-on-issue.yaml
28 changes: 26 additions & 2 deletions build-tools/automation/templates/core-tests.yaml
Original file line number Diff line number Diff line change
@@ -1,61 +1,78 @@
parameters:
condition: succeeded()
runNativeTests: false
platformName:

steps:
- task: DotNetCoreCLI@2
displayName: 'Tests: generator'
inputs:
command: test
testRunTitle: generator (${{ parameters.platformName }})
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/generator-Tests.dll
continueOnError: true

- task: DotNetCoreCLI@2
displayName: 'Tests: JavaCallableWrappers'
inputs:
command: test
testRunTitle: Java.Interop.Tools.JavaCallableWrappers (${{ parameters.platformName }})
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Tools.JavaCallableWrappers-Tests.dll
continueOnError: true

- task: DotNetCoreCLI@2
displayName: 'Tests: logcat-parse'
inputs:
command: test
testRunTitle: logcat-parse (${{ parameters.platformName }})
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/logcat-parse-Tests.dll
continueOnError: true

- task: DotNetCoreCLI@2
displayName: 'Tests: ApiXmlAdjuster'
inputs:
command: test
testRunTitle: Xamarin.Android.Tools.ApiXmlAdjuster (${{ parameters.platformName }})
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll
continueOnError: true

- task: DotNetCoreCLI@2
displayName: 'Tests: JavaTypeSystem'
inputs:
command: test
testRunTitle: Xamarin.Android.Tools.JavaTypeSystem (${{ parameters.platformName }})
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Tools.JavaTypeSystem-Tests.dll
continueOnError: true

- task: DotNetCoreCLI@2
displayName: 'Tests: Bytecode'
inputs:
command: test
testRunTitle: Xamarin.Android.Tools.Bytecode (${{ parameters.platformName }})
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Xamarin.Android.Tools.Bytecode-Tests.dll
continueOnError: true

- task: DotNetCoreCLI@2
displayName: 'Tests: Java.Interop.Tools.Generator'
inputs:
command: test
testRunTitle: Java.Interop.Tools.Generator (${{ parameters.platformName }})
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Tools.Generator-Tests.dll
continueOnError: true

- task: DotNetCoreCLI@2
displayName: 'Tests: Java.Interop.Tools.JavaSource'
inputs:
command: test
testRunTitle: Java.Interop.Tools.JavaSource (${{ parameters.platformName }})
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop.Tools.JavaSource-Tests.dll
continueOnError: true

- task: DotNetCoreCLI@2
displayName: 'Tests: Xamarin.SourceWriter'
inputs:
command: test
testRunTitle: Xamarin.SourceWriter (${{ parameters.platformName }})
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Xamarin.SourceWriter-Tests.dll
continueOnError: true

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

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

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

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

- task: DotNetCoreCLI@2
displayName: 'Tests: Java.Interop'
displayName: 'Tests: Java.Interop-Performance-net472'
condition: eq('${{ parameters.runNativeTests }}', 'true')
inputs:
command: test
testRunTitle: Java.Interop-Performance (net472 - ${{ parameters.platformName }})
arguments: bin/Test$(Build.Configuration)/Java.Interop-PerformanceTests.dll
continueOnError: true

- task: DotNetCoreCLI@2
displayName: 'Tests: Java.Interop'
displayName: 'Tests: Java.Interop-Performance-net6.0'
condition: eq('${{ parameters.runNativeTests }}', 'true')
inputs:
command: test
testRunTitle: Java.Interop-Performance (net6.0 - ${{ parameters.platformName }})
arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop-PerformanceTests.dll
continueOnError: true

Expand All @@ -119,4 +142,5 @@ steps:
inputs:
testResultsFormat: JUnit
testResultsFiles: 'tools/java-source-utils/build/test-results/**/TEST-*.xml'
testRunTitle: java-source-utils (${{ parameters.platformName }})
continueOnError: true
5 changes: 5 additions & 0 deletions build-tools/automation/templates/publish-test-results.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
parameters:
platformName:

steps:
- task: PublishTestResults@2
displayName: Publish NUnit Test Results
condition: succeededOrFailed()
inputs:
testResultsFormat: NUnit
testResultsFiles: TestResult-*.xml
testRunTitle: NUnit test results (${{ parameters.platformName }})
continueOnError: true

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