Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___predictable_bisect_override_changes.json |
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___predictable_bisect_override_changes.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___predictable_bisect_override_changes.json |
index 43456c73ca875c3c481dbc3728b07bf7d15525ca..f08dd60358e66e7a8df7c7608ba36d71f7b98fa2 100644 |
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___predictable_bisect_override_changes.json |
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___predictable_bisect_override_changes.json |
@@ -120,7 +120,7 @@ |
"cwd": "[SLAVE_BUILD]/v8", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "GYP_DEFINES": "clang=1 gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32", |
+ "GYP_DEFINES": "gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32", |
"GYP_GENERATORS": "ninja", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -196,28 +196,6 @@ |
] |
}, |
{ |
- "allow_subannotations": true, |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", |
- "--src-dir", |
- "[SLAVE_BUILD]/v8", |
- "--output-json", |
- "/path/to/tmp/json" |
- ], |
- "env": { |
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
- }, |
- "name": "clang_revision", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
"cmd": [ |
"python", |
"-u", |
@@ -238,7 +216,7 @@ |
"--build-tool", |
"ninja", |
"--compiler", |
- "goma-clang", |
+ "goma", |
"--goma-jsonstatus", |
"/path/to/tmp/json", |
"--goma-service-account-json-file", |
@@ -301,7 +279,7 @@ |
"@@@STEP_LOG_LINE@fast@Command: d8 test.js@@@", |
"@@@STEP_LOG_LINE@fast@@@@", |
"@@@STEP_LOG_LINE@fast@Build environment:@@@", |
- "@@@STEP_LOG_LINE@fast@ GYP_DEFINES: clang=1 target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32@@@", |
+ "@@@STEP_LOG_LINE@fast@ GYP_DEFINES: target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32@@@", |
"@@@STEP_LOG_LINE@fast@ GYP_GENERATORS: ninja@@@", |
"@@@STEP_LOG_LINE@fast@@@@", |
"@@@STEP_LOG_LINE@fast@Run #1@@@", |
@@ -322,7 +300,7 @@ |
"@@@STEP_LOG_LINE@slow@Command: d8 test.js@@@", |
"@@@STEP_LOG_LINE@slow@@@@", |
"@@@STEP_LOG_LINE@slow@Build environment:@@@", |
- "@@@STEP_LOG_LINE@slow@ GYP_DEFINES: clang=1 target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32@@@", |
+ "@@@STEP_LOG_LINE@slow@ GYP_DEFINES: target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32@@@", |
"@@@STEP_LOG_LINE@slow@ GYP_GENERATORS: ninja@@@", |
"@@@STEP_LOG_LINE@slow@@@@", |
"@@@STEP_LOG_LINE@slow@Run #1@@@", |
@@ -656,7 +634,7 @@ |
"cwd": "[SLAVE_BUILD]/v8", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "GYP_DEFINES": "clang=1 gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32", |
+ "GYP_DEFINES": "gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32", |
"GYP_GENERATORS": "ninja", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -734,29 +712,6 @@ |
] |
}, |
{ |
- "allow_subannotations": true, |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", |
- "--src-dir", |
- "[SLAVE_BUILD]/v8", |
- "--output-json", |
- "/path/to/tmp/json" |
- ], |
- "env": { |
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
- }, |
- "name": "Bisect a0.clang_revision", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@1@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
"cmd": [ |
"python", |
"-u", |
@@ -777,7 +732,7 @@ |
"--build-tool", |
"ninja", |
"--compiler", |
- "goma-clang", |
+ "goma", |
"--goma-jsonstatus", |
"/path/to/tmp/json", |
"--goma-service-account-json-file", |
@@ -976,7 +931,7 @@ |
"cwd": "[SLAVE_BUILD]/v8", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "GYP_DEFINES": "clang=1 gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32", |
+ "GYP_DEFINES": "gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32", |
"GYP_GENERATORS": "ninja", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -1054,29 +1009,6 @@ |
] |
}, |
{ |
- "allow_subannotations": true, |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", |
- "--src-dir", |
- "[SLAVE_BUILD]/v8", |
- "--output-json", |
- "/path/to/tmp/json" |
- ], |
- "env": { |
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
- }, |
- "name": "Bisect a2.clang_revision", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@1@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
"cmd": [ |
"python", |
"-u", |
@@ -1097,7 +1029,7 @@ |
"--build-tool", |
"ninja", |
"--compiler", |
- "goma-clang", |
+ "goma", |
"--goma-jsonstatus", |
"/path/to/tmp/json", |
"--goma-service-account-json-file", |
@@ -1164,7 +1096,7 @@ |
"@@@STEP_LOG_LINE@fast@Command: d8 test.js@@@", |
"@@@STEP_LOG_LINE@fast@@@@", |
"@@@STEP_LOG_LINE@fast@Build environment:@@@", |
- "@@@STEP_LOG_LINE@fast@ GYP_DEFINES: clang=1 target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32@@@", |
+ "@@@STEP_LOG_LINE@fast@ GYP_DEFINES: target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32@@@", |
"@@@STEP_LOG_LINE@fast@ GYP_GENERATORS: ninja@@@", |
"@@@STEP_LOG_LINE@fast@@@@", |
"@@@STEP_LOG_LINE@fast@Run #1@@@", |
@@ -1185,7 +1117,7 @@ |
"@@@STEP_LOG_LINE@slow@Command: d8 test.js@@@", |
"@@@STEP_LOG_LINE@slow@@@@", |
"@@@STEP_LOG_LINE@slow@Build environment:@@@", |
- "@@@STEP_LOG_LINE@slow@ GYP_DEFINES: clang=1 target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32@@@", |
+ "@@@STEP_LOG_LINE@slow@ GYP_DEFINES: target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32@@@", |
"@@@STEP_LOG_LINE@slow@ GYP_GENERATORS: ninja@@@", |
"@@@STEP_LOG_LINE@slow@@@@", |
"@@@STEP_LOG_LINE@slow@Run #1@@@", |
@@ -1331,7 +1263,7 @@ |
"cwd": "[SLAVE_BUILD]/v8", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "GYP_DEFINES": "clang=1 gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32", |
+ "GYP_DEFINES": "gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1 v8_enable_verify_predictable=1 v8_target_arch=ia32", |
"GYP_GENERATORS": "ninja", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -1409,29 +1341,6 @@ |
] |
}, |
{ |
- "allow_subannotations": true, |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", |
- "--src-dir", |
- "[SLAVE_BUILD]/v8", |
- "--output-json", |
- "/path/to/tmp/json" |
- ], |
- "env": { |
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
- }, |
- "name": "Bisect a1.clang_revision", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@1@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
"cmd": [ |
"python", |
"-u", |
@@ -1452,7 +1361,7 @@ |
"--build-tool", |
"ninja", |
"--compiler", |
- "goma-clang", |
+ "goma", |
"--goma-jsonstatus", |
"/path/to/tmp/json", |
"--goma-service-account-json-file", |