Index: scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Android_deterministic_build.json |
diff --git a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Android_deterministic_build.json b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Android_deterministic_build.json |
index ed833c878524e585d30956f6b2fbe01d17e275c7..747029b1f2ee01f362c7fad33ed24ac586115818 100644 |
--- a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Android_deterministic_build.json |
+++ b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Android_deterministic_build.json |
@@ -94,7 +94,7 @@ |
], |
"env": { |
"GYP_CROSSCOMPILE": "1", |
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm test_isolation_mode=prepare use_goma=1", |
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1", |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "gclient runhooks" |
@@ -144,39 +144,6 @@ |
"cmd": [ |
"python", |
"-u", |
- "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", |
- "/path/to/tmp/", |
- "[SLAVE_BUILD]/src/out/Release/*.isolated.gen.json" |
- ], |
- "name": "find isolated targets" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py", |
- "batcharchive", |
- "--dump-json", |
- "/path/to/tmp/json", |
- "--isolate-server", |
- "https://isolateserver.appspot.com", |
- "[SLAVE_BUILD]/src/out/Release/dummy_target_1.isolated.gen.json", |
- "[SLAVE_BUILD]/src/out/Release/dummy_target_2.isolated.gen.json" |
- ], |
- "name": "isolate tests", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@", |
- "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
"\nimport os\nimport shutil\nimport sys\nif os.path.exists(sys.argv[2]):\n shutil.rmtree(sys.argv[2])\nshutil.move(sys.argv[1], sys.argv[2])", |
"[SLAVE_BUILD]/src/out/Release", |
"[SLAVE_BUILD]/src/out/Release.1" |
@@ -202,7 +169,7 @@ |
], |
"env": { |
"GYP_CROSSCOMPILE": "1", |
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm test_isolation_mode=prepare use_goma=1", |
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1", |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "gclient runhooks (2)" |
@@ -248,39 +215,6 @@ |
"cmd": [ |
"python", |
"-u", |
- "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", |
- "/path/to/tmp/", |
- "[SLAVE_BUILD]/src/out/Release/*.isolated.gen.json" |
- ], |
- "name": "find isolated targets (2)" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py", |
- "batcharchive", |
- "--dump-json", |
- "/path/to/tmp/json", |
- "--isolate-server", |
- "https://isolateserver.appspot.com", |
- "[SLAVE_BUILD]/src/out/Release/dummy_target_1.isolated.gen.json", |
- "[SLAVE_BUILD]/src/out/Release/dummy_target_2.isolated.gen.json" |
- ], |
- "name": "isolate tests (2)", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@", |
- "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
"\nimport os\nimport shutil\nimport sys\nif os.path.exists(sys.argv[2]):\n shutil.rmtree(sys.argv[2])\nshutil.move(sys.argv[1], sys.argv[2])", |
"[SLAVE_BUILD]/src/out/Release", |
"[SLAVE_BUILD]/src/out/Release.2" |