| Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win10_chromium_x64_rel_ng.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win10_chromium_rel_ng.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win10_chromium_x64_rel_ng.json
|
| similarity index 96%
|
| rename from scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win10_chromium_rel_ng.json
|
| rename to scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win10_chromium_x64_rel_ng.json
|
| index 751260b729f08471b616d7302c395919b2a8f6e4..372f10544f8624e2714b80d4fcdde1e80da53023 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win10_chromium_rel_ng.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win10_chromium_x64_rel_ng.json
|
| @@ -16,7 +16,7 @@
|
| "--master",
|
| "tryserver.chromium.win",
|
| "--builder",
|
| - "win10_chromium_rel_ng",
|
| + "win10_chromium_x64_rel_ng",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -134,7 +134,7 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "GYP_DEFINES": "chromium_win_pch=0 component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
|
| + "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library dcheck_always_on=1 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 (with patch)"
|
| @@ -149,10 +149,11 @@
|
| "--",
|
| "--build-config-fs",
|
| "Release",
|
| + "--use-src-side-runtest-py",
|
| "--paths",
|
| "{\"checkout\": \"[SLAVE_BUILD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"win10_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| + "{\"buildername\": \"win10_chromium_x64_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| @@ -166,13 +167,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.win.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.win.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
|
|