commit 53262d0ff466668bfbc76893ba5a581203269572
author Eric Boren <borenet@google.com> Mon Mar 20 15:40:12 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 21 11:07:41 2017 +0000
tree 873d85cee029724dc7db242d47e346baa25fca91
parent 3130fbb1a7aa60ac764f5ccb64a1a0ee976ea127

Roll Recipe DEPS

BUG=skia:

Change-Id: Ic89d1b49aba842fb41c82ad6fc8f5ebe787893bd
Reviewed-on: https://skia-review.googlesource.com/9884
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>

infra/bots/recipe_modules/sktest/api.py

diff --git a/infra/bots/recipe_modules/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py
index e2ebbf6..bbc8844 100644
--- a/infra/bots/recipe_modules/sktest/api.py
+++ b/infra/bots/recipe_modules/sktest/api.py
@@ -511,7 +511,6 @@
             time.sleep(waittime)
         """,
         args=[host_hashes_file],
-        cwd=api.vars.skia_dir,
         abort_on_failure=False,
         fail_build_on_failure=False,
         infra_step=True)
@@ -600,9 +599,8 @@
   if '_PreAbandonGpuContext' in api.vars.builder_cfg.get('extra_config', ''):
     args.append('--preAbandonGpuContext')
 
-  api.run(api.flavor.step, 'dm', cmd=args,
-          abort_on_failure=False,
-          env=env)
+  with api.step.context({'env': env}):
+    api.run(api.flavor.step, 'dm', cmd=args, abort_on_failure=False)
 
   if api.vars.upload_dm_results:
     # Copy images and JSON to host machine if needed.