| Index: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming.json
|
| diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming.json
|
| index 16b056743a4c4de0aa4246bca5ec65d0d33df4d5..128089604f9fc5d9fe63ef26b49cedeb2d8815df 100644
|
| --- a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming.json
|
| +++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming.json
|
| @@ -469,7 +469,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n",
|
| + "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n",
|
| "[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated",
|
| "[dummy hash for isolate_recipes]"
|
| ],
|
| @@ -480,6 +480,8 @@
|
| "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1]) as f:@@@",
|
| "@@@STEP_LOG_LINE@python.inline@ isolated = json.load(f)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if not isolated.get('includes'):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ isolated['includes'] = []@@@",
|
| "@@@STEP_LOG_LINE@python.inline@for h in sys.argv[2:]:@@@",
|
| "@@@STEP_LOG_LINE@python.inline@ isolated['includes'].append(h)@@@",
|
| "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1], 'w') as f:@@@",
|
| @@ -760,7 +762,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n",
|
| + "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n",
|
| "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated",
|
| "[dummy hash for isolate_recipes]",
|
| "abc123"
|
| @@ -772,6 +774,8 @@
|
| "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1]) as f:@@@",
|
| "@@@STEP_LOG_LINE@python.inline@ isolated = json.load(f)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if not isolated.get('includes'):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ isolated['includes'] = []@@@",
|
| "@@@STEP_LOG_LINE@python.inline@for h in sys.argv[2:]:@@@",
|
| "@@@STEP_LOG_LINE@python.inline@ isolated['includes'].append(h)@@@",
|
| "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1], 'w') as f:@@@",
|
|
|