зеркало из https://github.com/AvaloniaUI/angle.git
infra: Switch ASAN to 64-bit on Windows.
ASAN is not supported in 32-bits on Windows. Bug: angleproject:5795 Change-Id: Icabf31b8c9ad4d371217c9f4a288f909888eae61 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3265532 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>
This commit is contained in:
Родитель
651ae514bd
Коммит
a9f24fa529
|
@ -546,6 +546,48 @@ buckets {
|
|||
enable: true
|
||||
}
|
||||
}
|
||||
builders {
|
||||
name: "win-asan-test"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
dimensions: "builderless:1"
|
||||
dimensions: "os:Windows"
|
||||
exe {
|
||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||
cipd_version: "refs/heads/main"
|
||||
cmd: "recipes"
|
||||
}
|
||||
properties:
|
||||
'{'
|
||||
' "$build/goma": {'
|
||||
' "enable_ats": true,'
|
||||
' "rpc_extra_params": "?prod",'
|
||||
' "server_host": "goma.chromium.org"'
|
||||
' },'
|
||||
' "$recipe_engine/resultdb/test_presentation": {'
|
||||
' "column_keys": ['
|
||||
' "v.gpu"'
|
||||
' ],'
|
||||
' "grouping_keys": ['
|
||||
' "status",'
|
||||
' "v.test_suite"'
|
||||
' ]'
|
||||
' },'
|
||||
' "builder_group": "angle",'
|
||||
' "platform": "win",'
|
||||
' "recipe": "angle",'
|
||||
' "test_mode": "compile_and_test",'
|
||||
' "toolchain": "clang"'
|
||||
'}'
|
||||
build_numbers: YES
|
||||
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
|
||||
experiments {
|
||||
key: "luci.use_realms"
|
||||
value: 100
|
||||
}
|
||||
resultdb {
|
||||
enable: true
|
||||
}
|
||||
}
|
||||
builders {
|
||||
name: "win-dbg-compile"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
|
@ -840,48 +882,6 @@ buckets {
|
|||
enable: true
|
||||
}
|
||||
}
|
||||
builders {
|
||||
name: "win-x86-asan-test"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
dimensions: "builderless:1"
|
||||
dimensions: "os:Windows"
|
||||
exe {
|
||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||
cipd_version: "refs/heads/main"
|
||||
cmd: "recipes"
|
||||
}
|
||||
properties:
|
||||
'{'
|
||||
' "$build/goma": {'
|
||||
' "enable_ats": true,'
|
||||
' "rpc_extra_params": "?prod",'
|
||||
' "server_host": "goma.chromium.org"'
|
||||
' },'
|
||||
' "$recipe_engine/resultdb/test_presentation": {'
|
||||
' "column_keys": ['
|
||||
' "v.gpu"'
|
||||
' ],'
|
||||
' "grouping_keys": ['
|
||||
' "status",'
|
||||
' "v.test_suite"'
|
||||
' ]'
|
||||
' },'
|
||||
' "builder_group": "angle",'
|
||||
' "platform": "win",'
|
||||
' "recipe": "angle",'
|
||||
' "test_mode": "compile_and_test",'
|
||||
' "toolchain": "clang"'
|
||||
'}'
|
||||
build_numbers: YES
|
||||
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
|
||||
experiments {
|
||||
key: "luci.use_realms"
|
||||
value: 100
|
||||
}
|
||||
resultdb {
|
||||
enable: true
|
||||
}
|
||||
}
|
||||
builders {
|
||||
name: "win-x86-dbg-compile"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
|
@ -1592,6 +1592,48 @@ buckets {
|
|||
enable: true
|
||||
}
|
||||
}
|
||||
builders {
|
||||
name: "win-asan-test"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
dimensions: "builderless:1"
|
||||
dimensions: "os:Windows"
|
||||
exe {
|
||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||
cipd_version: "refs/heads/main"
|
||||
cmd: "recipes"
|
||||
}
|
||||
properties:
|
||||
'{'
|
||||
' "$build/goma": {'
|
||||
' "enable_ats": true,'
|
||||
' "rpc_extra_params": "?prod",'
|
||||
' "server_host": "goma.chromium.org"'
|
||||
' },'
|
||||
' "$recipe_engine/resultdb/test_presentation": {'
|
||||
' "column_keys": ['
|
||||
' "v.gpu"'
|
||||
' ],'
|
||||
' "grouping_keys": ['
|
||||
' "status",'
|
||||
' "v.test_suite"'
|
||||
' ]'
|
||||
' },'
|
||||
' "builder_group": "angle",'
|
||||
' "platform": "win",'
|
||||
' "recipe": "angle",'
|
||||
' "test_mode": "compile_and_test",'
|
||||
' "toolchain": "clang"'
|
||||
'}'
|
||||
build_numbers: YES
|
||||
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
|
||||
experiments {
|
||||
key: "luci.use_realms"
|
||||
value: 100
|
||||
}
|
||||
resultdb {
|
||||
enable: true
|
||||
}
|
||||
}
|
||||
builders {
|
||||
name: "win-dbg-compile"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
|
@ -1886,48 +1928,6 @@ buckets {
|
|||
enable: true
|
||||
}
|
||||
}
|
||||
builders {
|
||||
name: "win-x86-asan-test"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
dimensions: "builderless:1"
|
||||
dimensions: "os:Windows"
|
||||
exe {
|
||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||
cipd_version: "refs/heads/main"
|
||||
cmd: "recipes"
|
||||
}
|
||||
properties:
|
||||
'{'
|
||||
' "$build/goma": {'
|
||||
' "enable_ats": true,'
|
||||
' "rpc_extra_params": "?prod",'
|
||||
' "server_host": "goma.chromium.org"'
|
||||
' },'
|
||||
' "$recipe_engine/resultdb/test_presentation": {'
|
||||
' "column_keys": ['
|
||||
' "v.gpu"'
|
||||
' ],'
|
||||
' "grouping_keys": ['
|
||||
' "status",'
|
||||
' "v.test_suite"'
|
||||
' ]'
|
||||
' },'
|
||||
' "builder_group": "angle",'
|
||||
' "platform": "win",'
|
||||
' "recipe": "angle",'
|
||||
' "test_mode": "compile_and_test",'
|
||||
' "toolchain": "clang"'
|
||||
'}'
|
||||
build_numbers: YES
|
||||
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
|
||||
experiments {
|
||||
key: "luci.use_realms"
|
||||
value: 100
|
||||
}
|
||||
resultdb {
|
||||
enable: true
|
||||
}
|
||||
}
|
||||
builders {
|
||||
name: "win-x86-dbg-compile"
|
||||
swarming_host: "chromium-swarm.appspot.com"
|
||||
|
|
|
@ -55,6 +55,11 @@ consoles {
|
|||
category: "test|mac|clang|x64"
|
||||
short_name: "rel"
|
||||
}
|
||||
builders {
|
||||
name: "buildbucket/luci.angle.ci/win-asan-test"
|
||||
category: "test|win|clang|x64"
|
||||
short_name: "asan"
|
||||
}
|
||||
builders {
|
||||
name: "buildbucket/luci.angle.ci/win-dbg-compile"
|
||||
category: "compile|win|clang|x64"
|
||||
|
@ -85,11 +90,6 @@ consoles {
|
|||
category: "test|win|clang|x64"
|
||||
short_name: "rel"
|
||||
}
|
||||
builders {
|
||||
name: "buildbucket/luci.angle.ci/win-x86-asan-test"
|
||||
category: "test|win|clang|x64"
|
||||
short_name: "asan"
|
||||
}
|
||||
builders {
|
||||
name: "buildbucket/luci.angle.ci/win-x86-dbg-compile"
|
||||
category: "compile|win|clang|x86"
|
||||
|
@ -176,6 +176,9 @@ consoles {
|
|||
builders {
|
||||
name: "buildbucket/luci.angle.try/mac-test"
|
||||
}
|
||||
builders {
|
||||
name: "buildbucket/luci.angle.try/win-asan-test"
|
||||
}
|
||||
builders {
|
||||
name: "buildbucket/luci.angle.try/win-dbg-compile"
|
||||
}
|
||||
|
@ -194,9 +197,6 @@ consoles {
|
|||
builders {
|
||||
name: "buildbucket/luci.angle.try/win-test"
|
||||
}
|
||||
builders {
|
||||
name: "buildbucket/luci.angle.try/win-x86-asan-test"
|
||||
}
|
||||
builders {
|
||||
name: "buildbucket/luci.angle.try/win-x86-dbg-compile"
|
||||
}
|
||||
|
|
|
@ -134,6 +134,16 @@ job {
|
|||
builder: "mac-test"
|
||||
}
|
||||
}
|
||||
job {
|
||||
id: "win-asan-test"
|
||||
realm: "ci"
|
||||
acl_sets: "ci"
|
||||
buildbucket {
|
||||
server: "cr-buildbucket.appspot.com"
|
||||
bucket: "luci.angle.ci"
|
||||
builder: "win-asan-test"
|
||||
}
|
||||
}
|
||||
job {
|
||||
id: "win-dbg-compile"
|
||||
realm: "ci"
|
||||
|
@ -204,16 +214,6 @@ job {
|
|||
builder: "win-trace"
|
||||
}
|
||||
}
|
||||
job {
|
||||
id: "win-x86-asan-test"
|
||||
realm: "ci"
|
||||
acl_sets: "ci"
|
||||
buildbucket {
|
||||
server: "cr-buildbucket.appspot.com"
|
||||
bucket: "luci.angle.ci"
|
||||
builder: "win-x86-asan-test"
|
||||
}
|
||||
}
|
||||
job {
|
||||
id: "win-x86-dbg-compile"
|
||||
realm: "ci"
|
||||
|
@ -292,6 +292,7 @@ trigger {
|
|||
triggers: "linux-trace"
|
||||
triggers: "mac-dbg-compile"
|
||||
triggers: "mac-test"
|
||||
triggers: "win-asan-test"
|
||||
triggers: "win-dbg-compile"
|
||||
triggers: "win-msvc-compile"
|
||||
triggers: "win-msvc-dbg-compile"
|
||||
|
@ -299,7 +300,6 @@ trigger {
|
|||
triggers: "win-msvc-x86-dbg-compile"
|
||||
triggers: "win-test"
|
||||
triggers: "win-trace"
|
||||
triggers: "win-x86-asan-test"
|
||||
triggers: "win-x86-dbg-compile"
|
||||
triggers: "win-x86-test"
|
||||
triggers: "win10-intel-hd630-perf"
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
name: "angle"
|
||||
access: "group:all"
|
||||
lucicfg {
|
||||
version: "1.29.1"
|
||||
version: "1.30.1"
|
||||
package_dir: ".."
|
||||
config_dir: "generated"
|
||||
entry_point: "main.star"
|
||||
|
|
|
@ -377,13 +377,13 @@ angle_builder("linux-dbg-compile", cpu = "x64")
|
|||
angle_builder("linux-test", cpu = "x64")
|
||||
angle_builder("mac-dbg-compile", cpu = "x64")
|
||||
angle_builder("mac-test", cpu = "x64")
|
||||
angle_builder("win-asan-test", cpu = "x64")
|
||||
angle_builder("win-dbg-compile", cpu = "x64")
|
||||
angle_builder("win-msvc-compile", cpu = "x64")
|
||||
angle_builder("win-msvc-dbg-compile", cpu = "x64")
|
||||
angle_builder("win-msvc-x86-compile", cpu = "x86")
|
||||
angle_builder("win-msvc-x86-dbg-compile", cpu = "x86")
|
||||
angle_builder("win-test", cpu = "x64")
|
||||
angle_builder("win-x86-asan-test", cpu = "x64")
|
||||
angle_builder("win-x86-dbg-compile", cpu = "x86")
|
||||
angle_builder("win-x86-test", cpu = "x86")
|
||||
angle_builder("winuwp-compile", cpu = "x64")
|
||||
|
|
|
@ -3783,6 +3783,7 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"win10-x64-swiftshader-asan": {},
|
||||
"win10-x86-swiftshader": {
|
||||
"gtest_tests": [
|
||||
{
|
||||
|
@ -4195,7 +4196,6 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"win10-x86-swiftshader-asan": {},
|
||||
"win7-x64-nvidia": {
|
||||
"gtest_tests": [
|
||||
{
|
||||
|
|
|
@ -26,13 +26,13 @@
|
|||
'linux-test': 'angle_goma_release_bot',
|
||||
'mac-dbg-compile': 'angle_goma_debug_bot',
|
||||
'mac-test': 'angle_goma_release_bot',
|
||||
'win-asan-test': 'angle_asan_bot',
|
||||
'win-dbg-compile': 'angle_goma_debug_bot',
|
||||
'win-msvc-compile': 'angle_non_clang_release_bot',
|
||||
'win-msvc-dbg-compile': 'angle_non_clang_debug_bot',
|
||||
'win-msvc-x86-compile': 'angle_non_clang_x86_release_bot',
|
||||
'win-msvc-x86-dbg-compile': 'angle_non_clang_x86_debug_bot',
|
||||
'win-test': 'angle_goma_release_bot',
|
||||
'win-x86-asan-test': 'angle_asan_bot',
|
||||
'win-x86-dbg-compile': 'angle_goma_x86_debug_bot',
|
||||
'win-x86-test': 'angle_goma_x86_release_bot',
|
||||
'win10-intel-hd630-perf': 'angle_goma_perf_bot',
|
||||
|
|
|
@ -180,6 +180,15 @@
|
|||
'gtest_tests': 'swangle_gtests',
|
||||
},
|
||||
},
|
||||
'win10-x64-swiftshader-asan': {
|
||||
'os_type': 'win',
|
||||
'mixins': [
|
||||
'win10_gce_gpu_pool',
|
||||
'timeout_15m',
|
||||
],
|
||||
'test_suites': {
|
||||
},
|
||||
},
|
||||
'win10-x86-swiftshader': {
|
||||
'os_type': 'win',
|
||||
'mixins': [
|
||||
|
@ -190,15 +199,6 @@
|
|||
'gtest_tests': 'swangle_gtests',
|
||||
},
|
||||
},
|
||||
'win10-x86-swiftshader-asan': {
|
||||
'os_type': 'win',
|
||||
'mixins': [
|
||||
'win10_gce_gpu_pool',
|
||||
'timeout_15m',
|
||||
],
|
||||
'test_suites': {
|
||||
},
|
||||
},
|
||||
'win7-x64-nvidia': {
|
||||
'os_type': 'win',
|
||||
'mixins': [
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"infra/specs/angle.json":
|
||||
"688ed835a30f14ecc7db11bbfeb54fc6",
|
||||
"6ce675130150829daaebc7f01e79225f",
|
||||
"infra/specs/generate_test_spec_json.py":
|
||||
"348921bf70270ec6ee51fbb7e97d6925",
|
||||
"infra/specs/mixins.pyl":
|
||||
|
@ -12,7 +12,7 @@
|
|||
"infra/specs/variants.pyl":
|
||||
"8cfcaa99fa07ad2a2d5d14f220fd5037",
|
||||
"infra/specs/waterfalls.pyl":
|
||||
"7b2d461778b8b643e95cfa91d8ab01e2",
|
||||
"263715d7ca02adadee81fe693a358e14",
|
||||
"testing/buildbot/generate_buildbot_json.py":
|
||||
"f958374820a3ac8369e3f740f0fa2a09",
|
||||
"testing/buildbot/mixins.pyl":
|
||||
|
|
Загрузка…
Ссылка в новой задаче