From b9694cd51ef165354e1fc2b856012cdc894ac1d5 Mon Sep 17 00:00:00 2001 From: Michelle McDaniel Date: Fri, 7 Apr 2017 08:45:30 -0700 Subject: Fix jit32 Perf testing In the CI, we were moving compatjit.dll into the Products directory instead of the core_root directory, so the jit32 compatjit.dll was not being picked up by the build. This change moves the nuget logic to before we run runtest.cmd generatelayoutonly, so the jit32 compatjit.dll will be moved to the core_root directory along with everything else. --- perf.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'perf.groovy') diff --git a/perf.groovy b/perf.groovy index 8a90d5a34d..cb454b33e0 100644 --- a/perf.groovy +++ b/perf.groovy @@ -73,7 +73,6 @@ def static getOSGroup(def os) { "py \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\\tools\\build.py\" git --branch %GIT_BRANCH_WITHOUT_ORIGIN% --type ${runType}") batchFile("py \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\\tools\\machinedata.py\"") batchFile("set __TestIntermediateDir=int&&build.cmd ${configuration} ${architecture}") - batchFile("tests\\runtest.cmd ${configuration} ${architecture} GenerateLayoutOnly") if (arch == 'x86jit32') { @@ -82,6 +81,8 @@ def static getOSGroup(def os) { "xcopy \"%WORKSPACE%\\runtime.win7-x86.Microsoft.NETCore.Jit\\runtimes\\win7-x86\\native\\compatjit.dll\" \"%WORKSPACE%\\bin\\Product\\${os}.${architecture}.${configuration}\" /Y") } + batchFile("tests\\runtest.cmd ${configuration} ${architecture} GenerateLayoutOnly") + batchFile("tests\\scripts\\run-xunit-perf.cmd -arch ${arch} -configuration ${configuration} ${testEnv} -testBinLoc bin\\tests\\${os}.${architecture}.${configuration}\\performance\\perflab\\Perflab -library -uploadToBenchview \"%WORKSPACE%\\Microsoft.Benchview.JSONFormat\\tools\" -runtype ${runType}") batchFile("tests\\scripts\\run-xunit-perf.cmd -arch ${arch} -configuration ${configuration} ${testEnv} -testBinLoc bin\\tests\\${os}.${architecture}.${configuration}\\Jit\\Performance\\CodeQuality -uploadToBenchview \"%WORKSPACE%\\Microsoft.Benchview.JSONFormat\\tools\" -runtype ${runType}") } -- cgit v1.2.3