diff options
| author | Michelle McDaniel <adiaaida@gmail.com> | 2017-04-17 09:39:00 -0700 |
|---|---|---|
| committer | Michelle McDaniel <adiaaida@gmail.com> | 2017-04-20 09:00:56 -0700 |
| commit | 060314b22f606c5b4e0a2a90e482f85d4ca6330f (patch) | |
| tree | b4b2dffd8a1f9a4e7c6f5813933fa1632e645e2b /perf.groovy | |
| parent | 591be50e6f74b821a6d2a7776bbae0b33a9e6809 (diff) | |
| download | coreclr-060314b22f606c5b4e0a2a90e482f85d4ca6330f.tar.gz coreclr-060314b22f606c5b4e0a2a90e482f85d4ca6330f.tar.bz2 coreclr-060314b22f606c5b4e0a2a90e482f85d4ca6330f.zip | |
Strip quotes out of BenchviewCommitName
When we pass the name of the pr to submission-metadata.py, we need the
name of the pr to not include quotes, or submission-metadata.py will fail
because it has the "wrong" parameters (because parts of the name are no
longer quoted). This change strips quotation marks out of the benchview
commit name to harden against this kind of failure.
Diffstat (limited to 'perf.groovy')
| -rw-r--r-- | perf.groovy | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/perf.groovy b/perf.groovy index cb454b33e0..5a88ff13d2 100644 --- a/perf.groovy +++ b/perf.groovy @@ -69,7 +69,9 @@ def static getOSGroup(def os) { //Do this here to remove the origin but at the front of the branch name as this is a problem for BenchView //we have to do it all as one statement because cmd is called each time and we lose the set environment variable batchFile("if [%GIT_BRANCH:~0,7%] == [origin/] (set GIT_BRANCH_WITHOUT_ORIGIN=%GIT_BRANCH:origin/=%) else (set GIT_BRANCH_WITHOUT_ORIGIN=%GIT_BRANCH%)\n" + - "py \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\\tools\\submission-metadata.py\" --name \"${benchViewName}\" --user \"dotnet-bot@microsoft.com\"\n" + + "set BENCHVIEWNAME=${benchViewName}\n" + + "set BENCHVIEWNAME=%BENCHVIEWNAME:\"=%\n" + + "py \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\\tools\\submission-metadata.py\" --name \"%BENCHVIEWNAME%\" --user \"dotnet-bot@microsoft.com\"\n" + "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}") @@ -162,6 +164,8 @@ def static getOSGroup(def os) { //Do this here to remove the origin but at the front of the branch name as this is a problem for BenchView //we have to do it all as one statement because cmd is called each time and we lose the set environment variable batchFile("if [%GIT_BRANCH:~0,7%] == [origin/] (set GIT_BRANCH_WITHOUT_ORIGIN=%GIT_BRANCH:origin/=%) else (set GIT_BRANCH_WITHOUT_ORIGIN=%GIT_BRANCH%)\n" + + "set BENCHVIEWNAME=${benchViewName}\n" + + "set BENCHVIEWNAME=%BENCHVIEWNAME:\"=%\n" + "py \"%WORKSPACE%\\Microsoft.BenchView.JSONFormat\\tools\\submission-metadata.py\" --name \"${benchViewName}\" --user \"dotnet-bot@microsoft.com\"\n" + "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\"") |