| Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___builder_with_gn.json
|
| diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___builder.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___builder_with_gn.json
|
| similarity index 95%
|
| copy from scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___builder.json
|
| copy to scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___builder_with_gn.json
|
| index ddb0d78fe63009527fca6ec6b15b8d6a6ee03786..e4f1c4cf9a6701497ab12d1d0e679cee45798c29 100644
|
| --- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___builder.json
|
| +++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___builder_with_gn.json
|
| @@ -182,17 +182,13 @@
|
| "name": "generate_build_files",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@stdout@some line@@@",
|
| - "@@@STEP_LOG_LINE@stdout@GYP_DEFINES='target_arch=x64 cool_flag=a=1'@@@",
|
| + "@@@STEP_LOG_LINE@stdout@Writing \"\"\"\\@@@",
|
| + "@@@STEP_LOG_LINE@stdout@goma_dir = \"/b/build/slave/cache/cipd/goma\"@@@",
|
| + "@@@STEP_LOG_LINE@stdout@target_cpu = \"x64\"@@@",
|
| + "@@@STEP_LOG_LINE@stdout@use_goma = true@@@",
|
| + "@@@STEP_LOG_LINE@stdout@\"\"\" to /path/to/args.gn.@@@",
|
| "@@@STEP_LOG_LINE@stdout@moar@@@",
|
| - "@@@STEP_LOG_END@stdout@@@",
|
| - "@@@STEP_LOG_LINE@diff@- gomadir: '[CACHE]/cipd/goma'@@@",
|
| - "@@@STEP_LOG_LINE@diff@+ cool_flag: a=1@@@",
|
| - "@@@STEP_LOG_LINE@diff@ target_arch: x64@@@",
|
| - "@@@STEP_LOG_LINE@diff@- test_isolation_mode: prepare@@@",
|
| - "@@@STEP_LOG_LINE@diff@- use_goma: 1@@@",
|
| - "@@@STEP_LOG_END@diff@@@",
|
| - "@@@STEP_WARNINGS@@@"
|
| + "@@@STEP_LOG_END@stdout@@@"
|
| ]
|
| },
|
| {
|
| @@ -385,8 +381,7 @@
|
| "builder_name": "V8 Linux64",
|
| "properties": {
|
| "parent_build_environment": {
|
| - "GYP_DEFINES": "target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
|
| - "GYP_GENERATORS": "ninja"
|
| + "gn_args": "target_cpu = \"x64\" use_goma = true"
|
| },
|
| "parent_got_revision": "f2cbea7e89a45f46819777bb78a1f5bd0241f64c",
|
| "parent_got_revision_cp": "refs/heads/master@{#50110}",
|
| @@ -410,8 +405,7 @@
|
| "builder_name": "V8 Linux64 - avx2",
|
| "properties": {
|
| "parent_build_environment": {
|
| - "GYP_DEFINES": "target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
|
| - "GYP_GENERATORS": "ninja"
|
| + "gn_args": "target_cpu = \"x64\" use_goma = true"
|
| },
|
| "parent_got_revision": "f2cbea7e89a45f46819777bb78a1f5bd0241f64c",
|
| "parent_got_revision_cp": "refs/heads/master@{#50110}",
|
| @@ -452,8 +446,7 @@
|
| "properties": {
|
| "archive": "gs://chromium-v8/v8-linux64-rel",
|
| "parent_build_environment": {
|
| - "GYP_DEFINES": "target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
|
| - "GYP_GENERATORS": "ninja"
|
| + "gn_args": "target_cpu = \"x64\" use_goma = true"
|
| },
|
| "parent_got_revision": "f2cbea7e89a45f46819777bb78a1f5bd0241f64c",
|
| "parent_got_revision_cp": "refs/heads/master@{#50110}",
|
|
|