Index: scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_chromium_trybot.json |
diff --git a/scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_chromium_trybot.json b/scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_chromium_trybot.json |
index 414f137c2d0ba85a7a9700b667d4b93f20171bc4..a4c6470b6dc91c13003a5f624090bf22df956660 100644 |
--- a/scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_chromium_trybot.json |
+++ b/scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_chromium_trybot.json |
@@ -260,13 +260,13 @@ |
"--cached", |
"--name-only" |
], |
- "cwd": "[SLAVE_BUILD]\\src", |
+ "cwd": "[SLAVE_BUILD]\\src\\third_party\\skia", |
"name": "git diff to analyze patch", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
- "@@@STEP_LOG_LINE@files@foo.cc@@@", |
+ "@@@STEP_LOG_LINE@files@third_party/skia/foo.cc@@@", |
"@@@STEP_LOG_END@files@@@", |
- "@@@SET_BUILD_PROPERTY@subproject_tag@\"chromium\"@@@" |
+ "@@@SET_BUILD_PROPERTY@subproject_tag@\"blink-paths\"@@@" |
] |
}, |
{ |
@@ -306,7 +306,7 @@ |
"win_chromium_rel_ng", |
"-v", |
"//out/Release", |
- "{\"additional_compile_targets\": [\"chromium_builder_tests\"], \"files\": [\"foo.cc\"], \"test_targets\": [\"mini_installer\"]}", |
+ "{\"additional_compile_targets\": [\"chromium_builder_tests\"], \"files\": [\"third_party/skia/foo.cc\"], \"test_targets\": [\"blink_heap_unittests\", \"blink_platform_unittests\", \"mini_installer\", \"webkit_unit_tests\", \"wtf_unittests\"]}", |
"/path/to/tmp/json" |
], |
"env": { |
@@ -329,7 +329,11 @@ |
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [], @@@", |
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [], @@@", |
"@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": [@@@", |
- "@@@STEP_LOG_LINE@analyze_details@ \"mini_installer\"@@@", |
+ "@@@STEP_LOG_LINE@analyze_details@ \"blink_heap_unittests\", @@@", |
+ "@@@STEP_LOG_LINE@analyze_details@ \"blink_platform_unittests\", @@@", |
+ "@@@STEP_LOG_LINE@analyze_details@ \"mini_installer\", @@@", |
+ "@@@STEP_LOG_LINE@analyze_details@ \"webkit_unit_tests\", @@@", |
+ "@@@STEP_LOG_LINE@analyze_details@ \"wtf_unittests\"@@@", |
"@@@STEP_LOG_LINE@analyze_details@ ]@@@", |
"@@@STEP_LOG_LINE@analyze_details@}@@@", |
"@@@STEP_LOG_END@analyze_details@@@" |
@@ -339,11 +343,207 @@ |
"cmd": [ |
"python", |
"-u", |
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py", |
+ "--show-path", |
+ "python", |
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py" |
+ ], |
+ "name": "cleanup_temp" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py", |
+ "gen", |
+ "-m", |
+ "tryserver.chromium.win", |
+ "-b", |
+ "win_chromium_rel_ng", |
+ "--config-file", |
+ "[SLAVE_BUILD]\\src\\tools\\mb\\mb_config.pyl", |
+ "--goma-dir", |
+ "[CACHE]\\cipd\\goma", |
+ "//out/Release" |
+ ], |
+ "env": { |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
+ }, |
+ "name": "generate_build_files (with patch)" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py", |
+ "--show-path", |
+ "python", |
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\compile.py", |
+ "--gsutil-py-path", |
+ "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py", |
+ "--ninja-path", |
+ "RECIPE_PACKAGE_REPO[depot_tools]\\ninja.exe", |
+ "--target", |
+ "Release", |
+ "--src-dir", |
+ "[SLAVE_BUILD]\\src", |
+ "--goma-cache-dir", |
+ "[GOMA_CACHE]", |
+ "--build-tool", |
+ "ninja", |
+ "--compiler", |
+ "goma", |
+ "--goma-jsonstatus", |
+ "/path/to/tmp/json", |
+ "--goma-service-account-json-file", |
+ "C:\\creds\\service_accounts\\service-account-goma-client.json", |
+ "--goma-dir", |
+ "[CACHE]\\cipd\\goma", |
+ "--goma-fail-fast", |
+ "--goma-disable-local-fallback", |
+ "--ninja-ensure-up-to-date", |
+ "--", |
+ "blink_tests" |
+ ], |
+ "env": { |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
+ }, |
+ "name": "compile (with patch)", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", |
+ "@@@STEP_LOG_END@json.output (invalid)@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
"import sys; sys.exit(0)" |
], |
"name": "mark: before_tests" |
}, |
{ |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]\\src\\testing\\scripts\\webkit_lint.py", |
+ "--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\": \"win_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}", |
+ "run", |
+ "--output", |
+ "/path/to/tmp/json" |
+ ], |
+ "name": "webkit_lint (with patch)", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]\\src\\testing\\scripts\\webkit_python_tests.py", |
+ "--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\": \"win_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}", |
+ "run", |
+ "--output", |
+ "/path/to/tmp/json" |
+ ], |
+ "name": "webkit_python_tests (with patch)", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py", |
+ "--target", |
+ "Release", |
+ "--factory-properties", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"win_chromium_rel_ng\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.win\", \"patch_project\": \"skia\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {}, \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "--build-properties", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"win_chromium_rel_ng\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.win\", \"patch_project\": \"skia\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {}, \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "--step-name=webkit_tests (with patch)", |
+ "--builder-name=win_chromium_rel_ng", |
+ "--slave-name=TestSlavename", |
+ "--build-number=571", |
+ "--run-python-script", |
+ "[BUILD]\\scripts\\slave\\chromium\\layout_test_wrapper.py", |
+ "--target", |
+ "Release", |
+ "-o", |
+ "[SLAVE_BUILD]\\layout-test-results", |
+ "--build-dir", |
+ "[SLAVE_BUILD]\\src\\out", |
+ "--json-test-results", |
+ "/path/to/tmp/json", |
+ "--test-results-server", |
+ "test-results.appspot.com", |
+ "--build-number", |
+ "571", |
+ "--builder-name", |
+ "win_chromium_rel_ng", |
+ "--step-name", |
+ "webkit_tests (with patch)" |
+ ], |
+ "name": "webkit_tests (with patch)", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@<br/>Total executed: 9001<br/>@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[BUILD]\\scripts\\slave\\chromium\\archive_layout_test_results.py", |
+ "--results-dir", |
+ "[SLAVE_BUILD]\\layout-test-results", |
+ "--build-dir", |
+ "[SLAVE_BUILD]\\src\\out", |
+ "--build-number", |
+ "571", |
+ "--builder-name", |
+ "win_chromium_rel_ng", |
+ "--gs-bucket", |
+ "gs://chromium-layout-test-archives" |
+ ], |
+ "name": "archive_webkit_tests_results", |
+ "~followup_annotations": [ |
+ "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/win_chromium_rel_ng/571/layout-test-results/results.html@@@", |
+ "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/win_chromium_rel_ng/571/layout-test-results.zip@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py", |
+ "--target", |
+ "Release" |
+ ], |
+ "name": "process_dumps" |
+ }, |
+ { |
"name": "$result", |
"recipe_result": null, |
"status_code": 0 |