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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/swarm_test.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_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json ('k') | scripts/slave/recipes/skia/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN.json
diff --git a/scripts/slave/recipes/skia/swarm_perf.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN.json
similarity index 57%
copy from scripts/slave/recipes/skia/swarm_perf.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
copy to scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN.json
index 0d24b8bbb3ba02dea7fd192244e5dfc29736b2fd..4a60ec73a0cd166d636bc71c2fe02a58d19a2882 100644
--- a/scripts/slave/recipes/skia/swarm_perf.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
+++ b/scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN.json
@@ -5,7 +5,7 @@
"-u",
"[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
"/path/to/tmp/json",
- "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind"
+ "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN"
],
"cwd": "[SLAVE_BUILD]/skia",
"name": "exec buildbot_spec.py",
@@ -18,23 +18,23 @@
"@@@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@ \"cpu_or_gpu\": \"GPU\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"GTX550Ti\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Valgrind\", @@@",
+ "@@@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\": \"SwarmingMSAN\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"model\": \"ShuttleA\", @@@",
+ "@@@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\": 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_release_optimization_level=1 skia_warnings_as_errors=0\"@@@",
+ "@@@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\"@@@",
@@ -67,65 +67,57 @@
},
{
"cmd": [
- "valgrind",
- "--gen-suppressions=all",
- "--leak-check=full",
- "--track-origins=yes",
- "--error-exitcode=1",
- "--num-callers=40",
- "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp",
- "[SLAVE_BUILD]/out/Release/nanobench",
+ "[SLAVE_BUILD]/out/Debug/dm",
"--undefok",
- "-i",
+ "--resourcePath",
"[SLAVE_BUILD]/skia/resources",
"--skps",
"[SLAVE_BUILD]/skps",
"--images",
- "[SLAVE_BUILD]/images/nanobench",
- "--nocpu",
+ "[SLAVE_BUILD]/images/dm",
+ "--nameByHash",
+ "--properties",
+ "gitHash",
+ "abc123",
+ "master",
+ "client.skia",
+ "builder",
+ "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SwarmingMSAN",
+ "build_number",
+ "5",
+ "--key",
+ "arch",
+ "x86_64",
+ "compiler",
+ "GCC",
+ "configuration",
+ "Debug",
+ "cpu_or_gpu",
+ "CPU",
+ "cpu_or_gpu_value",
+ "AVX2",
+ "extra_config",
+ "SwarmingMSAN",
+ "model",
+ "GCE",
+ "os",
+ "Ubuntu",
+ "--nogpu",
"--dummy-flags"
],
"env": {
- "BUILDTYPE": "Release",
+ "ASAN_OPTIONS": "symbolize=1 detect_leaks=1",
+ "BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
- "GYP_DEFINES": "skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=0",
- "PATH": "[DEPOT_TOOLS]:%(PATH)s",
+ "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",
+ "PATH": "[DEPOT_TOOLS]:%(PATH)s:[SLAVE_BUILD]/llvm-build/Release+Asserts/bin",
"PYTHONPATH": "[BUILD]/scripts",
- "SKIA_OUT": "[SLAVE_BUILD]/out"
+ "SKIA_OUT": "[SLAVE_BUILD]/out",
+ "TSAN_OPTIONS": "suppressions=[SLAVE_BUILD]/skia/tools/tsan.supp",
+ "UBSAN_OPTIONS": "suppressions=[SLAVE_BUILD]/skia/tools/ubsan.supp"
},
- "name": "nanobench"
- },
- {
- "cmd": [
- "valgrind",
- "--gen-suppressions=all",
- "--leak-check=full",
- "--track-origins=yes",
- "--error-exitcode=1",
- "--num-callers=40",
- "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp",
- "[SLAVE_BUILD]/out/Release/nanobench",
- "--undefok",
- "-i",
- "[SLAVE_BUILD]/skia/resources",
- "--skps",
- "[SLAVE_BUILD]/skps",
- "--images",
- "[SLAVE_BUILD]/images/nanobench",
- "--nocpu",
- "--dummy-flags",
- "--abandonGpuContext",
- "--nocpu"
- ],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "GYP_DEFINES": "skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=0",
- "PATH": "[DEPOT_TOOLS]:%(PATH)s",
- "PYTHONPATH": "[BUILD]/scripts",
- "SKIA_OUT": "[SLAVE_BUILD]/out"
- },
- "name": "nanobench --abandonGpuContext"
+ "name": "dm"
},
{
"name": "$result",
« no previous file with comments | « scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json ('k') | scripts/slave/recipes/skia/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698