From 9599b0fd91778955786fafdcda97e4adb65cabf7 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Tue, 17 Apr 2018 15:55:57 -0400 Subject: Reland "[infra] Run recipes through Kitchen" Bug: skia:7050 Change-Id: Icf0bcfbbc505c90a4e8cee7437037a3037bdf33b Reviewed-on: https://skia-review.googlesource.com/121781 Reviewed-by: Ben Wagner Commit-Queue: Eric Boren --- ...One-GPU-Mali400MP2-arm-Release-All-Android.json | 102 ++++++++++++------- ...axyS6-GPU-MaliT760-arm64-Debug-All-Android.json | 100 +++++++++++------- ...930A-GPU-Adreno530-arm64-Debug-All-Android.json | 100 +++++++++++------- ...Shield-GPU-TegraX1-arm64-Debug-All-Android.json | 100 +++++++++++------- ...d-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json | 100 +++++++++++------- ...xus5-GPU-Adreno330-arm-Release-All-Android.json | 102 ++++++++++++------- ...x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json | 72 ++++++------- ...GPU-Adreno418-arm64-Debug-All-Android_ASAN.json | 72 ++++++------- ...no418-arm64-Debug-All-Android_NoGPUThreads.json | 112 +++++++++++++-------- ...-Nexus7-CPU-Tegra3-arm-Release-All-Android.json | 102 ++++++++++++------- ...ng-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json | 102 ++++++++++++------- ...yer-CPU-Moorefield-x86-Release-All-Android.json | 104 ++++++++++++------- ...GPU-PowerVR-x86-Release-All-Android_Vulkan.json | 104 ++++++++++++------- ...GPU-Adreno530-arm64-Debug-All-Android_CCPR.json | 108 ++++++++++++-------- ...U-Adreno530-arm64-Debug-All-Android_Vulkan.json | 108 ++++++++++++-------- ...omebookFlipC100-GPU-MaliT764-arm-Debug-All.json | 90 +++++++++++------ ...onvertible-GPU-PowerVRGX6250-arm-Debug-All.json | 90 +++++++++++------ ...-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json | 84 ++++++++++------ ...-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json | 84 ++++++++++------ ...9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json | 4 +- ...9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json | 4 +- ...ug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json | 36 ++++++- ...CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json | 6 +- ...lease-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json | 36 ++++++- ...Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json | 4 +- ...est-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json | 36 ++++++- ...-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json | 36 ++++++- ...acBook10.1-GPU-IntelHD615-x86_64-Debug-All.json | 36 ++++++- ...-IntelHD615-x86_64-Release-All-NativeFonts.json | 36 ++++++- ...ookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json | 36 ++++++- ...lang-MacMini7.1-CPU-AVX-x86_64-Release-All.json | 36 ++++++- ...telIris5100-x86_64-Debug-All-CommandBuffer.json | 36 ++++++- ...g-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json | 36 ++++++- ...H-GPU-IntelHD405-x86_64-Release-All-Vulkan.json | 36 ++++++- ...K-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json | 36 ++++++- ...15TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json | 36 ++++++- ...-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json | 36 ++++++- ...-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json | 36 ++++++- ...uadroP400-x86_64-Debug-All-Vulkan_Coverage.json | 6 +- ...grind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json | 4 +- ...nd_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json | 4 +- ...64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json | 4 +- ...2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json | 36 ++++++- ...-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan.json | 36 ++++++- ...64-Release-All-ReleaseAndAbandonGpuContext.json | 36 ++++++- ...7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts.json | 36 ++++++- ...-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json | 36 ++++++- ...YK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json | 36 ++++++- ...K-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json | 36 ++++++- ...H-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json | 36 ++++++- ...huttleA-GPU-GTX660-x86_64-Debug-All-Vulkan.json | 36 ++++++- ...ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json | 36 ++++++- ...g-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json | 36 ++++++- ...10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All.json | 36 ++++++- ...6-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json | 36 ++++++- ...6-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json | 36 ++++++- ...6-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json | 36 ++++++- ...Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All.json | 36 ++++++- ...Clang-iPadPro-GPU-GT7800-arm64-Release-All.json | 98 ++++++++++++------ infra/bots/recipes/test.expected/failed_dm.json | 36 ++++++- .../recipes/test.expected/failed_get_hashes.json | 102 ++++++++++++------- infra/bots/recipes/test.expected/failed_pull.json | 104 ++++++++++++------- infra/bots/recipes/test.expected/failed_push.json | 10 +- .../bots/recipes/test.expected/internal_bot_1.json | 100 +++++++++++------- .../bots/recipes/test.expected/internal_bot_2.json | 100 +++++++++++------- infra/bots/recipes/test.expected/trybot.json | 36 ++++++- 66 files changed, 2561 insertions(+), 1013 deletions(-) (limited to 'infra/bots/recipes/test.expected') diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json index 981e414c29..d81c22af54 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -620,7 +648,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -666,7 +694,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "Set CPU 0's governor to hotplug", @@ -701,7 +729,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -709,7 +737,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm" @@ -729,7 +757,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "write dm.sh" @@ -746,7 +774,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm.sh" @@ -762,7 +790,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "clear log" @@ -779,7 +807,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -803,30 +831,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Release" + "[START_DIR]/build/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "dump log", @@ -860,7 +888,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json index fb79145fe3..9214093be9 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json @@ -12,7 +12,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": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,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": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,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": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,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": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,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": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,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": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,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": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,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": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,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": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,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": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,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": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,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": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,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": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,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": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,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": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,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": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,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": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,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": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,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": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "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": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,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": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,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": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,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": "get uninteresting hashes", @@ -620,7 +648,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": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -657,7 +685,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -665,7 +693,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": "push dm" @@ -685,7 +713,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": "write dm.sh" @@ -702,7 +730,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": "push dm.sh" @@ -718,7 +746,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": "clear log" @@ -735,7 +763,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -759,30 +787,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "env": { "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": "dump log", @@ -816,7 +844,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": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json index 76fb94b7eb..f53c4b336b 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json @@ -12,7 +12,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": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,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": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,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": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,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": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,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": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,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": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,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": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,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": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,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": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,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": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,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": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,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": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,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": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,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": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,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": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,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": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,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": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,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": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,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": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "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": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,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": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,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": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,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": "get uninteresting hashes", @@ -620,7 +648,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": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -657,7 +685,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -665,7 +693,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": "push dm" @@ -685,7 +713,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": "write dm.sh" @@ -702,7 +730,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": "push dm.sh" @@ -718,7 +746,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": "clear log" @@ -735,7 +763,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -759,30 +787,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "env": { "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": "dump log", @@ -816,7 +844,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": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json index a9b8132cfd..ebe9acfe31 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json @@ -12,7 +12,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": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,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": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,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": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,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": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,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": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,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": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,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": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,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": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,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": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,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": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,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": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,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": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,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": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,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": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,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": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,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": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,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": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,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": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,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": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "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": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,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": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,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": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,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": "get uninteresting hashes", @@ -620,7 +648,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": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -657,7 +685,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -665,7 +693,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": "push dm" @@ -685,7 +713,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": "write dm.sh" @@ -702,7 +730,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": "push dm.sh" @@ -718,7 +746,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": "clear log" @@ -735,7 +763,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -759,30 +787,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "env": { "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": "dump log", @@ -816,7 +844,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": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json index a297e6f01b..52fb6536d7 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json @@ -12,7 +12,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": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,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": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,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": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,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": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,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": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,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": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,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": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,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": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,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": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,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": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,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": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,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": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,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": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,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": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,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": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,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": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,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": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,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": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,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": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "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": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,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": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,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": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,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": "get uninteresting hashes", @@ -620,7 +648,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": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -657,7 +685,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -665,7 +693,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": "push dm" @@ -685,7 +713,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": "write dm.sh" @@ -702,7 +730,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": "push dm.sh" @@ -718,7 +746,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": "clear log" @@ -735,7 +763,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -759,30 +787,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "env": { "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": "dump log", @@ -816,7 +844,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": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json index ffe838eb14..448c8f6c8a 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -620,7 +648,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -666,7 +694,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -701,7 +729,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -709,7 +737,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm" @@ -729,7 +757,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "write dm.sh" @@ -746,7 +774,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm.sh" @@ -762,7 +790,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "clear log" @@ -779,7 +807,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -803,30 +831,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Release" + "[START_DIR]/build/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "dump log", @@ -860,7 +888,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json index 507a956260..e443ce3065 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json @@ -12,7 +12,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": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,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": "Setting up device to run ASAN", @@ -102,7 +102,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": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -165,7 +165,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": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -184,7 +184,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": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -202,7 +202,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": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -220,7 +220,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": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -237,7 +237,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": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -272,7 +272,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": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -317,7 +317,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": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -336,7 +336,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": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -354,7 +354,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": "rm /sdcard/revenge_of_the_skiabot/images" @@ -372,7 +372,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": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -389,7 +389,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": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -424,7 +424,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": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -469,7 +469,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": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -488,7 +488,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": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -506,7 +506,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": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -524,7 +524,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": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -541,7 +541,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": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -576,7 +576,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": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -622,7 +622,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": "Enabling CPU 0", @@ -674,7 +674,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": "Enabling CPU 1", @@ -726,7 +726,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": "Enabling CPU 2", @@ -778,7 +778,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": "Enabling CPU 3", @@ -830,7 +830,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": "Set CPU 4's governor to ondemand", @@ -874,7 +874,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": "Set CPU 0's governor to ondemand", @@ -909,7 +909,7 @@ "cmd": [ "/opt/infra-android/tools/adb", "push", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -917,7 +917,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": "push dm" @@ -937,7 +937,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": "write dm.sh" @@ -954,7 +954,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": "push dm.sh" @@ -970,7 +970,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": "clear log" @@ -987,7 +987,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -1011,13 +1011,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "env": { "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": "dump log", @@ -1051,7 +1051,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": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json index 97d742fc6d..7cd3f97070 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json @@ -12,7 +12,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": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,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": "Setting up device to run ASAN", @@ -102,7 +102,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": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -165,7 +165,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": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -184,7 +184,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": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -202,7 +202,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": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -220,7 +220,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": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -237,7 +237,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": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -272,7 +272,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": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -317,7 +317,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": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -336,7 +336,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": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -354,7 +354,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": "rm /sdcard/revenge_of_the_skiabot/images" @@ -372,7 +372,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": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -389,7 +389,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": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -424,7 +424,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": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -469,7 +469,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": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -488,7 +488,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": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -506,7 +506,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": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -524,7 +524,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": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -541,7 +541,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": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -576,7 +576,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": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -622,7 +622,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": "Enabling CPU 0", @@ -674,7 +674,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": "Enabling CPU 1", @@ -726,7 +726,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": "Enabling CPU 2", @@ -778,7 +778,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": "Enabling CPU 3", @@ -830,7 +830,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": "Set CPU 4's governor to ondemand", @@ -874,7 +874,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": "Set CPU 0's governor to ondemand", @@ -909,7 +909,7 @@ "cmd": [ "/opt/infra-android/tools/adb", "push", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -917,7 +917,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": "push dm" @@ -937,7 +937,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": "write dm.sh" @@ -954,7 +954,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": "push dm.sh" @@ -970,7 +970,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": "clear log" @@ -987,7 +987,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -1011,13 +1011,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "env": { "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": "dump log", @@ -1051,7 +1051,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": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json index 4eb186dfc4..37e6e1fb1c 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json @@ -12,7 +12,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": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,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": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,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": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,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": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,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": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,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": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,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": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,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": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,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": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,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": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,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": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,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": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,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": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,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": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,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": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,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": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,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": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,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": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,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": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "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": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/opt/infra-android/tools/adb", @@ -521,7 +549,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": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,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": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,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": "get uninteresting hashes", @@ -620,7 +648,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": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -666,7 +694,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": "Enabling CPU 0", @@ -718,7 +746,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": "Enabling CPU 1", @@ -770,7 +798,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": "Enabling CPU 2", @@ -822,7 +850,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": "Enabling CPU 3", @@ -874,7 +902,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": "Set CPU 4's governor to ondemand", @@ -918,7 +946,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": "Set CPU 0's governor to ondemand", @@ -953,7 +981,7 @@ "cmd": [ "/opt/infra-android/tools/adb", "push", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -961,7 +989,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": "push dm" @@ -981,7 +1009,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": "write dm.sh" @@ -998,7 +1026,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": "push dm.sh" @@ -1014,7 +1042,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": "clear log" @@ -1031,7 +1059,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -1055,30 +1083,30 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "env": { "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": "dump log", @@ -1112,7 +1140,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": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json index 5c4092762c..90dbcff05c 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -620,7 +648,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -666,7 +694,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -701,7 +729,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -709,7 +737,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm" @@ -729,7 +757,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "write dm.sh" @@ -746,7 +774,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm.sh" @@ -762,7 +790,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "clear log" @@ -779,7 +807,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -803,30 +831,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Release" + "[START_DIR]/build/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "dump log", @@ -860,7 +888,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json index e0b4ac306f..065348f6cb 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json @@ -12,7 +12,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": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,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": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,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": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,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": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,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": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,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": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,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": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,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": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,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": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,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": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,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": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,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": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,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": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,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": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,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": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,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": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,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": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,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": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,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": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "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": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,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": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,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": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,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": "get uninteresting hashes", @@ -620,7 +648,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": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -666,7 +694,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": "Set CPU 0's governor to ondemand", @@ -701,7 +729,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -709,7 +737,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": "push dm" @@ -729,7 +757,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": "write dm.sh" @@ -746,7 +774,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": "push dm.sh" @@ -762,7 +790,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": "clear log" @@ -779,7 +807,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -803,30 +831,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "env": { "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": "dump log", @@ -860,7 +888,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": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json index ac7599cecb..218475bade 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -620,7 +648,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -666,7 +694,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -710,7 +738,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "Set CPU 2's governor to ondemand", @@ -745,7 +773,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -753,7 +781,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm" @@ -773,7 +801,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "write dm.sh" @@ -790,7 +818,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm.sh" @@ -806,7 +834,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "clear log" @@ -823,7 +851,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -847,30 +875,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Release" + "[START_DIR]/build/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "dump log", @@ -904,7 +932,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json index a577a36265..5b4d2a978c 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -620,7 +648,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -666,7 +694,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -710,7 +738,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "Set CPU 2's governor to ondemand", @@ -745,7 +773,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -753,7 +781,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm" @@ -773,7 +801,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "write dm.sh" @@ -790,7 +818,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm.sh" @@ -806,7 +834,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "clear log" @@ -823,7 +851,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -847,30 +875,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Release" + "[START_DIR]/build/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "dump log", @@ -904,7 +932,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json index b7a33cb8a8..5cc2e23a49 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json @@ -12,7 +12,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": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,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": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,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": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,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": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,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": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,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": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,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": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,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": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,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": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,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": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,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": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,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": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,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": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,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": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,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": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,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": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,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": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,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": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,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": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "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": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,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": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,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": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,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": "get uninteresting hashes", @@ -620,7 +648,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": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -666,7 +694,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": "Enabling CPU 0", @@ -718,7 +746,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": "Enabling CPU 1", @@ -770,7 +798,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": "Set CPU 2's governor to ondemand", @@ -814,7 +842,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": "Set CPU 0's governor to ondemand", @@ -849,7 +877,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -857,7 +885,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": "push dm" @@ -877,7 +905,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": "write dm.sh" @@ -894,7 +922,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": "push dm.sh" @@ -910,7 +938,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": "clear log" @@ -927,7 +955,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -951,30 +979,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "env": { "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": "dump log", @@ -1008,7 +1036,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": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json index e4efbbd123..1ba03640a3 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json @@ -12,7 +12,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": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,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": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,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": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,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": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,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": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,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": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,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": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,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": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,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": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,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": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,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": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,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": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,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": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,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": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,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": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,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": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,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": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,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": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,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": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "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": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,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": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,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": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,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": "get uninteresting hashes", @@ -620,7 +648,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": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -666,7 +694,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": "Enabling CPU 0", @@ -718,7 +746,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": "Enabling CPU 1", @@ -770,7 +798,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": "Set CPU 2's governor to ondemand", @@ -814,7 +842,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": "Set CPU 0's governor to ondemand", @@ -849,7 +877,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -857,7 +885,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": "push dm" @@ -877,7 +905,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": "write dm.sh" @@ -894,7 +922,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": "push dm.sh" @@ -910,7 +938,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": "clear log" @@ -927,7 +955,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -951,30 +979,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "env": { "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": "dump log", @@ -1008,7 +1036,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": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All.json b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All.json index 581821c4db..90e8f3399c 100644 --- a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All.json @@ -9,7 +9,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": "read chromeos ip", @@ -39,7 +39,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": "mkdir /home/chronos/user/resources" @@ -63,7 +63,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": "remount /home/chronos/user/ as exec" @@ -84,7 +84,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": "rm /home/chronos/user/bin" @@ -105,7 +105,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": "mkdir /home/chronos/user/bin" @@ -173,7 +173,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": "read /home/chronos/user/SKP_VERSION", @@ -195,7 +195,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": "rm /home/chronos/user/SKP_VERSION" @@ -216,7 +216,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": "rm /home/chronos/user/skps" @@ -237,7 +237,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": "mkdir /home/chronos/user/skps" @@ -325,7 +325,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": "read /home/chronos/user/SK_IMAGE_VERSION", @@ -347,7 +347,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": "rm /home/chronos/user/SK_IMAGE_VERSION" @@ -368,7 +368,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": "rm /home/chronos/user/images" @@ -389,7 +389,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": "mkdir /home/chronos/user/images" @@ -477,7 +477,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": "read /home/chronos/user/SVG_VERSION", @@ -499,7 +499,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": "rm /home/chronos/user/SVG_VERSION" @@ -520,7 +520,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": "rm /home/chronos/user/svgs" @@ -541,7 +541,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": "mkdir /home/chronos/user/svgs" @@ -586,6 +586,34 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "ssh", @@ -602,7 +630,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": "rm /home/chronos/user/dm_out" @@ -623,7 +651,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": "mkdir /home/chronos/user/dm_out" @@ -654,7 +682,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": "get uninteresting hashes", @@ -748,13 +776,13 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "env": { "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": "rmtree dm" @@ -769,13 +797,13 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "env": { "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": "makedirs dm" @@ -785,17 +813,17 @@ "python", "-u", "\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "foo@127.0.0.1:/home/chronos/user/bin/dm" ], "env": { "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": "scp [START_DIR]/out/Debug/dm foo@127.0.0.1:/home/chronos/user/bin/dm", + "name": "scp [START_DIR]/build/out/Debug/dm foo@127.0.0.1:/home/chronos/user/bin/dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", @@ -822,7 +850,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": "chmod dm" @@ -993,7 +1021,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": "dm" @@ -1004,10 +1032,10 @@ "-u", "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n", "foo@127.0.0.1:/home/chronos/user/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "infra_step": true, - "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm", + "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", diff --git a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json index 681c8cece1..4407e52f3b 100644 --- a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json @@ -9,7 +9,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": "read chromeos ip", @@ -39,7 +39,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": "mkdir /home/chronos/user/resources" @@ -63,7 +63,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": "remount /home/chronos/user/ as exec" @@ -84,7 +84,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": "rm /home/chronos/user/bin" @@ -105,7 +105,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": "mkdir /home/chronos/user/bin" @@ -173,7 +173,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": "read /home/chronos/user/SKP_VERSION", @@ -195,7 +195,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": "rm /home/chronos/user/SKP_VERSION" @@ -216,7 +216,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": "rm /home/chronos/user/skps" @@ -237,7 +237,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": "mkdir /home/chronos/user/skps" @@ -325,7 +325,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": "read /home/chronos/user/SK_IMAGE_VERSION", @@ -347,7 +347,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": "rm /home/chronos/user/SK_IMAGE_VERSION" @@ -368,7 +368,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": "rm /home/chronos/user/images" @@ -389,7 +389,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": "mkdir /home/chronos/user/images" @@ -477,7 +477,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": "read /home/chronos/user/SVG_VERSION", @@ -499,7 +499,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": "rm /home/chronos/user/SVG_VERSION" @@ -520,7 +520,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": "rm /home/chronos/user/svgs" @@ -541,7 +541,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": "mkdir /home/chronos/user/svgs" @@ -586,6 +586,34 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "ssh", @@ -602,7 +630,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": "rm /home/chronos/user/dm_out" @@ -623,7 +651,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": "mkdir /home/chronos/user/dm_out" @@ -654,7 +682,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": "get uninteresting hashes", @@ -748,13 +776,13 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "env": { "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": "rmtree dm" @@ -769,13 +797,13 @@ "ensure-directory", "--mode", "0777", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "env": { "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": "makedirs dm" @@ -785,17 +813,17 @@ "python", "-u", "\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "foo@127.0.0.1:/home/chronos/user/bin/dm" ], "env": { "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": "scp [START_DIR]/out/Debug/dm foo@127.0.0.1:/home/chronos/user/bin/dm", + "name": "scp [START_DIR]/build/out/Debug/dm foo@127.0.0.1:/home/chronos/user/bin/dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", @@ -822,7 +850,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": "chmod dm" @@ -995,7 +1023,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": "dm" @@ -1006,10 +1034,10 @@ "-u", "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n", "foo@127.0.0.1:/home/chronos/user/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "infra_step": true, - "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm", + "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json index 08af82c5be..175b294b2f 100644 --- a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json @@ -9,7 +9,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read chromecast ip", @@ -33,7 +33,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555" @@ -51,7 +51,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /cache/skia/resources" @@ -69,7 +69,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /cache/skia/bin" @@ -86,7 +86,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /cache/skia/resources", @@ -152,7 +152,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /cache/skia/SKP_VERSION", @@ -171,7 +171,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /cache/skia/SKP_VERSION" @@ -189,7 +189,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /cache/skia/skps" @@ -207,7 +207,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /cache/skia/skps" @@ -224,7 +224,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /cache/skia/skps", @@ -262,11 +262,39 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /cache/skia/SKP_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "adb", @@ -280,7 +308,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /dev/shm/skia/dm_out" @@ -298,7 +326,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /dev/shm/skia/dm_out" @@ -329,7 +357,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -379,7 +407,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /cache/skia/uninteresting_hashes.txt" @@ -416,7 +444,7 @@ "cmd": [ "adb", "push", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "/cache/skia/bin" ], "cwd": "[START_DIR]/skia", @@ -424,7 +452,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm" @@ -510,7 +538,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm" }, @@ -519,17 +547,17 @@ "adb", "pull", "/dev/shm/skia/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, - "name": "pull /dev/shm/skia/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /dev/shm/skia/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ @@ -547,7 +575,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "Delete executables" @@ -562,7 +590,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "disconnect" @@ -577,7 +605,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555 (2)" @@ -587,13 +615,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Release" + "[START_DIR]/build/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "dump log", @@ -626,7 +654,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "disconnect (2)" @@ -641,7 +669,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json index 1fbe113a1e..376277abdf 100644 --- a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json @@ -9,7 +9,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read chromecast ip", @@ -33,7 +33,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555" @@ -51,7 +51,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /cache/skia/resources" @@ -69,7 +69,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /cache/skia/bin" @@ -86,7 +86,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /cache/skia/resources", @@ -152,7 +152,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /cache/skia/SKP_VERSION", @@ -171,7 +171,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /cache/skia/SKP_VERSION" @@ -189,7 +189,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /cache/skia/skps" @@ -207,7 +207,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /cache/skia/skps" @@ -224,7 +224,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /cache/skia/skps", @@ -262,11 +262,39 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /cache/skia/SKP_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "adb", @@ -280,7 +308,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /dev/shm/skia/dm_out" @@ -298,7 +326,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /dev/shm/skia/dm_out" @@ -329,7 +357,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -379,7 +407,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /cache/skia/uninteresting_hashes.txt" @@ -416,7 +444,7 @@ "cmd": [ "adb", "push", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "/cache/skia/bin" ], "cwd": "[START_DIR]/skia", @@ -424,7 +452,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm" @@ -617,7 +645,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm" }, @@ -626,17 +654,17 @@ "adb", "pull", "/dev/shm/skia/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, - "name": "pull /dev/shm/skia/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /dev/shm/skia/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ @@ -654,7 +682,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "Delete executables" @@ -669,7 +697,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "disconnect" @@ -684,7 +712,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555 (2)" @@ -694,13 +722,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Release" + "[START_DIR]/build/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "dump log", @@ -733,7 +761,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "disconnect (2)" @@ -748,7 +776,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json index fe9db8637c..2eb8dc731a 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json @@ -117,7 +117,7 @@ "-u", "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -431,7 +431,7 @@ "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/lib", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/out", + "SKIA_OUT": "[START_DIR]/build/out", "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json index 42b443687f..96c90fe23e 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json @@ -117,7 +117,7 @@ "-u", "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -426,7 +426,7 @@ "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/msan:[START_DIR]/clang_linux/lib", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index adcdfe057f..fe97a1a059 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,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": "get uninteresting hashes", @@ -182,7 +210,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -225,7 +253,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -494,7 +522,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json index 9cce7f83ae..0e57f1262a 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json @@ -118,7 +118,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -427,9 +427,9 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "LLVM_PROFILE_FILE": "[CUSTOM_[SWARM_OUT_DIR]]/shard_00_10.profraw", + "LLVM_PROFILE_FILE": "[START_DIR]/[SWARM_OUT_DIR]/shard_00_10.profraw", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json index 7a9c421f5d..abd76af9ed 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -182,7 +210,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -225,7 +253,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -245,7 +273,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json index 4208c385d3..3d70ca33b2 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json @@ -117,7 +117,7 @@ "-u", "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -428,7 +428,7 @@ "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/lib", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/out", + "SKIA_OUT": "[START_DIR]/build/out", "TSAN_OPTIONS": "report_signal_unsafe=0" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json index 2e6c70426f..f31df450ec 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,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": "get uninteresting hashes", @@ -182,7 +210,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -223,7 +251,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -492,7 +520,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json index fbe89d5f91..b5f36cadaa 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,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": "get uninteresting hashes", @@ -182,7 +210,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -223,7 +251,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -490,7 +518,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json index fd7763fcae..308f3e18bb 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,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": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -218,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -463,7 +491,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json index aea20f5fe0..bd437a9855 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -456,7 +484,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json index ee732d7022..7c8d188f65 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,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": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -218,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -464,7 +492,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json index b52082542e..74c6bfad08 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -218,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -563,7 +591,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json index 53aa5371ca..8b2d6f1b1d 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,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": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -459,7 +487,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json index 0066b2e2b3..f406368cb2 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,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": "get uninteresting hashes", @@ -182,7 +210,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -223,7 +251,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -396,7 +424,7 @@ "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out", + "SKIA_OUT": "[START_DIR]/build/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json index da58095bef..26681ddbde 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -182,7 +210,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -225,7 +253,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -408,7 +436,7 @@ "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_release:[START_DIR]/linux_vulkan_sdk/lib", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_release", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", - "SKIA_OUT": "[START_DIR]/out", + "SKIA_OUT": "[START_DIR]/build/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_release/intel_icd.x86_64.json" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json index b3c286fdad..c99929bed2 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,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": "get uninteresting hashes", @@ -182,7 +210,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -225,7 +253,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -391,7 +419,7 @@ "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug:[START_DIR]/linux_vulkan_sdk/lib", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", - "SKIA_OUT": "[START_DIR]/out", + "SKIA_OUT": "[START_DIR]/build/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json index f592cf42bb..4501c6940d 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,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": "get uninteresting hashes", @@ -182,7 +210,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -223,7 +251,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -396,7 +424,7 @@ "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out", + "SKIA_OUT": "[START_DIR]/build/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json index 011b2cd919..a97dd0cd5e 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,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": "get uninteresting hashes", @@ -182,7 +210,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -225,7 +253,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -349,7 +377,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json index f4d1e51f26..a7108a3cfe 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,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": "get uninteresting hashes", @@ -182,7 +210,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -225,7 +253,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -346,7 +374,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json index d746145f6b..de4a3b08ee 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json @@ -118,7 +118,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -280,9 +280,9 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_sdk/lib", - "LLVM_PROFILE_FILE": "[CUSTOM_[SWARM_OUT_DIR]]/All.profraw", + "LLVM_PROFILE_FILE": "[START_DIR]/[SWARM_OUT_DIR]/All.profraw", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json index bfe64b25ad..37cc8599b9 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -120,7 +120,7 @@ "--error-exitcode=1", "--num-callers=40", "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -295,7 +295,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out", + "SKIA_OUT": "[START_DIR]/build/out", "VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind" }, "name": "dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json index c40b966e1f..82c98d76bf 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -120,7 +120,7 @@ "--error-exitcode=1", "--num-callers=40", "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -296,7 +296,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out", + "SKIA_OUT": "[START_DIR]/build/out", "VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind" }, "name": "dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json index a2e93189dd..9090738b46 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json @@ -120,7 +120,7 @@ "--error-exitcode=1", "--num-callers=40", "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -294,7 +294,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out", + "SKIA_OUT": "[START_DIR]/build/out", "VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind" }, "name": "dm" diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json index d351e05816..eccd361a86 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug_x64\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -392,7 +420,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan.json index 0ef5611a61..851d83a48d 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug_x64\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -385,7 +413,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json index 7ec8ac3a5f..aea7be0377 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Release_x64\\dm", + "[START_DIR]\\build\\out\\Release_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -393,7 +421,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts.json index 0114c6ab69..166036cd7f 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug_x64\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -289,7 +317,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json index c8ea64d596..efcfebe74d 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug_x64\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -290,7 +318,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json index 9a304e562a..886a408d30 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug_x64\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -460,7 +488,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json index a3b34b5593..b899f4831b 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug_x64\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -545,7 +573,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json index ac446cc4aa..58ad83df15 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Release_x64\\dm", + "[START_DIR]\\build\\out\\Release_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -392,7 +420,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan.json index 247e9ec57f..99142fe202 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug_x64\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -385,7 +413,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json index f059b76480..b567c1cf02 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug_x64\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -390,7 +418,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json index f0e8a91f85..37f91d9d1c 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug_x64\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -385,7 +413,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All.json index da94a89f4e..d4b728e89e 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug_x64\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -218,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -391,7 +419,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json index f9f7b7a663..8e07ec9d3d 100644 --- a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json +++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug_x64\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -304,7 +332,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json index 14b27d0bff..78f08a700f 100644 --- a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json +++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug_x64\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -303,7 +331,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json index 99718e760e..ed4384245c 100644 --- a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json +++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug_x64\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -220,7 +248,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -305,7 +333,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All.json b/infra/bots/recipes/test.expected/Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All.json index abf7869754..eae5500615 100644 --- a/infra/bots/recipes/test.expected/Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,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": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]\\out\\Debug\\dm", + "[START_DIR]\\build\\out\\Debug\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -218,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -601,7 +629,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\out" + "SKIA_OUT": "[START_DIR]\\build\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json index a5f3d83776..58dd0e5270 100644 --- a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json @@ -9,7 +9,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "setup_device" @@ -18,7 +18,7 @@ "cmd": [ "ideviceinstaller", "-i", - "[START_DIR]/out/Release/dm.app" + "[START_DIR]/build/out/Release/dm.app" ], "env": { "BUILDTYPE": "Release", @@ -26,7 +26,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "install_dm" @@ -35,7 +35,7 @@ "cmd": [ "ideviceinstaller", "-i", - "[START_DIR]/out/Release/nanobench.app" + "[START_DIR]/build/out/Release/nanobench.app" ], "env": { "BUILDTYPE": "Release", @@ -43,7 +43,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "install_nanobench" @@ -60,7 +60,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skia/resources" @@ -112,7 +112,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "cat_file tmp/SKP_VERSION", @@ -129,7 +129,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm tmp/SKP_VERSION" @@ -145,7 +145,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm skps" @@ -161,7 +161,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir skps" @@ -178,7 +178,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skp" @@ -195,7 +195,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SKP_VERSION" @@ -247,7 +247,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "cat_file tmp/SK_IMAGE_VERSION", @@ -264,7 +264,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm tmp/SK_IMAGE_VERSION" @@ -280,7 +280,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm images" @@ -296,7 +296,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir images" @@ -313,7 +313,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skimage" @@ -330,7 +330,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION" @@ -382,7 +382,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "cat_file tmp/SVG_VERSION", @@ -399,7 +399,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm tmp/SVG_VERSION" @@ -415,7 +415,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm svgs" @@ -431,7 +431,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir svgs" @@ -448,7 +448,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push_if_needed [START_DIR]/svg" @@ -465,11 +465,47 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "env": { + "IOS_BUNDLE_ID": "com.google.dm", + "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice" + }, + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "env": { + "IOS_BUNDLE_ID": "com.google.dm", + "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice" + }, + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", @@ -481,7 +517,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm dm" @@ -497,7 +533,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir dm" @@ -534,7 +570,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -584,7 +620,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/uninteresting_hashes.txt" @@ -914,7 +950,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm" }, @@ -922,7 +958,7 @@ "cmd": [ "[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed", "dm", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "env": { "BUILDTYPE": "Release", @@ -930,7 +966,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "pull_if_needed dm" diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json index 9e990eac44..3d0a9bd4e9 100644 --- a/infra/bots/recipes/test.expected/failed_dm.json +++ b/infra/bots/recipes/test.expected/failed_dm.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,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": "get uninteresting hashes", @@ -182,7 +210,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -223,7 +251,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -490,7 +518,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "symbolized dm", "~followup_annotations": [ diff --git a/infra/bots/recipes/test.expected/failed_get_hashes.json b/infra/bots/recipes/test.expected/failed_get_hashes.json index ec91a614bd..5ca47e0dd0 100644 --- a/infra/bots/recipes/test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/test.expected/failed_get_hashes.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -622,7 +650,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -668,7 +696,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -703,7 +731,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -711,7 +739,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm" @@ -731,7 +759,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "write dm.sh" @@ -748,7 +776,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm.sh" @@ -764,7 +792,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "clear log" @@ -781,7 +809,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -805,30 +833,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Release" + "[START_DIR]/build/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "dump log", @@ -862,7 +890,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/failed_pull.json b/infra/bots/recipes/test.expected/failed_pull.json index 456901e7b0..4c43bb9b32 100644 --- a/infra/bots/recipes/test.expected/failed_pull.json +++ b/infra/bots/recipes/test.expected/failed_pull.json @@ -12,7 +12,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": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,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": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,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": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,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": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,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": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,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": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,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": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,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": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,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": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,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": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,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": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,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": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,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": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,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": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,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": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,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": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,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": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,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": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,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": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "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": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,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": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,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": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,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": "get uninteresting hashes", @@ -620,7 +648,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": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -666,7 +694,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": "Set CPU 0's governor to ondemand", @@ -701,7 +729,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -709,7 +737,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": "push dm" @@ -729,7 +757,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": "write dm.sh" @@ -746,7 +774,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": "push dm.sh" @@ -762,7 +790,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": "clear log" @@ -779,7 +807,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -805,17 +833,17 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm", + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm", "~followup_annotations": [ "step returned non-zero exit code: 1", "@@@STEP_EXCEPTION@@@" @@ -826,13 +854,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "env": { "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": "dump log", @@ -866,14 +894,14 @@ "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": "kill adb server" }, { "name": "$result", - "reason": "Infra Failure: Step('pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm') returned 1", + "reason": "Infra Failure: Step('pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm') returned 1", "recipe_result": null, "status_code": 1 } diff --git a/infra/bots/recipes/test.expected/failed_push.json b/infra/bots/recipes/test.expected/failed_push.json index 756ad2265a..179a2a4d72 100644 --- a/infra/bots/recipes/test.expected/failed_push.json +++ b/infra/bots/recipes/test.expected/failed_push.json @@ -12,7 +12,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": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,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": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -59,13 +59,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "env": { "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": "dump log", @@ -127,7 +127,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": "kill adb server" diff --git a/infra/bots/recipes/test.expected/internal_bot_1.json b/infra/bots/recipes/test.expected/internal_bot_1.json index 6e17a58b33..3594b68ce8 100644 --- a/infra/bots/recipes/test.expected/internal_bot_1.json +++ b/infra/bots/recipes/test.expected/internal_bot_1.json @@ -12,7 +12,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": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,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": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,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": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,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": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,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": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,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": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,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": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,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": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,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": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,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": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,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": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,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": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,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": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,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": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,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": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,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": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,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": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,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": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,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": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "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": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,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": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,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": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,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": "get uninteresting hashes", @@ -620,7 +648,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": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -657,7 +685,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -665,7 +693,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": "push dm" @@ -685,7 +713,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": "write dm.sh" @@ -702,7 +730,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": "push dm.sh" @@ -718,7 +746,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": "clear log" @@ -735,7 +763,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -759,30 +787,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "env": { "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": "dump log", @@ -816,7 +844,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": "kill adb server" diff --git a/infra/bots/recipes/test.expected/internal_bot_2.json b/infra/bots/recipes/test.expected/internal_bot_2.json index 6039b53a14..250cb72083 100644 --- a/infra/bots/recipes/test.expected/internal_bot_2.json +++ b/infra/bots/recipes/test.expected/internal_bot_2.json @@ -12,7 +12,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": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,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": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,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": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,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": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,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": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,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": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,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": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,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": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,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": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,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": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,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": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,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": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,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": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,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": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,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": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,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": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,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": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,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": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,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": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,11 +503,39 @@ "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": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "/usr/bin/adb.1.0.35", @@ -521,7 +549,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": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -539,7 +567,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": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -570,7 +598,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": "get uninteresting hashes", @@ -620,7 +648,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": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -657,7 +685,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/out/Debug/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -665,7 +693,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": "push dm" @@ -685,7 +713,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": "write dm.sh" @@ -702,7 +730,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": "push dm.sh" @@ -718,7 +746,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": "clear log" @@ -735,7 +763,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm", "~followup_annotations": [ @@ -759,30 +787,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "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": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Debug" + "[START_DIR]/build/out/Debug" ], "env": { "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": "dump log", @@ -816,7 +844,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": "kill adb server" diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json index be4e65c04b..1b5de9bea7 100644 --- a/infra/bots/recipes/test.expected/trybot.json +++ b/infra/bots/recipes/test.expected/trybot.json @@ -83,6 +83,34 @@ "infra_step": true, "name": "write SVG_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "python", @@ -109,7 +137,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -177,7 +205,7 @@ }, { "cmd": [ - "[START_DIR]/out/Release_x64/dm", + "[START_DIR]/build/out/Release_x64/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -224,7 +252,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "[START_DIR]/[SWARM_OUT_DIR]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -550,7 +578,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm" }, -- cgit v1.2.3