From 7bbb26fee0dcd7c53c1f5b80f62966654dd823ba Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Mon, 16 Apr 2018 07:44:41 -0400 Subject: [infra] Run recipes through Kitchen Bug: skia:7050 Change-Id: I50632444eb4ca7f9ae2b1b30b766e531092ccad4 Reviewed-on: https://skia-review.googlesource.com/82500 Commit-Queue: Eric Boren Reviewed-by: Ravi Mistry --- infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json') diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json index f440ff1825..ec2d97d55d 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json @@ -133,7 +133,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "fetch-gn" @@ -142,7 +142,7 @@ "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/out/Debug", + "[START_DIR]/build/out/Debug", "--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\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -150,7 +150,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "gn gen" }, @@ -160,14 +160,14 @@ "-k", "0", "-C", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "ninja" }, @@ -176,7 +176,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/out/Debug", + "[START_DIR]/build/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "infra_step": true, -- cgit v1.2.3