diff options
| author | Pat Gavlin <pagavlin@microsoft.com> | 2016-10-03 12:49:17 -0700 |
|---|---|---|
| committer | Pat Gavlin <pagavlin@microsoft.com> | 2016-10-04 13:54:29 -0700 |
| commit | 345a33c2ad93514152382ad371992adfb3b56eda (patch) | |
| tree | 393a20f050ea1584010aafd40cc18aa31282ff59 /netci.groovy | |
| parent | 89bf443d2787e1b4754718bf28e71da248ea7727 (diff) | |
| download | coreclr-345a33c2ad93514152382ad371992adfb3b56eda.tar.gz coreclr-345a33c2ad93514152382ad371992adfb3b56eda.tar.bz2 coreclr-345a33c2ad93514152382ad371992adfb3b56eda.zip | |
Add an option to crossgen S.P.CoreLib using the alt jit.
This also changes the x86/RyuJIT CI job to pass this option to
build.cmd. This leg will now use RyuJIT when crossgen'ing S.P.CoreLib
and when running tests.
Diffstat (limited to 'netci.groovy')
| -rwxr-xr-x | netci.groovy | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/netci.groovy b/netci.groovy index d20535b1b3..7661684051 100755 --- a/netci.groovy +++ b/netci.groovy @@ -1711,7 +1711,12 @@ combinedScenarios.each { scenario -> case 'x86ryujit': case 'x86lb': def arch = architecture - if (architecture == 'x86ryujit' || architecture == 'x86lb') { + def buildOpts = '' + if (architecture == 'x86ryujit') { + arch = 'x86' + buildOpts = 'altjitcrossgen' + } + else if (architecture == 'x86lb') { arch = 'x86' } @@ -1719,7 +1724,7 @@ combinedScenarios.each { scenario -> scenario == 'default' || scenario == 'r2r' || Constants.r2rJitStressScenarios.indexOf(scenario) != -1) { - buildOpts = enableCorefxTesting ? 'skiptests' : '' + buildOpts += enableCorefxTesting ? ' skiptests' : '' buildCommands += "set __TestIntermediateDir=int&&build.cmd ${lowerConfiguration} ${arch} ${buildOpts}" } @@ -1730,15 +1735,15 @@ combinedScenarios.each { scenario -> // 35 characters long. else if (scenario == 'pri1' || scenario == 'pri1r2r' || scenario == 'gcstress15_pri1r2r'|| scenario == 'coverage') { - buildCommands += "set __TestIntermediateDir=int&&build.cmd ${lowerConfiguration} ${arch} -priority=1" + buildCommands += "set __TestIntermediateDir=int&&build.cmd ${lowerConfiguration} ${arch} ${buildOpts} -priority=1" } else if (scenario == 'ilrt') { // First do the build with skiptests and then build the tests with ilasm roundtrip - buildCommands += "build.cmd ${lowerConfiguration} ${arch} skiptests" + buildCommands += "build.cmd ${lowerConfiguration} ${arch} ${buildOpts} skiptests" buildCommands += "set __TestIntermediateDir=int&&build-test.cmd ${lowerConfiguration} ${arch} -ilasmroundtrip" } else if (isLongGc(scenario)) { - buildCommands += "build.cmd ${lowerConfiguration} ${arch} skiptests" + buildCommands += "build.cmd ${lowerConfiguration} ${arch} ${buildOpts} skiptests" buildCommands += "set __TestIntermediateDir=int&&build-test.cmd ${lowerConfiguration} ${arch}" } else if (scenario == 'formatting') { |