diff options
author | Michelle McDaniel <adiaaida@gmail.com> | 2017-01-25 10:44:49 -0800 |
---|---|---|
committer | Michelle McDaniel <adiaaida@gmail.com> | 2017-01-25 11:13:47 -0800 |
commit | 47bf26423daa4e83ff2a2b619a3c91cd92653c34 (patch) | |
tree | e75e2e8f997b6367b1178ca2b1347197c2ba41c8 /netci.groovy | |
parent | f4be1f2319cde160eedc65a000e7b221c3433733 (diff) | |
download | coreclr-47bf26423daa4e83ff2a2b619a3c91cd92653c34.tar.gz coreclr-47bf26423daa4e83ff2a2b619a3c91cd92653c34.tar.bz2 coreclr-47bf26423daa4e83ff2a2b619a3c91cd92653c34.zip |
Fix x86compatjit and x86lb legs
Change 7eacdd7 moved Exclude from runtest.cmd to build-test.cmd, which
broke the x86compatjit and x86lb legs in the lab. This change splits the
builds for these jobs into build.cmd skiptests and build-tests.cmd Exclude
<exclusion file> and removes the Exclude option from the runtest command.
Diffstat (limited to 'netci.groovy')
-rwxr-xr-x | netci.groovy | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/netci.groovy b/netci.groovy index 313cd565ba..8e85c4028c 100755 --- a/netci.groovy +++ b/netci.groovy @@ -1783,13 +1783,15 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR case 'x86lb': def arch = architecture def buildOpts = '' + + // We need to explicitly run build-test.cmd with Exclude for x86compatjit and x86lb, so skip tests. if (architecture == 'x86compatjit') { arch = 'x86' - buildOpts = 'compatjitcrossgen' + buildOpts = 'compatjitcrossgen skiptests' } else if (architecture == 'x86lb') { arch = 'x86' - buildOpts = 'legacyjitcrossgen' + buildOpts = 'legacyjitcrossgen skiptests' } if (Constants.jitStressModeScenarios.containsKey(scenario) || @@ -1930,11 +1932,15 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR } else if (architecture == 'x86compatjit') { def testEnvLocation = "%WORKSPACE%\\tests\\x86\\compatjit_x86_testenv.cmd" - buildCommands += "tests\\runtest.cmd ${runtestArguments} Exclude0 x86_legacy_backend_issues.targets TestEnv ${testEnvLocation}" + def excludeLocation = "%WORKSPACE%\\tests\\x86_legacy_backend_issues.targets" + buildCommands += "build-test.cmd ${runtestArguments} Exclude ${excludeLocation}" + buildCommands += "tests\\runtest.cmd ${runtestArguments} TestEnv ${testEnvLocation}" } else if (architecture == 'x86lb') { def testEnvLocation = "%WORKSPACE%\\tests\\x86\\legacyjit_x86_testenv.cmd" - buildCommands += "tests\\runtest.cmd ${runtestArguments} Exclude0 x86_legacy_backend_issues.targets TestEnv ${testEnvLocation}" + def excludeLocation = "%WORKSPACE%\\tests\\x86_legacy_backend_issues.targets" + buildCommands += "build-test.cmd ${runtestArguments} Exclude ${excludeLocation}" + buildCommands += "tests\\runtest.cmd ${runtestArguments} TestEnv ${testEnvLocation}" } } |