| Index: scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_pass.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Print_Preview_Win.json b/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_pass.json
|
| similarity index 72%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_Print_Preview_Win.json
|
| copy to scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_pass.json
|
| index 4933f576a26a3768f1ebc83a3c092c9f1b310ab1..2d66e23172963810ef5288228a194bdd894c0e66 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Print_Preview_Win.json
|
| +++ b/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Win_pass.json
|
| @@ -3,16 +3,8 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
|
| - ],
|
| - "name": "taskkill"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[BUILDER_CACHE]\\Print_Preview_Win",
|
| + "[BUILDER_CACHE]\\V8_Blink_Win",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -39,16 +31,18 @@
|
| "--patch_root",
|
| "src",
|
| "--revision_mapping_file",
|
| - "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| + "{\"src\": \"got_cr_revision\", \"src/buildtools\": \"got_buildtools_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_revision\"}",
|
| "--git-cache-dir",
|
| "[GIT_CACHE]",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| "src@HEAD",
|
| + "--revision",
|
| + "src/v8@20123",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Print_Preview_Win",
|
| + "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -58,7 +52,8 @@
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"src/v8\": \"20123\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
|
| @@ -97,14 +92,14 @@
|
| "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_cr_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| @@ -112,24 +107,25 @@
|
| "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_cr_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
|
| "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@",
|
| "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
|
| "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
|
| "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
|
| "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
|
| "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#43426}\"@@@",
|
| "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
|
| "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
|
| "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
|
| "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
|
| ]
|
| },
|
| {
|
| "cmd": [],
|
| + "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
|
| "name": "ensure_goma"
|
| },
|
| {
|
| @@ -144,6 +140,7 @@
|
| "--json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
|
| "name": "ensure_goma.install cipd",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| @@ -168,6 +165,7 @@
|
| "--service-account-json",
|
| "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
|
| "name": "ensure_goma.ensure_installed",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| @@ -193,10 +191,11 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Print_Preview_Win\\src",
|
| + "cwd": "[BUILDER_CACHE]\\V8_Blink_Win\\src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| - "GYP_DEFINES": "component=shared_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=ia32 use_goma=1",
|
| + "GYP_CHROMIUM_NO_ACTION": "1",
|
| + "GYP_DEFINES": "component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=ia32 use_goma=1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -205,48 +204,23 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\Print_Preview_Win\\src\\testing\\scripts\\get_compile_targets.py",
|
| - "--output",
|
| - "/path/to/tmp/json",
|
| - "--",
|
| - "--build-config-fs",
|
| - "Release",
|
| - "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]\\\\Print_Preview_Win\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| - "--properties",
|
| - "{\"buildername\": \"Print Preview Win\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| - ],
|
| - "name": "get compile targets for scripts",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]\\Print_Preview_Win\\src\\testing\\buildbot\\chromium.fyi.json",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "name": "read test spec (chromium.fyi.json)",
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Print_Preview_Win\\src\\testing\\buildbot\\chromium.fyi.json@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
|
| - "--show-path",
|
| - "python",
|
| - "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
|
| + "[BUILDER_CACHE]\\V8_Blink_Win\\src\\tools\\mb\\mb.py",
|
| + "gen",
|
| + "-m",
|
| + "client.v8.fyi",
|
| + "-b",
|
| + "V8-Blink Win",
|
| + "--config-file",
|
| + "[BUILDER_CACHE]\\V8_Blink_Win\\src\\tools\\mb\\mb_config.pyl",
|
| + "--goma-dir",
|
| + "[CACHE]\\cipd\\goma",
|
| + "//out/Release"
|
| ],
|
| - "name": "cleanup_temp"
|
| + "cwd": "[BUILDER_CACHE]\\V8_Blink_Win\\src",
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| + },
|
| + "name": "generate_build_files (with patch)"
|
| },
|
| {
|
| "cmd": [
|
| @@ -263,19 +237,17 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]\\Print_Preview_Win\\src",
|
| + "[BUILDER_CACHE]\\V8_Blink_Win\\src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--buildbot-buildername",
|
| - "Print Preview Win",
|
| + "V8-Blink Win",
|
| "--buildbot-mastername",
|
| - "chromium.fyi",
|
| + "client.v8.fyi",
|
| "--buildbot-slavename",
|
| "TestSlavename",
|
| "--goma-deps-cache-file",
|
| - "Print_Preview_Win.gomadeps",
|
| - "--build-data-dir",
|
| - "[ROOT]\\build_data_dir",
|
| + "V8_Blink_Win.gomadeps",
|
| "--compiler",
|
| "goma",
|
| "--goma-jsonstatus",
|
| @@ -285,13 +257,13 @@
|
| "--goma-dir",
|
| "[CACHE]\\cipd\\goma",
|
| "--",
|
| - "blink_tests",
|
| - "browser_tests"
|
| + "blink_tests"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| - "name": "compile",
|
| + "name": "compile (with patch)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
| "@@@STEP_LOG_END@json.output (invalid)@@@"
|
| @@ -305,39 +277,76 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Print Preview Win\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Win\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Print Preview Win\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--step-name=print_preview_tests",
|
| - "--builder-name=Print Preview Win",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Win\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--step-name=webkit_unit_tests",
|
| + "--builder-name=V8-Blink Win",
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| - "--run-python-script",
|
| - "[BUILDER_CACHE]\\Print_Preview_Win\\src\\third_party\\WebKit\\Tools\\Scripts\\run-webkit-tests",
|
| - "--write-full-results-to",
|
| - "/path/to/tmp/json",
|
| - "--platform",
|
| - "browser_test.win"
|
| + "webkit_unit_tests.exe"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Print_Preview_Win",
|
| - "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| - },
|
| - "name": "print_preview_tests"
|
| + "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
|
| + "name": "webkit_unit_tests"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
|
| + "[BUILDER_CACHE]\\V8_Blink_Win\\src\\third_party\\WebKit\\Tools\\Scripts\\run-webkit-tests",
|
| "--target",
|
| - "Release"
|
| + "Release",
|
| + "--results-directory",
|
| + "[SLAVE_BUILD]\\layout-test-results",
|
| + "--build-dir",
|
| + "[BUILDER_CACHE]\\V8_Blink_Win\\src\\out",
|
| + "--json-test-results",
|
| + "/path/to/tmp/json",
|
| + "--test-results-server",
|
| + "test-results.appspot.com",
|
| + "--build-number",
|
| + "571",
|
| + "--builder-name",
|
| + "V8-Blink Win",
|
| + "--step-name",
|
| + "webkit_tests (with patch)",
|
| + "--no-pixel-tests",
|
| + "--additional-expectations",
|
| + "[BUILDER_CACHE]\\V8_Blink_Win\\src\\v8\\tools\\blink_tests\\TestExpectations",
|
| + "--master-name",
|
| + "client.v8.fyi",
|
| + "--debug-rwt-logging"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Print_Preview_Win",
|
| - "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| - },
|
| - "name": "process_dumps"
|
| + "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
|
| + "name": "webkit_tests (with patch)",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@<br/>Total executed: 9001<br/>@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\chromium\\archive_layout_test_results.py",
|
| + "--results-dir",
|
| + "[SLAVE_BUILD]\\layout-test-results",
|
| + "--build-dir",
|
| + "[BUILDER_CACHE]\\V8_Blink_Win\\src\\out",
|
| + "--build-number",
|
| + "571",
|
| + "--builder-name",
|
| + "V8-Blink Win",
|
| + "--gs-bucket",
|
| + "gs://chromium-layout-test-archives",
|
| + "--staging-dir",
|
| + "[CACHE]\\chrome_staging"
|
| + ],
|
| + "cwd": "[BUILDER_CACHE]\\V8_Blink_Win",
|
| + "name": "archive_webkit_tests_results",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/V8-Blink_Win/571/layout-test-results/results.html@@@",
|
| + "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/V8-Blink_Win/571/layout-test-results.zip@@@"
|
| + ]
|
| },
|
| {
|
| "name": "$result",
|
|
|