diff options
Diffstat (limited to 'infra/bots/recipes/compile.expected')
39 files changed, 201 insertions, 359 deletions
diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json index abbed85655..9b702e8030 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json index eeef473788..f6a7e2a92f 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json index 2e736fa412..f3f48d3fc7 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 7f8b9ebb94..69b6cbee04 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json index cf49656160..16438063d9 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json index f8bc7f5770..c3c7be7087 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json index a4d162827e..7e7e8bed93 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json index 5b652e4128..db474747a4 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json index b70908dc81..7f75f0f356 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json index 1824f0e32a..24b9c0e1ac 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json index 7fef6195f3..89ad1ca0d3 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json index 77e580f6b9..1fc33c3cec 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json index f9c9577412..bb5a01002f 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json index f5d9fedf6c..a13069aced 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json index 92bd933783..05b6c08d5d 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json index 80498d5fbb..cce2d0fbd1 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json index b6914a687a..fce934fb30 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json index 36fd128a40..3cbe2deef8 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json index 555bdba784..e9bb5fe775 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json index 7ae0f3186d..797b381ebd 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index ee593df078..054c972ad4 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json index bc6e16998a..2faa57bc28 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json index 0aa8231ff9..5d6890cb23 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json index 26e896d79c..68c6d293d9 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/flutter/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/flutter/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/flutter/.gclient_entries" }, { "cmd": [ @@ -123,14 +119,13 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/flutter/src/out/android_release" ], "cwd": "[CUSTOM_/_B_WORK]/flutter/src", - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree android_release" }, diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json index 7c03880657..c76b4c6011 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json index 2c2a7cdeb3..e79a0b4aa1 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json index cc23c9e0f5..89d168a6a4 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json index 9bab8cac6b..d1b7cd9295 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json index 33f0969632..37580d75ec 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json index 24cc9c3c04..cf63dbfd13 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index 1d58948bb8..1726382066 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json index a83e2488a4..a7e7b13776 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json index e1a6c3c3ba..fc95d28712 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json index 31aaf5c15d..e5f7899be9 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index 60c9b55348..538448fe91 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/alternate_repo.json b/infra/bots/recipes/compile.expected/alternate_repo.json index d2462d49dc..0096a798ae 100644 --- a/infra/bots/recipes/compile.expected/alternate_repo.json +++ b/infra/bots/recipes/compile.expected/alternate_repo.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/flutter_trybot.json b/infra/bots/recipes/compile.expected/flutter_trybot.json index 76510d9498..be4261a6b9 100644 --- a/infra/bots/recipes/compile.expected/flutter_trybot.json +++ b/infra/bots/recipes/compile.expected/flutter_trybot.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/flutter/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/flutter/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/flutter/.gclient_entries" }, { "cmd": [ @@ -127,14 +123,13 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/flutter/src/out/android_release" ], "cwd": "[CUSTOM_/_B_WORK]/flutter/src", - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree android_release" }, diff --git a/infra/bots/recipes/compile.expected/pdfium_trybot.json b/infra/bots/recipes/compile.expected/pdfium_trybot.json index f36241f76a..8e749f228c 100644 --- a/infra/bots/recipes/compile.expected/pdfium_trybot.json +++ b/infra/bots/recipes/compile.expected/pdfium_trybot.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/trybot.json b/infra/bots/recipes/compile.expected/trybot.json index 5ec0f97398..ed7d5504c3 100644 --- a/infra/bots/recipes/compile.expected/trybot.json +++ b/infra/bots/recipes/compile.expected/trybot.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries" }, { "cmd": [ |