AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update clang_linux to version 4

Browse Source 
Bug: skia:
Change-Id: Iab4fcd7b8f17fa7bf478e879a325759e0c622b1a
Reviewed-on: https://skia-review.googlesource.com/13120
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
This commit is contained in:
Kevin Lubick 2017-04-13 08:00:16 -04:00
parent 96d5b9a273
commit ea0f845bf6
6 changed files with 204 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/assets/clang_linux/VERSION
View File

@ -1 +1 @@
4
8

2
infra/bots/assets/clang_linux/create.py
View File

@ -15,7 +15,7 @@ import subprocess
import tempfile
REPO = "https://llvm.googlesource.com/"
BRANCH = "release_39"
BRANCH = "release_40"
def create_asset(target_dir):
# Build Clang, lld, compiler-rt (sanitizer support) and libc++.

3
infra/bots/recipe_modules/flavor/gn_flavor.py
View File

@ -44,7 +44,8 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
if compiler == 'Clang' and os == 'Ubuntu':
cc = clang_linux + '/bin/clang'
cxx = clang_linux + '/bin/clang++'
extra_ldflags.append('-fuse-ld=lld')
if 'MSAN' not in extra_config:
extra_ldflags.append('-fuse-ld=lld')
elif compiler == 'Clang':
cc, cxx = 'clang', 'clang++'
elif compiler == 'GCC':

175
infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json Normal file
View File

@ -0,0 +1,175 @@
[
{
"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",
"[CUSTOM_/_B_WORK]",
"511"
],
"infra_step": true,
"name": "makedirs checkout_path",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec",
"cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
"--patch_root",
"skia",
"--revision_mapping_file",
"{\"skia\": \"got_revision\"}",
"--git-cache-dir",
"[CUSTOM_/_B_CACHE]",
"--output_json",
"/path/to/tmp/json",
"--revision",
"skia@abc123",
"--output_manifest"
],
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/skia.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"skia\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
"@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@"
]
},
{
"cmd": [
"python",
"-u",
"[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-MSAN"
},
"infra_step": true,
"name": "fetch-gn"
},
{
"cmd": [
"[CUSTOM_/_B_WORK]/skia/bin/gn",
"gen",
"[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-MSAN/Debug",
"--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-O1\"] extra_ldflags=[\"-L[START_DIR]/clang_linux/msan\"] sanitize=\"MSAN\" skia_use_fontconfig=false target_cpu=\"x86_64\""
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-MSAN"
},
"name": "gn gen"
},
{
"cmd": [
"ninja",
"-C",
"[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-MSAN/Debug"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-MSAN"
},
"name": "ninja"
},
{
"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', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\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_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-MSAN/Debug",
"[CUSTOM_[SWARM_OUT_DIR]]/out/Debug"
],
"infra_step": true,
"name": "copy build products",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import errno@@@",
"@@@STEP_LOG_LINE@python.inline@import glob@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@import shutil@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@try:@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@",
"@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@",
"@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@",
"@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@",
"@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@",
"@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@",
"@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@",
"@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]

1
infra/bots/recipes/compile.py
View File

@ -87,6 +87,7 @@ TEST_BUILDERS = [
'Build-Ubuntu-Clang-mipsel-Debug-Android',
'Build-Ubuntu-Clang-x86_64-Debug',
'Build-Ubuntu-Clang-x86_64-Debug-ASAN',
'Build-Ubuntu-Clang-x86_64-Debug-MSAN',
'Build-Ubuntu-Clang-x86_64-Release-Mini',
'Build-Ubuntu-Clang-x86_64-Release-Vulkan',
'Build-Ubuntu-GCC-arm-Release-Chromecast',

48
infra/bots/tasks.json
View File

@ -2254,7 +2254,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
},
{
"name": "skia/bots/armhf_sysroot",
@ -2322,7 +2322,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
},
{
"name": "skia/bots/armhf_sysroot",
@ -2796,7 +2796,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dimensions": [
@ -2825,7 +2825,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dimensions": [
@ -2854,7 +2854,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dimensions": [
@ -2883,7 +2883,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
},
{
"name": "skia/bots/linux_vulkan_sdk",
@ -2917,7 +2917,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dimensions": [
@ -2946,7 +2946,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dimensions": [
@ -2975,7 +2975,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dimensions": [
@ -3004,7 +3004,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dimensions": [
@ -3033,7 +3033,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dimensions": [
@ -3062,7 +3062,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
},
{
"name": "skia/bots/linux_vulkan_sdk",
@ -6414,7 +6414,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dependencies": [
@ -6466,7 +6466,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dependencies": [
@ -6565,7 +6565,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dependencies": [
@ -6664,7 +6664,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dependencies": [
@ -6715,7 +6715,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dependencies": [
@ -12307,7 +12307,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dependencies": [
@ -12359,7 +12359,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dependencies": [
@ -12458,7 +12458,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dependencies": [
@ -12557,7 +12557,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dependencies": [
@ -12609,7 +12609,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dependencies": [
@ -12660,7 +12660,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dependencies": [
@ -12711,7 +12711,7 @@
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
"version": "version:8"
}
],
"dependencies": [