From 356a08f7e90113b31005c02abb14662bc40bed70 Mon Sep 17 00:00:00 2001 From: Egor Chesakov Date: Thu, 15 Nov 2018 10:43:05 -0800 Subject: Combine ExcludeList in AltJit scenarios for both host and altjit archs (#21018) * Add -altjitarch command line argument in tests/runtest.cmd and -altjit_arch in tests/runtest.py * Specify altjitarch in for x86_arm_altjit and x64_arm64_altjit jobs in netci.groovy * Use AltJitArch MSBuild variable in tests/issues.targets to exclude tests based on either BuildArch or AltJitArch since both two JITs are running in altjit scenarios --- netci.groovy | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'netci.groovy') diff --git a/netci.groovy b/netci.groovy index cf230b60f0..7dad76583d 100755 --- a/netci.groovy +++ b/netci.groovy @@ -2219,9 +2219,11 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR if (architecture == 'x86_arm_altjit') { buildCommandsStr += envScriptAppendExistingScript(os, "%WORKSPACE%\\tests\\x86_arm_altjit.cmd", envScriptPath) + testOpts += " altjitarch arm" } else if (architecture == 'x64_arm64_altjit') { buildCommandsStr += envScriptAppendExistingScript(os, "%WORKSPACE%\\tests\\x64_arm64_altjit.cmd", envScriptPath) + testOpts += " altjitarch arm64" } envScriptFinalize(os, envScriptPath) @@ -2233,9 +2235,11 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR } else if (architecture == 'x86_arm_altjit') { envScriptPath = "%WORKSPACE%\\tests\\x86_arm_altjit.cmd" + testOpts += " altjitarch arm" } else if (architecture == 'x64_arm64_altjit') { envScriptPath = "%WORKSPACE%\\tests\\x64_arm64_altjit.cmd" + testOpts += " altjitarch arm64" } if (envScriptPath != '') { testOpts += " TestEnv ${envScriptPath}" -- cgit v1.2.3