Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} via ILLink", "(?i).*test\\W+${os}\\W+${architecture}\\W+${configuration}\\W+${scenario}.*")
break
}
+
+ else if (scenario == 'corefx_innerloop') {
+ if (configuration == 'Checked') {
+ Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} CoreFX Tests")
+ }
+ else {
+ Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} CoreFX Tests", "(?i).*test\\W+${os}\\W+${architecture}\\W+${configuration}\\W+CoreFX Tests.*")
+ }
+ break
+ }
+
// fall through
case 'OSX10.12':
}
break
+ case 'corefx_innerloop':
+ if (configuration == 'Checked') {
+ Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} CoreFX Tests")
+ }
+ break
+
default:
if (isJitStressScenario(scenario)) {
def displayStr = getStressModeDisplayName(scenario)
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} via ILLink", "(?i).*test\\W+${os}\\W+${architecture}\\W+${configuration}\\W+${scenario}.*")
break
case 'corefx_innerloop':
- if (configuration == 'Release' || configuration == 'Checked') {
+ if (configuration == 'Checked') {
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} CoreFX Tests")
}
break
// Create CORE_ROOT and testhost
buildCommands += "build-test.cmd ${lowerConfiguration} ${arch} buildtesthostonly"
buildCommands += "tests\\runtest.cmd ${runtestArguments} CoreFXTestsAll"
-
+
// Archive and process (only) the test results
Utilities.addArchival(newJob, "bin/Logs/**/testResults.xml")
Utilities.addXUnitDotNETResults(newJob, "bin/Logs/**/testResults.xml")
+
}
else {
def workspaceRelativeFxRoot = "_/fx"
Utilities.addXUnitDotNETResults(newJob, '**/pal_tests.xml')
}
else {
- // Corefx stress testing
- assert os == 'Ubuntu'
- assert architecture == 'x64'
- assert lowerConfiguration == 'checked'
- assert isJitStressScenario(scenario)
+ if(scenario == 'corefx_innerloop') {
+ assert os == 'Ubuntu' || 'OSX10.12'
+ assert architecture == 'x64'
- // Build coreclr
- buildCommands += "./build.sh ${lowerConfiguration} ${architecture}"
+ buildCommands += "./build.sh ${lowerConfiguration} ${architecture} skiptests"
+ buildCommands += "./build-test.sh ${lowerConfiguration} ${architecture} generatetesthostonly"
+ buildCommands += "./tests/runtest.sh --corefxtestsall --testHostDir=\${WORKSPACE}/bin/tests/${osGroup}.${architecture}.${configuration}/testhost/ --coreclr-src=\${WORKSPACE}"
+
+ break
+ // TODO - uncomment once https://github.com/dotnet/coreclr/pull/18753 has been merged
+ // Archive and process (only) the test results
+ // Utilities.addArchival(newJob, "bin/Logs/**/testResults.xml")
+ // Utilities.addXUnitDotNETResults(newJob, "bin/Logs/**/testResults.xml")
+ }
+ else {
+ // Corefx stress testing
+ assert os == 'Ubuntu'
+ assert architecture == 'x64'
+ assert lowerConfiguration == 'checked'
+ assert isJitStressScenario(scenario)
- def scriptFileName = "\$WORKSPACE/set_stress_test_env.sh"
+ // Build coreclr
+ buildCommands += "./build.sh ${lowerConfiguration} ${architecture}"
- def envScriptCmds = envScriptCreate(os, scriptFileName)
- envScriptCmds += envScriptSetStressModeVariables(os, Constants.jitStressModeScenarios[scenario], scriptFileName)
- envScriptCmds += envScriptFinalize(os, scriptFileName)
- buildCommands += envScriptCmds
+ def scriptFileName = "\$WORKSPACE/set_stress_test_env.sh"
- // Build and text corefx
- def workspaceRelativeFxRoot = "_/fx"
- def absoluteFxRoot = "\$WORKSPACE/${workspaceRelativeFxRoot}"
- def fxBranch = getFxBranch(branch)
+ def envScriptCmds = envScriptCreate(os, scriptFileName)
+ envScriptCmds += envScriptSetStressModeVariables(os, Constants.jitStressModeScenarios[scenario], scriptFileName)
+ envScriptCmds += envScriptFinalize(os, scriptFileName)
+ buildCommands += envScriptCmds
+
+ // Build and text corefx
+ def workspaceRelativeFxRoot = "_/fx"
+ def absoluteFxRoot = "\$WORKSPACE/${workspaceRelativeFxRoot}"
+ def fxBranch = getFxBranch(branch)
- buildCommands += "python -u \$WORKSPACE/tests/scripts/run-corefx-tests.py -arch ${architecture} -ci_arch ${architecture} -build_type ${configuration} -fx_root ${absoluteFxRoot} -fx_branch ${fxBranch} -env_script ${scriptFileName}"
+ buildCommands += "python -u \$WORKSPACE/tests/scripts/run-corefx-tests.py -arch ${architecture} -ci_arch ${architecture} -build_type ${configuration} -fx_root ${absoluteFxRoot} -fx_branch ${fxBranch} -env_script ${scriptFileName}"
- // Archive and process (only) the test results
- Utilities.addArchival(newJob, "${workspaceRelativeFxRoot}/bin/**/testResults.xml")
- Utilities.addXUnitDotNETResults(newJob, "${workspaceRelativeFxRoot}/bin/**/testResults.xml")
+ // Archive and process (only) the test results
+ Utilities.addArchival(newJob, "${workspaceRelativeFxRoot}/bin/**/testResults.xml")
+ Utilities.addXUnitDotNETResults(newJob, "${workspaceRelativeFxRoot}/bin/**/testResults.xml")
+ }
}
break
case 'armem':
}
break
case 'corefx_innerloop':
- if (os != 'Windows_NT'|| architecture != 'x64') {
+ if (os != 'Windows_NT' && os != 'Ubuntu' && os != 'OSX10.12') {
return false
}
- if(configuration != 'Release' && configuration != 'Checked') {
+ if (architecture != 'x64') {
return false
}
break