Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(861)

Unified Diff: scripts/slave/recipes/chromium.expected/dynamic_swarmed_gtest.json

Issue 595143002: Enable isolate on Linux release builder. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: review comments Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/chromium.expected/dynamic_swarmed_gtest.json
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_gtest_on_builder.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_gtest.json
similarity index 84%
copy from scripts/slave/recipes/chromium.expected/dynamic_gtest_on_builder.json
copy to scripts/slave/recipes/chromium.expected/dynamic_swarmed_gtest.json
index d84bc0fb1e2e62ee1762f954053e97590ee1621c..b1ad93e68de63cbd6771d966fe33a5a9adbf7e02 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_gtest_on_builder.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_gtest.json
@@ -62,11 +62,24 @@
"cmd": [
"python",
"-u",
+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "--version"
+ ],
+ "name": "swarming.py --version",
+ "stdout": "/path/to/tmp/",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@0.4.10@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"[DEPOT_TOOLS]/gclient.py",
"runhooks"
],
"env": {
- "GYP_DEFINES": "component=static_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1"
+ "GYP_DEFINES": "component=static_library gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=archive test_isolation_outdir=https://isolateserver.appspot.com use_goma=1"
},
"name": "gclient runhooks"
},
@@ -84,11 +97,11 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Linux Tests\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"base_unittests\", @@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"total_shards\": 2@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -120,8 +133,7 @@
"--goma-dir",
"[BUILD]/goma",
"--",
- "base_unittests",
- "browser_tests",
+ "browser_tests_run",
"chrome",
"chromium_swarm_tests",
"mojo_public_test_interfaces",
@@ -147,6 +159,25 @@
"cmd": [
"python",
"-u",
+ "[BUILD]/scripts/slave/recipe_modules/isolate/resources/find_isolated_tests.py",
+ "--build-dir",
+ "[SLAVE_BUILD]/src/out/Release",
+ "--output-json",
+ "/path/to/tmp/json"
+ ],
+ "name": "find isolated tests",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"browser_tests\": \"[dummy hash for browser_tests]\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"browser_tests\": \"[dummy hash for browser_tests]\"}@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"[BUILD]/scripts/slave/archive_dependencies.py",
"--src-dir",
"[SLAVE_BUILD]/src",

Powered by Google App Engine
This is Rietveld 408576698