diff options
| author | Bruce Forstall <brucefo@microsoft.com> | 2018-11-03 15:23:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-03 15:23:17 -0700 |
| commit | 1e68cab53a2855d7733ca230efad1be99bd471e2 (patch) | |
| tree | 6cb14ddb7c0f695b21cdf7f593f896c8a1fcdcd1 | |
| parent | ea5b27d97a392aeda6de31e2724e2eab0ac3a85f (diff) | |
| parent | 38c821a48834deda8074b571a5e078c12e406dd2 (diff) | |
| download | coreclr-1e68cab53a2855d7733ca230efad1be99bd471e2.tar.gz coreclr-1e68cab53a2855d7733ca230efad1be99bd471e2.tar.bz2 coreclr-1e68cab53a2855d7733ca230efad1be99bd471e2.zip | |
Merge pull request #20780 from dotnet/dev/unix_test_workflow
PMI asm diffs changes
| -rwxr-xr-x | netci.groovy | 8 | ||||
| -rw-r--r-- | tests/scripts/run-pmi-diffs.py | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/netci.groovy b/netci.groovy index 023098e365..13359598a3 100755 --- a/netci.groovy +++ b/netci.groovy @@ -2583,11 +2583,13 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR buildCommands += "python -u \${WORKSPACE}/tests/scripts/run-pmi-diffs.py -arch ${architecture} -ci_arch ${architecture} -build_type ${configuration} --skip_diffs" // ZIP what we created. + buildCommands += "zip -r product.${os}.${architecture}.${lowerConfiguration}.zip ./bin/Product/Linux.${architecture}.${configuration}" + buildCommands += "zip -r product.baseline.${os}.${architecture}.${lowerConfiguration}.zip ./_/pmi/base/bin/Product/Linux.${architecture}.${configuration}" buildCommands += "zip -r coreroot.${os}.${architecture}.${lowerConfiguration}.zip ./bin/tests/Linux.${architecture}.${configuration}/Tests/Core_Root" buildCommands += "zip -r coreroot.baseline.${os}.${architecture}.${lowerConfiguration}.zip ./_/pmi/base/bin/tests/Linux.${architecture}.${configuration}/Tests/Core_Root" // Archive the built artifacts - Utilities.addArchival(newJob, "coreroot.${os}.${architecture}.${lowerConfiguration}.zip,coreroot.baseline.${os}.${architecture}.${lowerConfiguration}.zip") + Utilities.addArchival(newJob, "product.${os}.${architecture}.${lowerConfiguration}.zip,product.baseline.${os}.${architecture}.${lowerConfiguration}.zip,coreroot.${os}.${architecture}.${lowerConfiguration}.zip,coreroot.baseline.${os}.${architecture}.${lowerConfiguration}.zip") } else { // Then, using the same docker image, build the tests and generate the CORE_ROOT layout. @@ -3358,6 +3360,8 @@ def static CreateOtherTestJob(def dslFactory, def project, def branch, def archi if (isPmiAsmDiffsScenario) { def workspaceRelativeRootLinux = "_/pmi" shell("mkdir -p ${workspaceRelativeRootLinux}") + shell("wget --progress=dot:giga ${inputUrlRoot}/product.${os}.${architecture}.${lowerConfiguration}.zip") + shell("wget --progress=dot:giga ${inputUrlRoot}/product.baseline.${os}.${architecture}.${lowerConfiguration}.zip") shell("wget --progress=dot:giga ${inputUrlRoot}/coreroot.${os}.${architecture}.${lowerConfiguration}.zip") shell("wget --progress=dot:giga ${inputUrlRoot}/coreroot.baseline.${os}.${architecture}.${lowerConfiguration}.zip") } @@ -3392,6 +3396,8 @@ def static CreateOtherTestJob(def dslFactory, def project, def branch, def archi if (isPmiAsmDiffsScenario) { // TODO: add back "-q" when we know it works + shell("unzip -o ./product.${os}.${architecture}.${lowerConfiguration}.zip || exit 0") + shell("unzip -o ./product.baseline.${os}.${architecture}.${lowerConfiguration}.zip || exit 0") shell("unzip -o ./coreroot.${os}.${architecture}.${lowerConfiguration}.zip || exit 0") shell("unzip -o ./coreroot.baseline.${os}.${architecture}.${lowerConfiguration}.zip || exit 0") } diff --git a/tests/scripts/run-pmi-diffs.py b/tests/scripts/run-pmi-diffs.py index a42d754e76..6033ed9042 100644 --- a/tests/scripts/run-pmi-diffs.py +++ b/tests/scripts/run-pmi-diffs.py @@ -565,8 +565,7 @@ def do_pmi_diffs(): # Over which set of assemblies should we generate asm? # TODO: parameterize this - asm_source_args = ["--corelib"] - # asm_source_args = ["--frameworks"] + asm_source_args = ["--frameworks", "--benchmarks"] command = ["dotnet", jitDiffPath, "diff", "--pmi", "--base", "--base_root", baseCoreClrPath, "--diff", "--diff_root", diff_root, "--arch", arch, "--build", build_type, "--tag", "1", "--noanalyze", "--output", asmRootPath] + asm_source_args + altjit_args returncode = run_command(command, my_env) |