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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN.json

Issue 1920283002: Modify Skia recipes to allow running XSAN on Swarming. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Changes based on code review. Created 4 years, 7 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.py ('k') | no next file » | 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-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN.json
similarity index 94%
copy from scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming.json
copy to scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN.json
index 2c286bf9823eb6f3038f39b5d1b5c7a907504928..6d6872da663d08eec7c5cfbc8e826b48121431b3 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN.json
@@ -89,7 +89,7 @@
"-u",
"[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
"/path/to/tmp/json",
- "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming"
+ "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN"
],
"cwd": "[SLAVE_BUILD]/skia",
"name": "exec buildbot_spec.py",
@@ -105,7 +105,7 @@
"@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Swarming\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"SwarmingMSAN\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"model\": \"GCE\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@",
@@ -123,7 +123,7 @@
"@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@",
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
@@ -383,19 +383,20 @@
"-u",
"[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
"/path/to/tmp/json",
- "Build-Ubuntu-GCC-x86_64-Debug-Swarming"
+ "Build-Ubuntu-GCC-x86_64-Debug-SwarmingMSAN"
],
"cwd": "[SLAVE_BUILD]/skia",
"name": "exec buildbot_spec.py (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"most\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dm\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Swarming\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"SwarmingMSAN\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@",
@@ -408,12 +409,12 @@
"@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"env\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@",
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
@@ -526,7 +527,7 @@
"--shards",
"1",
"--task-name",
- "compile_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5",
+ "compile_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN/5",
"--dump-json",
"/path/to/tmp/json",
"--expiration",
@@ -545,7 +546,7 @@
"pool",
"Skia",
"--tag",
- "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming",
+ "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN",
"--tag",
"buildnumber:5",
"--tag",
@@ -566,7 +567,7 @@
"--workdir",
"../../..",
"skia/swarm_compile",
- "buildername=Build-Ubuntu-GCC-x86_64-Debug-Swarming",
+ "buildername=Build-Ubuntu-GCC-x86_64-Debug-SwarmingMSAN",
"mastername=client.skia.fyi",
"buildnumber=5",
"slavename=skiabot-linux-housekeeper-003",
@@ -577,9 +578,9 @@
"name": "[trigger] compile_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN/5\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN/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\"@@@",
@@ -602,7 +603,7 @@
"--print-status-updates",
"--shards",
"1",
- "compile_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5",
+ "compile_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN/5",
"--task-summary-json",
"/path/to/tmp/json"
],
@@ -820,7 +821,7 @@
"--shards",
"1",
"--task-name",
- "test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5",
+ "test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN/5",
"--dump-json",
"/path/to/tmp/json",
"--expiration",
@@ -842,7 +843,7 @@
"pool",
"Skia",
"--tag",
- "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming",
+ "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN",
"--tag",
"buildnumber:5",
"--tag",
@@ -862,7 +863,7 @@
"--workdir",
"../../..",
"skia/swarm_test",
- "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming",
+ "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN",
"mastername=client.skia.fyi",
"buildnumber=5",
"slavename=skiabot-linux-housekeeper-003",
@@ -873,9 +874,9 @@
"name": "[trigger] test_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN/5\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN/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\"@@@",
@@ -994,7 +995,7 @@
"--shards",
"1",
"--task-name",
- "perf_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5",
+ "perf_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN/5",
"--dump-json",
"/path/to/tmp/json",
"--expiration",
@@ -1016,7 +1017,7 @@
"pool",
"Skia",
"--tag",
- "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming",
+ "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN",
"--tag",
"buildnumber:5",
"--tag",
@@ -1036,7 +1037,7 @@
"--workdir",
"../../..",
"skia/swarm_perf",
- "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming",
+ "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN",
"mastername=client.skia.fyi",
"buildnumber=5",
"slavename=skiabot-linux-housekeeper-003",
@@ -1047,9 +1048,9 @@
"name": "[trigger] perf_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"perf_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"perf_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN/5\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"perf_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN/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\"@@@",
@@ -1091,7 +1092,7 @@
"--print-status-updates",
"--shards",
"1",
- "test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5",
+ "test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN/5",
"--task-summary-json",
"/path/to/tmp/json",
"--task-output-dir",
@@ -1146,55 +1147,6 @@
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[SLAVE_BUILD]/dm"
- ],
- "name": "rmtree dm_dir",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n",
- "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/dm",
- "[SLAVE_BUILD]/dm",
- "0"
- ],
- "name": "dm_dir"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[build::skia]/resources/upload_dm_results.py",
- "[SLAVE_BUILD]/dm",
- "164710",
- "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming",
- "5",
- "",
- "[SLAVE_BUILD]/skia/common/py/utils"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "env": {
- "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
- "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"
- },
- "name": "Upload DM Results"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
"[SLAVE_BUILD]/swarming_temp_dir/outputs/perf_skia"
],
"name": "rmtree results_dir (2)",
@@ -1221,7 +1173,7 @@
"--print-status-updates",
"--shards",
"1",
- "perf_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5",
+ "perf_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN/5",
"--task-summary-json",
"/path/to/tmp/json",
"--task-output-dir",
« no previous file with comments | « scripts/slave/recipes/skia/swarm_trigger.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698