Index: scripts/slave/recipes/skia/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-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-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming.json |
similarity index 94% |
copy from scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming.json |
copy to scripts/slave/recipes/skia/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming.json |
index 57a312385a2d45ff8c7280b18ab07f89f9db4774..2d9f73089a0c202cc1783c7f1a3e46133aaff2bc 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-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming.json |
@@ -91,28 +91,29 @@ |
"-u", |
"[SLAVE_BUILD]/skia/tools/buildbot_spec.py", |
"/path/to/tmp/json", |
- "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming" |
+ "Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming" |
], |
"cwd": "[SLAVE_BUILD]/skia", |
"name": "exec buildbot_spec.py", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
"@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"iOSShell\"@@@", |
"@@@STEP_LOG_LINE@json.output@ ], @@@", |
"@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm7\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"SGX554\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Swarming\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"model\": \"MacMini6.2\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"Mac\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"model\": \"iPad4\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"os\": \"iOS\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"iPad4,1\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", |
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", |
"@@@STEP_LOG_LINE@json.output@ ], @@@", |
@@ -121,7 +122,7 @@ |
"@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", |
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", |
@@ -385,7 +386,7 @@ |
"-u", |
"[SLAVE_BUILD]/skia/tools/buildbot_spec.py", |
"/path/to/tmp/json", |
- "Build-Mac-Clang-x86_64-Release-Swarming" |
+ "Build-Mac-Clang-Arm7-Release-iOS" |
], |
"cwd": "[SLAVE_BUILD]/skia", |
"name": "exec buildbot_spec.py (2)", |
@@ -397,11 +398,11 @@ |
"@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Swarming\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"iOS\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"os\": \"Mac\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"Arm7\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", |
@@ -412,7 +413,7 @@ |
"@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=1\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", |
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", |
@@ -533,7 +534,7 @@ |
"--shards", |
"1", |
"--task-name", |
- "compile_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5", |
+ "compile_skia/Mac/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5", |
"--dump-json", |
"/path/to/tmp/json", |
"--expiration", |
@@ -552,7 +553,7 @@ |
"pool", |
"Skia", |
"--tag", |
- "buildername:Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming", |
+ "buildername:Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming", |
"--tag", |
"buildnumber:5", |
"--tag", |
@@ -573,7 +574,7 @@ |
"--workdir", |
"../../..", |
"skia/swarm_compile", |
- "buildername=Build-Mac-Clang-x86_64-Release-Swarming", |
+ "buildername=Build-Mac-Clang-Arm7-Release-iOS", |
"mastername=client.skia.fyi", |
"buildnumber=5", |
"slavename=skiabot-linux-housekeeper-003", |
@@ -585,9 +586,9 @@ |
"name": "[trigger] compile_skia on Mac", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Mac/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Mac/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", |
@@ -610,7 +611,7 @@ |
"--print-status-updates", |
"--shards", |
"1", |
- "compile_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5", |
+ "compile_skia/Mac/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5", |
"--task-summary-json", |
"/path/to/tmp/json" |
], |
@@ -837,7 +838,7 @@ |
"--shards", |
"1", |
"--task-name", |
- "test_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5", |
+ "test_skia/iOS-9.2/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5", |
"--dump-json", |
"/path/to/tmp/json", |
"--expiration", |
@@ -847,16 +848,16 @@ |
"--hard-timeout", |
"3600", |
"--dimension", |
- "gpu", |
- "none", |
+ "device", |
+ "iPad4,1", |
"--dimension", |
"os", |
- "Mac", |
+ "iOS-9.2", |
"--dimension", |
"pool", |
"Skia", |
"--tag", |
- "buildername:Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming", |
+ "buildername:Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming", |
"--tag", |
"buildnumber:5", |
"--tag", |
@@ -866,17 +867,17 @@ |
"--tag", |
"name:test_skia", |
"--tag", |
- "os:Mac", |
+ "os:iOS-9.2", |
"--tag", |
"slavename:skiabot-linux-housekeeper-003", |
"--tag", |
- "stepname:test_skia on Mac", |
+ "stepname:test_skia on iOS-9.2", |
"def456", |
"--", |
"--workdir", |
"../../..", |
"skia/swarm_test", |
- "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming", |
+ "buildername=Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming", |
"mastername=client.skia.fyi", |
"buildnumber=5", |
"slavename=skiabot-linux-housekeeper-003", |
@@ -885,12 +886,12 @@ |
"revision=164710" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "[trigger] test_skia on Mac", |
+ "name": "[trigger] test_skia on iOS-9.2", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/iOS-9.2/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"test_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"test_skia/iOS-9.2/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", |
@@ -933,14 +934,14 @@ |
"--print-status-updates", |
"--shards", |
"1", |
- "test_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5", |
+ "test_skia/iOS-9.2/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5", |
"--task-summary-json", |
"/path/to/tmp/json", |
"--task-output-dir", |
"[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "test_skia on Mac", |
+ "name": "test_skia on iOS-9.2", |
"~followup_annotations": [ |
"@@@STEP_TEXT@swarming pending 71s@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -1023,7 +1024,7 @@ |
"RECIPE_MODULE[build::skia]/resources/upload_dm_results.py", |
"[SLAVE_BUILD]/dm", |
"164710", |
- "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming", |
+ "Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming", |
"5", |
"", |
"[SLAVE_BUILD]/skia/common/py/utils" |