From d6a1defd1f96c5cb7e82cad75edfa57c5f625fa1 Mon Sep 17 00:00:00 2001 From: borenet Date: Wed, 19 Oct 2016 12:56:43 -0700 Subject: [PATCH] Recipe fix for buildbotless bots BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2435803003 Review-Url: https://chromiumcodereview.appspot.com/2435803003 --- infra/bots/recipe_modules/vars/api.py | 1 + infra/bots/recipes/swarm_test.expected/nobuildbot.json | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index d36ab13a9d..85e592151a 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -114,6 +114,7 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.issue = None self.patchset = None if self.no_buildbot: + self.is_trybot = False if (self.m.properties.get('issue', '') and self.m.properties.get('patchset', '')): self.is_trybot = True diff --git a/infra/bots/recipes/swarm_test.expected/nobuildbot.json b/infra/bots/recipes/swarm_test.expected/nobuildbot.json index 85bc056434..92944e0459 100644 --- a/infra/bots/recipes/swarm_test.expected/nobuildbot.json +++ b/infra/bots/recipes/swarm_test.expected/nobuildbot.json @@ -203,6 +203,7 @@ }, { "cmd": [ + "catchsegv", "[SLAVE_BUILD]/out/Debug/dm", "--undefok", "--resourcePath", @@ -492,11 +493,7 @@ "_", "gamut" ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, + "cwd": "[SLAVE_BUILD]/skia", "name": "dm" }, {