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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json

Issue 1916263003: Reland "Skia: Maintain a checkout on swarming (compile) bots" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Fix expectations after roll Created 4 years, 8 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
« no previous file with comments | « scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming.json ('k') | scripts/slave/recipes/skia/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Swarming.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
index c010e1c69ae1ac0eb22e7b8fd51e1d96a4254c3d..272be61f383589add487d8e3666e4757a58010a9 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
@@ -466,7 +466,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]"
],
@@ -477,6 +477,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:@@@",
@@ -757,7 +759,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"
@@ -769,6 +771,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:@@@",
@@ -926,7 +930,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-perf_skia.isolated",
"[dummy hash for isolate_recipes]",
"abc123"
@@ -938,6 +942,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:@@@",
« no previous file with comments | « scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming.json ('k') | scripts/slave/recipes/skia/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Swarming.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698