com web/rmtools: Fix fetching pgo scenario list: include/BranchConfig.php include/BuildVC.php
| From: | Anatol Belski | Date: | Wed, 16 May 2018 16:29:22 +0000 |
| Subject: | com web/rmtools: Fix fetching pgo scenario list: include/BranchConfig.php include/BuildVC.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-26990@lists.php.net to get a copy of this message | ||
Commit: 65340563477b085f1e19f4893b4fb4010b03b2b7
Author: Anatol Belski <ab@php.net> Wed, 16 May 2018 18:29:22 +0200
Parents: b0d113311214494202dfb46ea5d07e1ef689527a
Branches: master
Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=65340563477b085f1e19f4893b4fb4010b03b2b7
Log:
Fix fetching pgo scenario list
Changed paths:
M include/BranchConfig.php
M include/BuildVC.php
Diff:
diff --git a/include/BranchConfig.php b/include/BranchConfig.php
index adb45d8..5d2a4a6 100644
--- a/include/BranchConfig.php
+++ b/include/BranchConfig.php
@@ -75,14 +75,14 @@ class BranchConfig {
}
}
- function getPgoScenarios()
+ function getPgoScenarios($build_name)
{
- if (!isset($this->config["pgo_scenario"])) {
+ if (!isset($this->builds[$build_name]) ||
!isset($this->builds[$build_name]["pgo_scenario"])) {
/* TODO obtain all from SDK.. */
return array("default", "cache");
}
- return explode(",", $this->config["pgo_scenario"]);
+ return explode(",", $this->builds[$build_name]["pgo_scenario"]);
}
function getPgoCases($build_name)
diff --git a/include/BuildVC.php b/include/BuildVC.php
index 3443221..51391db 100644
--- a/include/BuildVC.php
+++ b/include/BuildVC.php
@@ -177,7 +177,7 @@ class BuildVC {
$env = $this->env;
$env["Path"] = dirname($this->build_dir) . DIRECTORY_SEPARATOR . "deps" .
DIRECTORY_SEPARATOR . "bin;" . $env["Path"];
- foreach ($this->branch->config->getPgoScenarios() as $scenario) {
+ foreach ($this->branch->config->getPgoScenarios($this->build_name) as $scenario) {
$cases = $this->branch->config->getPgoCases($this->build_name);
$cmd = 'phpsdk_pgo --train --scenario=' . $scenario . ($cases ? (" --cases="
. implode(",", $cases)) : "");
$ret = exec_single_log($cmd, $this->build_dir, $env);