Commit 7cfd28a2 authored by Yun Liu's avatar Yun Liu Committed by Commit Bot

[code coverage] Add android-code-coverage-native builder for native coverage

Suites in test_suite_exceptions.pyl will cause linker issues when
native coverage is on.
Also browsertests will generate corrupt data on M, but not on higher
Android apis.
So that plan to separate Java and native coverage on CI right now.

Bug: 985574
Change-Id: I02133b11a3c85beb5388790f009a4c2c7f0d09f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1885217
Commit-Queue: Yun Liu <yliuyliu@google.com>
Reviewed-by: default avatarStephen Martinis <martiniss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710601}
parent 27a62d51
...@@ -1228,6 +1228,12 @@ fyi_coverage_builder( ...@@ -1228,6 +1228,12 @@ fyi_coverage_builder(
ssd = True, ssd = True,
) )
fyi_coverage_builder(
name = 'android-code-coverage-native',
use_clang_coverage = True,
ssd = True,
)
fyi_coverage_builder( fyi_coverage_builder(
name = 'chromeos-vm-code-coverage', name = 'chromeos-vm-code-coverage',
ssd = True, ssd = True,
......
...@@ -12,6 +12,11 @@ luci.console_view( ...@@ -12,6 +12,11 @@ luci.console_view(
category = 'code_coverage', category = 'code_coverage',
short_name = 'and', short_name = 'and',
), ),
luci.console_view_entry(
builder = 'ci/android-code-coverage-native',
category = 'code_coverage',
short_name = 'ann',
),
luci.console_view_entry( luci.console_view_entry(
builder = 'ci/linux-code-coverage', builder = 'ci/linux-code-coverage',
category = 'code_coverage', category = 'code_coverage',
......
...@@ -6999,6 +6999,27 @@ buckets: < ...@@ -6999,6 +6999,27 @@ buckets: <
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
> >
builders: <
name: "android-code-coverage-native"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "builderless:1"
dimensions: "cores:32"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-16.04"
dimensions: "ssd:1"
recipe: <
name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.fyi\""
>
execution_timeout_secs: 72000
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
builders: < builders: <
name: "android-cronet-arm-dbg" name: "android-cronet-arm-dbg"
swarming_host: "chromium-swarm.appspot.com" swarming_host: "chromium-swarm.appspot.com"
......
...@@ -2824,6 +2824,11 @@ consoles: < ...@@ -2824,6 +2824,11 @@ consoles: <
category: "code_coverage" category: "code_coverage"
short_name: "and" short_name: "and"
> >
builders: <
name: "buildbucket/luci.chromium.ci/android-code-coverage-native"
category: "code_coverage"
short_name: "ann"
>
builders: < builders: <
name: "buildbucket/luci.chromium.ci/linux-code-coverage" name: "buildbucket/luci.chromium.ci/linux-code-coverage"
category: "code_coverage" category: "code_coverage"
......
...@@ -796,6 +796,16 @@ job { ...@@ -796,6 +796,16 @@ job {
} }
} }
job {
id: "android-code-coverage-native"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "android-code-coverage-native"
}
}
job { job {
id: "android-cronet-arm-dbg" id: "android-cronet-arm-dbg"
acl_sets: "default" acl_sets: "default"
......
...@@ -796,6 +796,16 @@ job { ...@@ -796,6 +796,16 @@ job {
} }
} }
job {
id: "android-code-coverage-native"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "android-code-coverage-native"
}
}
job { job {
id: "android-cronet-arm-dbg" id: "android-cronet-arm-dbg"
acl_sets: "default" acl_sets: "default"
......
This diff is collapsed.
...@@ -289,9 +289,15 @@ ...@@ -289,9 +289,15 @@
}, },
}, },
}, },
'chrome_public_smoke_test': {
'remove_from': [
'android-code-coverage-native', # https://crbug.com/1018780
],
},
'chrome_public_test_apk': { 'chrome_public_test_apk': {
'remove_from': [ 'remove_from': [
'android-asan', # https://crbug.com/964562 'android-asan', # https://crbug.com/964562
'android-code-coverage-native', # https://crbug.com/1018780
], ],
'modifications': { 'modifications': {
# chromium.android # chromium.android
...@@ -336,6 +342,8 @@ ...@@ -336,6 +342,8 @@
'ToTAndroidCFI', 'ToTAndroidCFI',
# chromium.memory # chromium.memory
'android-asan', # https://crbug.com/964562 'android-asan', # https://crbug.com/964562
# chromium.fyi
'android-code-coverage-native', # https://crbug.com/1018780
], ],
}, },
'chrome_public_test_vr_apk-vega': { 'chrome_public_test_vr_apk-vega': {
...@@ -1304,6 +1312,7 @@ ...@@ -1304,6 +1312,7 @@
'remove_from': [ 'remove_from': [
'android-asan', 'android-asan',
'android-code-coverage', 'android-code-coverage',
'android-code-coverage-native',
'android-kitkat-arm-rel', 'android-kitkat-arm-rel',
'android-marshmallow-arm64-coverage-rel', 'android-marshmallow-arm64-coverage-rel',
'android-marshmallow-arm64-rel', 'android-marshmallow-arm64-rel',
...@@ -2115,6 +2124,8 @@ ...@@ -2115,6 +2124,8 @@
# On chromium.swarm, this should possibly be being run (or removed # On chromium.swarm, this should possibly be being run (or removed
# from Android N5X Swarm). # from Android N5X Swarm).
'Android N5 Swarm', 'Android N5 Swarm',
# chromium.fyi
'android-code-coverage-native', # https://crbug.com/1018431
], ],
'modifications': { 'modifications': {
'Oreo Phone Tester': { 'Oreo Phone Tester': {
......
...@@ -1615,6 +1615,17 @@ ...@@ -1615,6 +1615,17 @@
}, },
'os_type': 'android', 'os_type': 'android',
}, },
'android-code-coverage-native': {
'mixins': [
'code-coverage',
'pie_fleet',
'walleye',
],
'test_suites': {
'gtest_tests': 'chromium_android_gtests',
},
'os_type': 'android',
},
'android-mojo-webview-rel': { 'android-mojo-webview-rel': {
'swarming': { 'swarming': {
'dimension_sets': [ 'dimension_sets': [
......
...@@ -203,6 +203,7 @@ ...@@ -203,6 +203,7 @@
'Afl Upload Linux ASan': 'afl_asan_shared_release_bot', 'Afl Upload Linux ASan': 'afl_asan_shared_release_bot',
'android-code-coverage': 'android_release_bot_minimal_symbols_arm64_coverage', 'android-code-coverage': 'android_release_bot_minimal_symbols_arm64_coverage',
'android-code-coverage-native': 'android_release_bot_minimal_symbols_arm64_native_coverage',
'chromeos-amd64-generic-rel-vm-tests': 'cros_chrome_sdk_headless_ozone_dcheck_always_on', 'chromeos-amd64-generic-rel-vm-tests': 'cros_chrome_sdk_headless_ozone_dcheck_always_on',
'chromeos-kevin-rel-hw-tests': 'cros_chrome_sdk_headless_ozone', 'chromeos-kevin-rel-hw-tests': 'cros_chrome_sdk_headless_ozone',
'chromeos-vm-code-coverage': 'cros_chrome_sdk_headless_ozone_coverage', 'chromeos-vm-code-coverage': 'cros_chrome_sdk_headless_ozone_coverage',
...@@ -1122,6 +1123,11 @@ ...@@ -1122,6 +1123,11 @@
'strip_debug_info', 'use_java_coverage', 'strip_debug_info', 'use_java_coverage',
], ],
'android_release_bot_minimal_symbols_arm64_native_coverage': [
'android', 'release_bot', 'minimal_symbols', 'arm64',
'strip_debug_info', 'use_clang_coverage',
],
'android_release_bot_minimal_symbols_arm64_webview_google': [ 'android_release_bot_minimal_symbols_arm64_webview_google': [
'android', 'release_bot', 'minimal_symbols', 'arm64', 'android', 'release_bot', 'minimal_symbols', 'arm64',
'strip_debug_info', 'webview_google', 'strip_debug_info', 'webview_google',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment