diff options
| author | Michelle McDaniel <adiaaida@gmail.com> | 2018-01-23 08:30:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-23 08:30:28 -0800 |
| commit | 62a90aa7e52363ca56e79713443ee0b6232184d8 (patch) | |
| tree | d905f429660133c48e61fcf043df176a1dab51d8 /buildpipeline | |
| parent | 71f783ce59ccf7576f0415bd79e4ce967c19bb97 (diff) | |
| download | coreclr-62a90aa7e52363ca56e79713443ee0b6232184d8.tar.gz coreclr-62a90aa7e52363ca56e79713443ee0b6232184d8.tar.bz2 coreclr-62a90aa7e52363ca56e79713443ee0b6232184d8.zip | |
Remove hardcoded paths in linkbench scripts (#15939)
* Remove hardcoded paths in linkbench scripts
Linkbench has hardcoded paths based off of VS140COMNTOOLS, which not all
machines will have (ie, machines with only VS2017 installed). This
change removes the hardcoded paths, and replaces them with checks to
make sure the tool is on the path (which they will be if we are in a VS
environment of any kind - which we would have been in if
VS140COMNTOOLS was already set).
Diffstat (limited to 'buildpipeline')
| -rw-r--r-- | buildpipeline/perf-pipeline.groovy | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/buildpipeline/perf-pipeline.groovy b/buildpipeline/perf-pipeline.groovy index bd37307e27..862bc5356e 100644 --- a/buildpipeline/perf-pipeline.groovy +++ b/buildpipeline/perf-pipeline.groovy @@ -88,7 +88,8 @@ def windowsPerf(String arch, String config, String uploadString, String runType, } else if (scenario == 'illink') { String runXUnitPerfCommonArgs = "${runXUnitCommonArgs} -scenarioTest" - bat "py tests\\scripts\\run-xunit-perf.py ${runXUnitPerfCommonArgs} -testBinLoc bin\\tests\\${os}.${arch}.${config}\\performance\\linkbench\\linkbench -group ILLink -nowarmup" + bat "\"%VS140COMNTOOLS%\\..\\..\\VC\\vcvarsall.bat\" x86_amd64\n" + + "py tests\\scripts\\run-xunit-perf.py ${runXUnitPerfCommonArgs} -testBinLoc bin\\tests\\${os}.${arch}.${config}\\performance\\linkbench\\linkbench -group ILLink -nowarmup" } archiveArtifacts allowEmptyArchive: false, artifacts:'bin/sandbox_logs/**,machinedata.json' } |