Index: scripts/slave/recipes/findit/chromium/test.expected/nonexistent_test_step_skipped.json |
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/nonexistent_test_step_skipped.json b/scripts/slave/recipes/findit/chromium/test.expected/nonexistent_test_step_skipped.json |
index 10c24a646c718ff0a80d23c67dd3f282aa9753e0..08672e955db98111d4b78534b06a99da36b84ccb 100644 |
--- a/scripts/slave/recipes/findit/chromium/test.expected/nonexistent_test_step_skipped.json |
+++ b/scripts/slave/recipes/findit/chromium/test.expected/nonexistent_test_step_skipped.json |
@@ -106,63 +106,6 @@ |
] |
}, |
{ |
- "cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "ensure_goma" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_MODULE[build::cipd]\\resources\\bootstrap.py", |
- "--platform", |
- "windows-amd64", |
- "--dest-directory", |
- "[SLAVE_BUILD]\\cipd", |
- "--json-output", |
- "/path/to/tmp/json" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "ensure_goma.install cipd", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@1@@@", |
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]\\cipd\\cipd", |
- "ensure", |
- "--root", |
- "[CACHE]\\cipd\\goma", |
- "--list", |
- "infra_internal/goma/client/windows-amd64 release", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "C:\\creds\\service_accounts\\service-account-goma-client.json" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "ensure_goma.ensure_installed", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@1@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
"cmd": [ |
"python", |
"-u", |
@@ -186,7 +129,7 @@ |
"cwd": "[SLAVE_BUILD]", |
"env": { |
"GYP_CHROMIUM_NO_ACTION": "1", |
- "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]\\cipd\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1", |
+ "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1", |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
@@ -368,66 +311,6 @@ |
] |
}, |
{ |
- "cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "test r1.ensure_goma", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@1@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_MODULE[build::cipd]\\resources\\bootstrap.py", |
- "--platform", |
- "windows-amd64", |
- "--dest-directory", |
- "[SLAVE_BUILD]\\cipd", |
- "--json-output", |
- "/path/to/tmp/json" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "test r1.ensure_goma.install cipd", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@2@@@", |
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]\\cipd\\cipd", |
- "ensure", |
- "--root", |
- "[CACHE]\\cipd\\goma", |
- "--list", |
- "infra_internal/goma/client/windows-amd64 release", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "C:\\creds\\service_accounts\\service-account-goma-client.json" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "test r1.ensure_goma.ensure_installed", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@2@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
"cmd": [ |
"python", |
"-u", |
@@ -437,7 +320,7 @@ |
"cwd": "[SLAVE_BUILD]", |
"env": { |
"GYP_CHROMIUM_NO_ACTION": "1", |
- "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]\\cipd\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1", |
+ "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1", |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "test r1.gclient runhooks", |