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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-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_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json ('k') | scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-CMake.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SwarmingMSAN.json
diff --git a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SwarmingMSAN.json
similarity index 73%
copy from scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json
copy to scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SwarmingMSAN.json
index a208c2e17e43b04a898a9fad02d68a9c67ccdb58..f98856abb108e14e41b3b79c6cf2576d26c78744 100644
--- a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json
+++ b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SwarmingMSAN.json
@@ -28,7 +28,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
- "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
+ "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\ntarget_os = ['llvm']"
],
"cwd": "[CUSTOM_/_B_CACHE]",
"env": {
@@ -50,6 +50,8 @@
"--delete_unversioned_trees",
"--revision",
"skia@abc123",
+ "--revision",
+ "src@origin/lkgr",
"--output-json",
"/path/to/tmp/json"
],
@@ -65,6 +67,9 @@
"@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": 164710@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
@@ -76,34 +81,48 @@
"cmd": [
"python",
"-u",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+ "runhooks"
+ ],
+ "cwd": "[CUSTOM_/_B_CACHE]",
+ "env": {
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ },
+ "name": "gclient runhooks"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"[CUSTOM_/_B_CACHE]/skia/tools/buildbot_spec.py",
"/path/to/tmp/json",
- "Build-Ubuntu-GCC-x86_64-Release-Valgrind"
+ "Build-Ubuntu-GCC-x86_64-Debug-SwarmingMSAN"
],
"cwd": "[CUSTOM_/_B_CACHE]/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@ \"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\": \"Release\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Valgrind\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",
+ "@@@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\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@",
"@@@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_test_steps\": false, @@@",
"@@@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=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\"@@@",
@@ -116,28 +135,45 @@
},
{
"cmd": [
- "make",
- "most"
+ "[CUSTOM_/_B_CACHE]/skia/tools/xsan_build",
+ "memory",
+ "dm"
],
"cwd": "[CUSTOM_/_B_CACHE]/skia",
"env": {
- "BUILDTYPE": "Release",
+ "BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
- "CHROME_PATH": "[SLAVE_BUILD]/src",
- "GYP_DEFINES": "skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=1",
+ "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
"PATH": "[DEPOT_TOOLS]:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"PYTHONPATH": "[BUILD]/scripts",
- "SKIA_OUT": "[CUSTOM_/_B_CACHE]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind"
+ "SKIA_OUT": "[CUSTOM_/_B_CACHE]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SwarmingMSAN"
},
- "name": "build most"
+ "name": "build dm"
+ },
+ {
+ "cmd": [
+ "[CUSTOM_/_B_CACHE]/skia/tools/xsan_build",
+ "memory",
+ "nanobench"
+ ],
+ "cwd": "[CUSTOM_/_B_CACHE]/skia",
+ "env": {
+ "BUILDTYPE": "Debug",
+ "CHROME_HEADLESS": "1",
+ "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
+ "PATH": "[DEPOT_TOOLS]:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
+ "PYTHONPATH": "[BUILD]/scripts",
+ "SKIA_OUT": "[CUSTOM_/_B_CACHE]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SwarmingMSAN"
+ },
+ "name": "build nanobench"
},
{
"cmd": [
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
- "[CUSTOM_/_B_CACHE]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind/Release",
- "[SWARM_OUT_DIR]/out/Release"
+ "[CUSTOM_/_B_CACHE]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SwarmingMSAN/Debug",
+ "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug"
],
"name": "copy build products",
"~followup_annotations": [
@@ -169,6 +205,28 @@
]
},
{
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n",
+ "[CUSTOM_/_B_CACHE]/skia/third_party/externals/llvm/msan_out",
+ "[CUSTOM_[SWARM_OUT_DIR]]/third_party/externals/llvm/msan_out",
+ "1"
+ ],
+ "name": "copy msan_out"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n",
+ "[CUSTOM_/_B_CACHE]/src/third_party/llvm-build",
+ "[CUSTOM_[SWARM_OUT_DIR]]/llvm-build",
+ "1"
+ ],
+ "name": "copy llvm-build"
+ },
+ {
"name": "$result",
"recipe_result": null,
"status_code": 0
« no previous file with comments | « scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json ('k') | scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-CMake.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698