| Index: scripts/slave/recipes/chromium.expected/full_chromium_mojo_Chromium_Mojo_Windows.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Win.json b/scripts/slave/recipes/chromium.expected/full_chromium_mojo_Chromium_Mojo_Windows.json
|
| similarity index 93%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Win.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_mojo_Chromium_Mojo_Windows.json
|
| index c3138e62dcbe5cbaaf0531e28eb5d5bfbe8f8f22..e9ad1ddde47eb9c91f6981ad4bb33617ba676296 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Win.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_mojo_Chromium_Mojo_Windows.json
|
| @@ -14,9 +14,9 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
|
| "--master",
|
| - "chromium.fyi",
|
| + "chromium.mojo",
|
| "--builder",
|
| - "Site Isolation Win",
|
| + "Chromium Mojo Windows",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -116,7 +116,7 @@
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| - "GYP_DEFINES": "chromium_win_pch=0 component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]\\goma' target_arch=x64 use_goma=1",
|
| + "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[BUILD]\\goma' target_arch=ia32 use_goma=1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -130,11 +130,11 @@
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| - "Release_x64",
|
| + "Release",
|
| "--paths",
|
| "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]\\\\src\"}",
|
| "--properties",
|
| - "{\"buildername\": \"Site Isolation Win\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| + "{\"buildername\": \"Chromium Mojo Windows\", \"buildnumber\": 571, \"mastername\": \"chromium.mojo\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| @@ -148,13 +148,13 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.fyi.json",
|
| + "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.mojo.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.fyi.json@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.mojo.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -175,14 +175,14 @@
|
| "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py",
|
| "gen",
|
| "-m",
|
| - "chromium.fyi",
|
| + "chromium.mojo",
|
| "-b",
|
| - "Site Isolation Win",
|
| + "Chromium Mojo Windows",
|
| "--config-file",
|
| "[SLAVE_BUILD]\\src\\tools\\mb\\mb_config.pyl",
|
| "--goma-dir",
|
| "[BUILD]\\goma",
|
| - "//out/Release_x64"
|
| + "//out/Release"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "generate_build_files"
|
| @@ -193,7 +193,7 @@
|
| "-u",
|
| "[BUILD]\\scripts\\slave\\compile.py",
|
| "--target",
|
| - "Release_x64",
|
| + "Release",
|
| "--src-dir",
|
| "[SLAVE_BUILD]\\src",
|
| "--build-tool",
|
| @@ -205,9 +205,8 @@
|
| "--goma-dir",
|
| "[BUILD]\\goma",
|
| "--",
|
| - "content_browsertests",
|
| - "content_unittests",
|
| - "crash_service"
|
| + "All",
|
| + "chromium_builder_tests"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "compile",
|
|
|