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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/skia.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/skia.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json ('k') | scripts/slave/recipes/skia/swarm_compile.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN.json
diff --git a/scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN.json
similarity index 78%
copy from scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
copy to scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN.json
index f054bda8a65722563a4f1d915a776ce517e897f1..d8497ac4be0eb899689c644fea9c5ee7db11348e 100644
--- a/scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
+++ b/scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN.json
@@ -91,32 +91,33 @@
"-u",
"[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
"/path/to/tmp/json",
- "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN"
+ "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN"
],
"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@ \"dm\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@",
"@@@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@ \"compiler\": \"GCC\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@",
+ "@@@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\": \"TSAN\", @@@",
+ "@@@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\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@",
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"env\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0\"@@@",
@@ -133,19 +134,33 @@
{
"cmd": [
"[SLAVE_BUILD]/skia/tools/xsan_build",
- "thread",
+ "memory",
"dm"
],
"cwd": "[SLAVE_BUILD]/skia",
"env": {
- "BUILDTYPE": "Release",
+ "BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
- "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN"
+ "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN"
},
"name": "build dm"
},
{
"cmd": [
+ "[SLAVE_BUILD]/skia/tools/xsan_build",
+ "memory",
+ "nanobench"
+ ],
+ "cwd": "[SLAVE_BUILD]/skia",
+ "env": {
+ "BUILDTYPE": "Debug",
+ "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
+ "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN"
+ },
+ "name": "build nanobench"
+ },
+ {
+ "cmd": [
"python",
"-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
@@ -208,7 +223,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN/Release/dm",
+ "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN/Debug/dm",
"--undefok",
"--resourcePath",
"[SLAVE_BUILD]/skia/resources",
@@ -221,9 +236,9 @@
"gitHash",
"164710",
"master",
- "client.skia",
+ "client.skia.fyi",
"builder",
- "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN",
+ "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN",
"build_number",
"5",
"--key",
@@ -232,13 +247,13 @@
"compiler",
"GCC",
"configuration",
- "Release",
+ "Debug",
"cpu_or_gpu",
"CPU",
"cpu_or_gpu_value",
"AVX2",
"extra_config",
- "TSAN",
+ "SwarmingMSAN",
"model",
"GCE",
"os",
@@ -248,16 +263,40 @@
],
"env": {
"ASAN_OPTIONS": "symbolize=1 detect_leaks=1",
- "BUILDTYPE": "Release",
+ "BUILDTYPE": "Debug",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
"LSAN_OPTIONS": "symbolize=1 print_suppressions=1 suppressions=[SLAVE_BUILD]/skia/tools/lsan.supp",
- "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN",
+ "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN",
"TSAN_OPTIONS": "suppressions=[SLAVE_BUILD]/skia/tools/tsan.supp",
"UBSAN_OPTIONS": "suppressions=[SLAVE_BUILD]/skia/tools/ubsan.supp"
},
"name": "dm"
},
{
+ "cmd": [
+ "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN/Debug/nanobench",
+ "--undefok",
+ "-i",
+ "[SLAVE_BUILD]/skia/resources",
+ "--skps",
+ "[SLAVE_BUILD]/playback/skps",
+ "--images",
+ "[SLAVE_BUILD]/images/nanobench",
+ "--nogpu",
+ "--dummy-flags"
+ ],
+ "env": {
+ "ASAN_OPTIONS": "symbolize=1 detect_leaks=1",
+ "BUILDTYPE": "Debug",
+ "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
+ "LSAN_OPTIONS": "symbolize=1 print_suppressions=1 suppressions=[SLAVE_BUILD]/skia/tools/lsan.supp",
+ "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN",
+ "TSAN_OPTIONS": "suppressions=[SLAVE_BUILD]/skia/tools/tsan.supp",
+ "UBSAN_OPTIONS": "suppressions=[SLAVE_BUILD]/skia/tools/ubsan.supp"
+ },
+ "name": "nanobench"
+ },
+ {
"name": "$result",
"recipe_result": null,
"status_code": 0
« no previous file with comments | « scripts/slave/recipes/skia/skia.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json ('k') | scripts/slave/recipes/skia/swarm_compile.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698