From bd2e1f1ca6f511e567020bebd7479cade8e246a1 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Tue, 17 Apr 2018 11:28:46 +0000 Subject: Revert "Reland "[infra] Run recipes through Kitchen"" This reverts commit f39bbe5a31542396a8aabf8066ee46862312d7d8. Reason for revert: Broke lots of bots Original change's description: > Reland "[infra] Run recipes through Kitchen" > > Bug: skia:7050 > Change-Id: I331014c408dd5b6f7baafd78ffd12f1235c5bfe7 > Reviewed-on: https://skia-review.googlesource.com/121481 > Commit-Queue: Eric Boren > Reviewed-by: Ben Wagner > Reviewed-by: Ravi Mistry TBR=borenet@google.com,benjaminwagner@google.com,rmistry@google.com Change-Id: I4548c66a9cb0b4f105e2bc3b1c7185d14549172f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:7050 Reviewed-on: https://skia-review.googlesource.com/121463 Reviewed-by: Eric Boren Commit-Queue: Eric Boren --- ...ang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json') diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json index c47abceaac..a09291aa3a 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json @@ -24,7 +24,7 @@ "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-gn" @@ -33,7 +33,7 @@ "cmd": [ "[START_DIR]/skia/bin/gn", "gen", - "[START_DIR]/build/out/devrel", + "[START_DIR]/out/devrel", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_debug=false" ], "cwd": "[START_DIR]/skia", @@ -41,7 +41,7 @@ "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/build/out/devrel" + "[START_DIR]/out/devrel" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, @@ -209,7 +209,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/devrel/dm", + "[START_DIR]/out/devrel/dm", "--some-flag" ], "cwd": "[START_DIR]/skia", @@ -217,7 +217,7 @@ "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" }, -- cgit v1.2.3