| Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_ozone_compile_only_ng.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_compile_rel_ng.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_ozone_compile_only_ng.json
|
| similarity index 93%
|
| copy from scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_compile_rel_ng.json
|
| copy to scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_ozone_compile_only_ng.json
|
| index 26dd2b56dd79ded14882b93f7d1bea107cb055ad..be3131c9d26db872a298f6e636d4b31aeb77c21a 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_compile_rel_ng.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_ozone_compile_only_ng.json
|
| @@ -208,7 +208,7 @@
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| - "GYP_DEFINES": "archive_gpu_tests=1 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
|
| + "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks (with patch)"
|
| @@ -223,11 +223,10 @@
|
| "--",
|
| "--build-config-fs",
|
| "Release",
|
| - "--use-src-side-runtest-py",
|
| "--paths",
|
| "{\"checkout\": \"[BUILDER_CACHE]/linux/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"linux_chromium_compile_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| + "{\"buildername\": \"linux_chromium_ozone_compile_only_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -240,12 +239,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json",
|
| + "[BUILDER_CACHE]/linux/src/testing/buildbot/chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "name": "read test spec (chromium.linux.json)",
|
| + "name": "read test spec (chromium.fyi.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.fyi.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -303,13 +302,16 @@
|
| "@@@STEP_LOG_END@excluded_files@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@{@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"additional_compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"content_browsertests\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"content_unittests\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"content_browsertests\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"content_unittests\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"content_browsertests\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"content_unittests\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": []@@@",
|
| @@ -337,7 +339,7 @@
|
| "-m",
|
| "tryserver.chromium.linux",
|
| "-b",
|
| - "linux_chromium_compile_rel_ng",
|
| + "linux_chromium_ozone_compile_only_ng",
|
| "--config-file",
|
| "[BUILDER_CACHE]/linux/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| @@ -369,13 +371,13 @@
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--buildbot-buildername",
|
| - "linux_chromium_compile_rel_ng",
|
| + "linux_chromium_ozone_compile_only_ng",
|
| "--buildbot-mastername",
|
| "tryserver.chromium.linux",
|
| "--buildbot-slavename",
|
| "TestSlavename",
|
| "--goma-deps-cache-file",
|
| - "linux_chromium_compile_rel_ng.gomadeps",
|
| + "linux_chromium_ozone_compile_only_ng.gomadeps",
|
| "--compiler",
|
| "goma",
|
| "--goma-jsonstatus",
|
| @@ -386,9 +388,9 @@
|
| "[CACHE]/cipd/goma",
|
| "--goma-fail-fast",
|
| "--goma-disable-local-fallback",
|
| - "--ninja-ensure-up-to-date",
|
| "--",
|
| - "chromium_swarm_tests"
|
| + "content_browsertests",
|
| + "content_unittests"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
|
|