Index: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release-Swarming.json |
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release-Swarming.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release-Swarming.json |
index 5ee41777eadc22f207179a8d7da566208fbc4b32..8588d88bd8a0d303822f274106a0fe23f919b88c 100644 |
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release-Swarming.json |
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release-Swarming.json |
@@ -468,7 +468,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]" |
], |
@@ -479,6 +479,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:@@@", |
@@ -759,7 +761,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" |
@@ -771,6 +773,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:@@@", |