diff options
| author | Michelle McDaniel <adiaaida@gmail.com> | 2017-04-07 08:45:30 -0700 |
|---|---|---|
| committer | Michelle McDaniel <adiaaida@gmail.com> | 2017-04-07 08:45:30 -0700 |
| commit | b9694cd51ef165354e1fc2b856012cdc894ac1d5 (patch) | |
| tree | ef184ed6c4c9a1838fe5d141a7a1a01048d6c5a3 /perf.groovy | |
| parent | 6f0bd8d2b7d956cda9c0d80315ca9a853d2a4680 (diff) | |
| download | coreclr-b9694cd51ef165354e1fc2b856012cdc894ac1d5.tar.gz coreclr-b9694cd51ef165354e1fc2b856012cdc894ac1d5.tar.bz2 coreclr-b9694cd51ef165354e1fc2b856012cdc894ac1d5.zip | |
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.
Diffstat (limited to 'perf.groovy')
| -rw-r--r-- | perf.groovy | 3 |
1 files changed, 2 insertions, 1 deletions
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}") } |