Index: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Swarming.json |
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Swarming.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Swarming.json |
index 034816375ecd64311f8c34d59d840b6da28d6ab5..b913a141f3cfe3bfda2a26426ef9abf891a073bc 100644 |
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Swarming.json |
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Swarming.json |
@@ -335,7 +335,7 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--extra-variable\", \n \"BUILDER_NAME\", \n \"Build-Win8-MSVC-x86_64-Release-Swarming\"\n ], \n \"dir\": \"[SLAVE_BUILD]/skia/infra/bots\", \n \"version\": 1\n}", |
+ "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", |
"[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" |
], |
"cwd": "[SLAVE_BUILD]", |
@@ -369,9 +369,10 @@ |
"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(sys.argv[2])\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)\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", |
- "705384d88f80da637eb367e5acc6f315c0e1db2f" |
+ "705384d88f80da637eb367e5acc6f315c0e1db2f", |
+ "8ba778e47df2a9b46355cf72c58b58fdb1a7f350" |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "add_isolated_input", |
@@ -382,7 +383,7 @@ |
"@@@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@for h in sys.argv[2:]:@@@", |
- "@@@STEP_LOG_LINE@python.inline@ isolated['includes'].append(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:@@@", |
"@@@STEP_LOG_LINE@python.inline@ json.dump(isolated, f, sort_keys=True)@@@", |
"@@@STEP_LOG_END@python.inline@@@" |
@@ -452,7 +453,19 @@ |
"--tag", |
"stepname:compile_skia on Windows", |
"--idempotent", |
- "def456" |
+ "def456", |
+ "--", |
+ "cook", |
+ "-repository", |
+ "https://chromium.googlesource.com/chromium/tools/build", |
+ "-revision", |
+ "", |
+ "-recipe", |
+ "skia/swarm_compile", |
+ "-properties", |
+ "{\"buildername\": \"Build-Win8-MSVC-x86_64-Release-Swarming\", \"mastername\": \"client.skia.fyi\", \"buildnumber\": 5, \"slavename\": \"skiabot-linux-housekeeper-003\", \"reason\": \"Triggered by Skia swarm_trigger Recipe\", \"swarm_out_dir\": \"${ISOLATED_OUTDIR}\", \"revision\": 164710}", |
+ "-workdir", |
+ "../../.." |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "[trigger] compile_skia on Windows", |
@@ -586,7 +599,7 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--blacklist\", \n \".git\", \n \"--extra-variable\", \n \"BUILD_NUMBER\", \n \"5\", \n \"--extra-variable\", \n \"MASTER_NAME\", \n \"client.skia.fyi\", \n \"--extra-variable\", \n \"SLAVE_NAME\", \n \"skiabot-linux-housekeeper-003\", \n \"--extra-variable\", \n \"BUILDER_NAME\", \n \"Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Swarming\", \n \"--extra-variable\", \n \"PATCHSET\", \n \"\", \n \"--extra-variable\", \n \"ISSUE\", \n \"\", \n \"--extra-variable\", \n \"REVISION\", \n 164710\n ], \n \"dir\": \"[SLAVE_BUILD]/skia/infra/bots\", \n \"version\": 1\n}", |
+ "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", |
"[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" |
], |
"cwd": "[SLAVE_BUILD]", |
@@ -620,9 +633,10 @@ |
"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(sys.argv[2])\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)\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", |
- "abc123" |
+ "abc123", |
+ "8ba778e47df2a9b46355cf72c58b58fdb1a7f350" |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "add_isolated_input (2)", |
@@ -633,7 +647,7 @@ |
"@@@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@for h in sys.argv[2:]:@@@", |
- "@@@STEP_LOG_LINE@python.inline@ isolated['includes'].append(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:@@@", |
"@@@STEP_LOG_LINE@python.inline@ json.dump(isolated, f, sort_keys=True)@@@", |
"@@@STEP_LOG_END@python.inline@@@" |
@@ -702,7 +716,19 @@ |
"slavename:skiabot-linux-housekeeper-003", |
"--tag", |
"stepname:test_skia on Windows", |
- "def456" |
+ "def456", |
+ "--", |
+ "cook", |
+ "-repository", |
+ "https://chromium.googlesource.com/chromium/tools/build", |
+ "-revision", |
+ "", |
+ "-recipe", |
+ "skia/swarm_test", |
+ "-properties", |
+ "{\"buildername\": \"Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Swarming\", \"mastername\": \"client.skia.fyi\", \"buildnumber\": 5, \"slavename\": \"skiabot-linux-housekeeper-003\", \"reason\": \"Triggered by Skia swarm_trigger Recipe\", \"swarm_out_dir\": \"${ISOLATED_OUTDIR}\", \"revision\": 164710}", |
+ "-workdir", |
+ "../../.." |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "[trigger] test_skia on Windows", |