diff options
| author |  Eric Boren <borenet@google.com> | 2018-06-20 13:23:16 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-20 17:50:18 +0000 |
| commit | cd0a98c0d1c4e75a2d9f1bc67fea6fcccfa0e76a (patch) | |
| tree | 229f60641e16bf8530b22719782aec12f8351431 /infra/bots/recipes/test.expected | |
| parent | ae17e65ef4b46ec007df4aa04dbc389ee757c9ba (diff) | |
[recipes] Simplify test/perf dirs
Bug: skia:6473
Change-Id: Iee2f195ddf4bbcdabc1580f2a021d2e9a07ff0b2
Reviewed-on: https://skia-review.googlesource.com/133441
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/recipes/test.expected')
44 files changed, 1204 insertions, 77 deletions
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 3fa3085eab..2d5d3c3a82 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 @@ -789,11 +789,15 @@ ] }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -802,7 +806,81 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[TMP_BASE]/adb_pull_tmp_1", + "dm_out/*" + ], + "infra_step": true, + "name": "adb pull.list pulled files", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 1.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 2.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ 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 a24732f38e..4078fa0f5b 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 @@ -747,11 +747,15 @@ ] }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -760,7 +764,81 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[TMP_BASE]/adb_pull_tmp_1", + "dm_out/*" + ], + "infra_step": true, + "name": "adb pull.list pulled files", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 1.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 2.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan.json index 8b6106c12f..2e4880406a 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan.json @@ -747,11 +747,15 @@ ] }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -760,7 +764,81 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[TMP_BASE]/adb_pull_tmp_1", + "dm_out/*" + ], + "infra_step": true, + "name": "adb pull.list pulled files", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 1.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 2.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ 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 71d3e638d0..2057812de5 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 @@ -747,11 +747,15 @@ ] }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -760,7 +764,81 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[TMP_BASE]/adb_pull_tmp_1", + "dm_out/*" + ], + "infra_step": true, + "name": "adb pull.list pulled files", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 1.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 2.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ 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 2fa3f3ea43..713c357c6e 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 @@ -789,11 +789,15 @@ ] }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -802,7 +806,81 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[TMP_BASE]/adb_pull_tmp_1", + "dm_out/*" + ], + "infra_step": true, + "name": "adb pull.list pulled files", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 1.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 2.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ 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 a889ed3071..6cfed5d1b2 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 @@ -1031,11 +1031,15 @@ ] }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -1044,7 +1048,81 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[TMP_BASE]/adb_pull_tmp_1", + "dm_out/*" + ], + "infra_step": true, + "name": "adb pull.list pulled files", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 1.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 2.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ 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 8cfcdbc63f..60232c76c0 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 @@ -789,11 +789,15 @@ ] }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -802,7 +806,81 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[TMP_BASE]/adb_pull_tmp_1", + "dm_out/*" + ], + "infra_step": true, + "name": "adb pull.list pulled files", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 1.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 2.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ 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 c7b15efc55..c3f0b8f2dc 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 @@ -831,11 +831,15 @@ ] }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -844,7 +848,81 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[TMP_BASE]/adb_pull_tmp_1", + "dm_out/*" + ], + "infra_step": true, + "name": "adb pull.list pulled files", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 1.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 2.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ 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 7447fb5766..93e81433c4 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 @@ -931,11 +931,15 @@ ] }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -944,7 +948,81 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[TMP_BASE]/adb_pull_tmp_1", + "dm_out/*" + ], + "infra_step": true, + "name": "adb pull.list pulled files", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 1.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 2.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ 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 cd0bd7d603..30f8985dd9 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 @@ -736,14 +736,14 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[START_DIR]/[SWARM_OUT_DIR]" ], "env": { "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "rmtree dm" + "name": "rmtree [SWARM_OUT_DIR]" }, { "cmd": [ @@ -755,14 +755,14 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[START_DIR]/[SWARM_OUT_DIR]" ], "env": { "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "makedirs dm" + "name": "makedirs [SWARM_OUT_DIR]" }, { "cmd": [ @@ -984,10 +984,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", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, - "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm", + "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [START_DIR]/[SWARM_OUT_DIR]", "~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 e975d38767..b61a6076e1 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 @@ -508,11 +508,15 @@ "name": "dm" }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "adb", "pull", "/dev/shm/skia/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -520,7 +524,81 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /dev/shm/skia/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "adb pull.pull /dev/shm/skia/dm_out", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[TMP_BASE]/adb_pull_tmp_1", + "dm_out/*" + ], + "infra_step": true, + "name": "adb pull.list pulled files", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 1.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 2.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ 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 dc1055db67..cdd8eaf540 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 @@ -615,11 +615,15 @@ "name": "dm" }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "adb", "pull", "/dev/shm/skia/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -627,7 +631,81 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /dev/shm/skia/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "adb pull.pull /dev/shm/skia/dm_out", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[TMP_BASE]/adb_pull_tmp_1", + "dm_out/*" + ], + "infra_step": true, + "name": "adb pull.list pulled files", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 1.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 2.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ 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 4925f9c011..7efd5e9a4e 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 @@ -251,7 +251,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json index abce7e897a..edd0411f96 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json @@ -251,7 +251,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 274ff47fd1..e437141788 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 @@ -251,7 +251,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader.json index 69f0988939..673c909039 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader.json @@ -251,7 +251,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json index 279eadaa80..c7d1a36b24 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json @@ -251,7 +251,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json index f06203a945..e79cade8ab 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json @@ -251,7 +251,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 88406410fa..9ed31aa1a3 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 @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 85da3a7bc4..3c78195eca 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 @@ -244,7 +244,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json index 938cd997e2..3789de1c56 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 86e12f909f..a3bb170381 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 @@ -244,7 +244,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 0427b80b77..72058e5d92 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 @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 f696774d45..5d0a37c191 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 @@ -251,7 +251,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 9f35ad8d95..fa734bdd4e 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 @@ -251,7 +251,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 acc15b6153..6771876af1 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 @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 65b57d11ae..daeb3d67f4 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 @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 908a757772..6ce7d1e53c 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 @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 09830555ad..ac5f35dc2c 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 @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 ef3d4a146e..ddd57a96ec 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 @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 742d017509..bab3c2ed9f 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 @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan.json index d881a5a3d8..de7eaa419b 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan.json @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 6c2a884520..8c77383ead 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 @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 e60cb0e054..e357e2c43e 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 @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 dcbcf09786..d9e568864f 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 @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 a41c8cee2b..989146f9b6 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 @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 554e919320..a8627f9161 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 @@ -246,7 +246,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[START_DIR]\\[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", 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 958f41b013..e34ba22f87 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 @@ -900,7 +900,7 @@ "cmd": [ "[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed", "dm", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[START_DIR]/[SWARM_OUT_DIR]" ], "env": { "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json index caf20a1a46..880a737894 100644 --- a/infra/bots/recipes/test.expected/failed_dm.json +++ b/infra/bots/recipes/test.expected/failed_dm.json @@ -249,7 +249,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", diff --git a/infra/bots/recipes/test.expected/failed_get_hashes.json b/infra/bots/recipes/test.expected/failed_get_hashes.json index e2cca0016e..67ea3840ed 100644 --- a/infra/bots/recipes/test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/test.expected/failed_get_hashes.json @@ -791,11 +791,15 @@ ] }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -804,7 +808,81 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[TMP_BASE]/adb_pull_tmp_1", + "dm_out/*" + ], + "infra_step": true, + "name": "adb pull.list pulled files", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 1.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 2.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/test.expected/failed_pull.json b/infra/bots/recipes/test.expected/failed_pull.json index ea53e3c768..08f837d14a 100644 --- a/infra/bots/recipes/test.expected/failed_pull.json +++ b/infra/bots/recipes/test.expected/failed_pull.json @@ -791,11 +791,15 @@ ] }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -804,8 +808,9 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm", + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out", "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", "step returned non-zero exit code: 1", "@@@STEP_EXCEPTION@@@" ] @@ -822,8 +827,11 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "kill adb server after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm' (attempt 1)", - "timeout": 30 + "name": "adb pull.kill adb server after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out' (attempt 1)", + "timeout": 30, + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ @@ -837,15 +845,18 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "wait for device after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm' (attempt 1)", - "timeout": 180 + "name": "adb pull.wait for device after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out' (attempt 1)", + "timeout": 180, + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -854,8 +865,9 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm (attempt 2)", + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out (attempt 2)", "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", "step returned non-zero exit code: 1", "@@@STEP_EXCEPTION@@@" ] @@ -872,8 +884,11 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "kill adb server after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm' (attempt 2)", - "timeout": 30 + "name": "adb pull.kill adb server after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out' (attempt 2)", + "timeout": 30, + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ @@ -887,15 +902,18 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "wait for device after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm' (attempt 2)", - "timeout": 180 + "name": "adb pull.wait for device after failure of 'pull /sdcard/revenge_of_the_skiabot/dm_out' (attempt 2)", + "timeout": 180, + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -904,8 +922,9 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm (attempt 3)", + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out (attempt 3)", "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", "step returned non-zero exit code: 1", "@@@STEP_EXCEPTION@@@" ] @@ -914,6 +933,22 @@ "cmd": [ "python", "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "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]/build" ], @@ -959,7 +994,7 @@ }, { "name": "$result", - "reason": "Infra Failure: Step('pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm (attempt 3)') returned 1", + "reason": "Infra Failure: Step('adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out (attempt 3)') returned 1", "recipe_result": null, "status_code": 1 } diff --git a/infra/bots/recipes/test.expected/internal_bot_1.json b/infra/bots/recipes/test.expected/internal_bot_1.json index 66353a9a17..699c713cf1 100644 --- a/infra/bots/recipes/test.expected/internal_bot_1.json +++ b/infra/bots/recipes/test.expected/internal_bot_1.json @@ -747,11 +747,15 @@ ] }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -760,7 +764,81 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[TMP_BASE]/adb_pull_tmp_1", + "dm_out/*" + ], + "infra_step": true, + "name": "adb pull.list pulled files", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 1.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 2.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/test.expected/internal_bot_2.json b/infra/bots/recipes/test.expected/internal_bot_2.json index d18856590b..1700a108f0 100644 --- a/infra/bots/recipes/test.expected/internal_bot_2.json +++ b/infra/bots/recipes/test.expected/internal_bot_2.json @@ -747,11 +747,15 @@ ] }, { + "cmd": [], + "name": "adb pull" + }, + { "cmd": [ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[TMP_BASE]/adb_pull_tmp_1" ], "cwd": "[START_DIR]/skia", "env": { @@ -760,7 +764,81 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[TMP_BASE]/adb_pull_tmp_1", + "dm_out/*" + ], + "infra_step": true, + "name": "adb pull.list pulled files", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", + "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/1.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 1.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[TMP_BASE]/adb_pull_tmp_1/2.png", + "[START_DIR]/[SWARM_OUT_DIR]" + ], + "infra_step": true, + "name": "adb pull.copy 2.png", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[TMP_BASE]/adb_pull_tmp_1" + ], + "infra_step": true, + "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json index 6bb6df1dc4..10b3ddffc8 100644 --- a/infra/bots/recipes/test.expected/trybot.json +++ b/infra/bots/recipes/test.expected/trybot.json @@ -250,7 +250,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[START_DIR]/[SWARM_OUT_DIR]", "--dont_write", "pdf", "--randomProcessorTest", |