From 47bf26423daa4e83ff2a2b619a3c91cd92653c34 Mon Sep 17 00:00:00 2001 From: Michelle McDaniel Date: Wed, 25 Jan 2017 10:44:49 -0800 Subject: 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 and removes the Exclude option from the runtest command. --- netci.groovy | 14 ++++++++++---- 1 file 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}" } } -- cgit v1.2.3