From e0f7e164eed88912ee708de57da25ad05933366f Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Wed, 31 May 2017 16:13:27 -0700 Subject: Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. depot_tools: https://crrev.com/fc1c6f4c1fac4de7647da83425f4398dde6e77ca Correct Git show's path format on Windows (manzagop@chromium.org) recipe_engine: https://crrev.com/458ce956c9d91d184e0107c5fa6b34a8267b8e9b [step_runner] run _merge_envs in simulation too. (iannucci@chromium.org) R=martiniss@chromium.org, tansell@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic938b59f304189fdfb78a466e6a4a0e47f0548a6 Reviewed-on: https://skia-review.googlesource.com/18300 Commit-Queue: Eric Boren Reviewed-by: Robbie Iannucci Reviewed-by: Eric Boren --- infra/bots/recipes/test.expected/failed_pull.json | 64 +++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'infra/bots/recipes/test.expected/failed_pull.json') diff --git a/infra/bots/recipes/test.expected/failed_pull.json b/infra/bots/recipes/test.expected/failed_pull.json index 5815a2eae4..9b83ecb188 100644 --- a/infra/bots/recipes/test.expected/failed_pull.json +++ b/infra/bots/recipes/test.expected/failed_pull.json @@ -11,7 +11,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -28,7 +28,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -85,7 +85,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -104,7 +104,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -122,7 +122,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -140,7 +140,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -157,7 +157,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -192,7 +192,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -231,7 +231,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -250,7 +250,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -268,7 +268,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -286,7 +286,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -303,7 +303,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -338,7 +338,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -377,7 +377,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -396,7 +396,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -414,7 +414,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -432,7 +432,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -449,7 +449,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -484,7 +484,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -539,7 +539,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -557,7 +557,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -596,7 +596,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -646,7 +646,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -691,7 +691,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -708,7 +708,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -725,7 +725,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -741,7 +741,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -758,7 +758,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", @@ -791,7 +791,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -811,7 +811,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, @@ -844,7 +844,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, -- cgit v1.2.3