Skip to content

Commit

Permalink
Enable default Ready2Run testing in pull requests. Workaround an issu…
Browse files Browse the repository at this point in the history
…e with custom xunit.console.dll runner. (dotnet#23848)
  • Loading branch information
echesakov authored and davmason committed Apr 27, 2019
1 parent 5456193 commit 06e1f9e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
15 changes: 15 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,21 @@ jobs:
${{ if eq(variables['Build.DefinitionName'], 'coreclr-outerloop-gcstress0x3-gcstress0xc') }}:
testGroup: outerloop-gcstress0x3-gcstress0xc

# The ReadyToRun test jobs that are triggered by default from a PR.
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'coreclr-ci')) }}:
- template: eng/platform-matrix.yml
parameters:
jobTemplate: test-job.yml
buildConfig: checked
platforms:
- Linux_x64
- OSX_x64
- Windows_NT_x64
- Windows_NT_x86
jobParameters:
readyToRun: true
testGroup: innerloop

# CI
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')) }}:
- template: eng/platform-matrix.yml
Expand Down
5 changes: 5 additions & 0 deletions build-test.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,11 @@ if /I "%2" == "mscorlib.ni.dll" exit /b 0
REM don't precompile anything from CoreCLR
if /I exist %CORE_ROOT_STAGE%\%2 exit /b 0

REM Don't precompile xunit.* files
echo "%2" | findstr /b "xunit." >nul && (
exit /b 0
)

"%CORE_ROOT_STAGE%\crossgen.exe" /Platform_Assemblies_Paths "%CORE_ROOT%" /in "%1" /out "%CORE_ROOT%/temp.ni.dll" >nul 2>nul
set /a __exitCode = %errorlevel%
if "%__exitCode%" == "-2146230517" (
Expand Down
3 changes: 2 additions & 1 deletion build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@ precompile_coreroot_fx()

local overlayDir=$CORE_ROOT

filesToPrecompile=$(find -L $overlayDir -iname \*.dll -not -iname \*.ni.dll -not -iname \*-ms-win-\* -type f )
# TODO: Remove System.Xml.XDocument.dll exclusion - it was added because "custom" xunit.console.dll fails when running from Core_Root with crossgen-d framework.
filesToPrecompile=$(find -L $overlayDir -iname \*.dll -not -iname \*.ni.dll -not -iname \*-ms-win-\* -not -iname xunit.\* -not -name System.Xml.XDocument.dll -type f)
for fileToPrecompile in ${filesToPrecompile}
do
local filename=${fileToPrecompile}
Expand Down

0 comments on commit 06e1f9e

Please sign in to comment.