diff options
| author | Sven Boemer <sbomer@gmail.com> | 2017-04-26 14:02:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 14:02:36 -0700 |
| commit | dc16711b74221e4905fdd766936954ef0c1a82af (patch) | |
| tree | ad179ef114c529ad2316ee31b153a32e956dec13 /netci.groovy | |
| parent | 370ba268fc4857cbea47f7c7fc6e12c460aa6500 (diff) | |
| parent | f60551763ccabdeca6171b55957e5a059f038818 (diff) | |
| download | coreclr-dc16711b74221e4905fdd766936954ef0c1a82af.tar.gz coreclr-dc16711b74221e4905fdd766936954ef0c1a82af.tar.bz2 coreclr-dc16711b74221e4905fdd766936954ef0c1a82af.zip | |
Merge pull request #11178 from sbomer/ilrt_factoring
Refactor ildasm round trip logic
Diffstat (limited to 'netci.groovy')
| -rwxr-xr-x | netci.groovy | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/netci.groovy b/netci.groovy index 9e0339a366..45a921a9bb 100755 --- a/netci.groovy +++ b/netci.groovy @@ -1294,6 +1294,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR scenario == 'default' || scenario == 'r2r' || scenario == 'jitdiff' || + scenario == 'ilrt' || scenario == 'illink' || Constants.r2rJitStressScenarios.indexOf(scenario) != -1) { buildOpts += enableCorefxTesting ? ' skiptests' : '' @@ -1309,11 +1310,6 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR else if (scenario == 'pri1' || scenario == 'pri1r2r' || scenario == 'gcstress15_pri1r2r'|| scenario == 'coverage') { 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} ${buildOpts} skiptests" - buildCommands += "set __TestIntermediateDir=int&&build-test.cmd ${lowerConfiguration} ${arch} -ilasmroundtrip" - } else if (isLongGc(scenario)) { buildCommands += "build.cmd ${lowerConfiguration} ${arch} ${buildOpts} skiptests" buildCommands += "set __TestIntermediateDir=int&&build-test.cmd ${lowerConfiguration} ${arch}" @@ -1343,6 +1339,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR def runjitmioptsStr = '' def runjitforcerelocsStr = '' def runjitdisasmStr = '' + def runilasmroundtripStr = '' def gcstressStr = '' def runtestArguments = '' def gcTestArguments = '' @@ -1402,6 +1399,11 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR runjitdisasmStr = 'jitdisasm crossgen' } + if (scenario == 'ilrt') + { + runilasmroundtripStr = 'ilasmroundtrip' + } + if (isLongGc(scenario)) { gcTestArguments = "${scenario} sequential" } @@ -1411,7 +1413,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR illinkArguments = "link %WORKSPACE%\\linker\\linker\\bin\\netcore_Release\\netcoreapp2.0\\win10-${arch}\\publish\\illink.exe" } - runtestArguments = "${lowerConfiguration} ${arch} ${gcstressStr} ${crossgenStr} ${runcrossgentestsStr} ${runjitstressStr} ${runjitstressregsStr} ${runjitmioptsStr} ${runjitforcerelocsStr} ${runjitdisasmStr} ${gcTestArguments} ${illinkArguments} collectdumps" + runtestArguments = "${lowerConfiguration} ${arch} ${gcstressStr} ${crossgenStr} ${runcrossgentestsStr} ${runjitstressStr} ${runjitstressregsStr} ${runjitmioptsStr} ${runjitforcerelocsStr} ${runjitdisasmStr} ${runilasmroundtripStr} ${gcTestArguments} ${illinkArguments} collectdumps" if (Constants.jitStressModeScenarios.containsKey(scenario)) { def stepScriptLocation = "%WORKSPACE%\\SetStressModes.bat" @@ -2205,6 +2207,7 @@ combinedScenarios.each { scenario -> def runjitmioptsStr = '' def runjitforcerelocsStr = '' def runjitdisasmStr = '' + def runilasmroundtripStr = '' def gcstressStr = '' def illinkStr = '' @@ -2435,7 +2438,7 @@ combinedScenarios.each { scenario -> --mscorlibDir=\"\${WORKSPACE}/bin/Product/${osGroup}.${architecture}.${configuration}\" \\ --coreFxBinDir=\"\${WORKSPACE}/bin/CoreFxBinDir\" \\ --limitedDumpGeneration \\ - ${testEnvOpt} ${serverGCString} ${gcstressStr} ${crossgenStr} ${runcrossgentestsStr} ${runjitstressStr} ${runjitstressregsStr} ${runjitmioptsStr} ${runjitforcerelocsStr} ${runjitdisasmStr} ${illinkStr} ${sequentialString} ${playlistString}""") + ${testEnvOpt} ${serverGCString} ${gcstressStr} ${crossgenStr} ${runcrossgentestsStr} ${runjitstressStr} ${runjitstressregsStr} ${runjitmioptsStr} ${runjitforcerelocsStr} ${runjitdisasmStr} ${runilasmroundtripStr} ${illinkStr} ${sequentialString} ${playlistString}""") } } } |