0

[Build] Merge android_nocompile_tests and errorprone_plugin_tests

This CL introduces a new GN target chrome_nocompile_tests. This is in
preparation for adding a new a android_nocompile_test_suite() target for
android_library_factory().

BUG=1230910

Change-Id: Ia8ca09d77302d515e9c5902bba2f5b2bd0139099
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3039603
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#903971}
This commit is contained in:
Peter Kotwicz
2021-07-21 18:12:36 +00:00
committed by Chromium LUCI CQ
parent 107a469827
commit 0761c2eae8
5 changed files with 21 additions and 14 deletions

@ -367,7 +367,6 @@ group("gn_all") {
"//base/android/linker:chromium_android_linker",
"//build/android/gyp/test:hello_world",
"//build/android/stacktrace:java_deobfuscate",
"//build/android/test:android_nocompile_tests",
"//build/config/android/test/proto:test_build_protos",
"//chrome/android/monochrome:monochrome_public_apk_checker",
"//chrome/android/webapk/shell_apk:maps_go_webapk",
@ -389,7 +388,6 @@ group("gn_all") {
"//tools/android:push_apps_to_background",
"//tools/android/audio_focus_grabber:audio_focus_grabber_apk",
"//tools/android/customtabs_benchmark:customtabs_benchmark_apk",
"//tools/android/errorprone_plugin/test:errorprone_plugin_tests",
"//tools/android/kerberos/SpnegoAuthenticator:spnego_authenticator_apk",
"//ui/android:ui_junit_tests",
"//weblayer/public/java:client_aar",

@ -3095,6 +3095,21 @@ instrumentation_test_runner("trichrome_chrome_bundle_fake_modules_smoke_test") {
_bundle_smoke_test_extra_args + _bundle_fake_modules_smoke_test_extra_args
}
group("chrome_nocompile_tests") {
# Tests which check that build errors are thrown when expected and that build
# validation tools (ex: lint) do not get silently disabled.
testonly = true
# No-compile tests use an output directory dedicated to no-compile tests.
# Put new test suites in //build/android/test/nocompile_gn if possible in
# order to share the target output directory and avoid running 'gn gen'
# for each android_nocompile_test_suite().
deps = [
"//build/android/test:android_nocompile_tests",
"//tools/android/errorprone_plugin/test:errorprone_plugin_tests",
]
}
script_test("chrome_public_wpt") {
script = "//testing/scripts/run_android_wpt.py"
args = [

@ -24473,9 +24473,8 @@
},
"android-lollipop-arm-rel": {
"additional_compile_targets": [
"android_nocompile_tests",
"chrome_nocompile_tests",
"cronet_test_instrumentation_apk",
"errorprone_plugin_tests",
"monochrome_static_initializers"
],
"gtest_tests": [

@ -92,10 +92,6 @@
"label": "//chrome/test:android_browsertests",
"type": "windowed_test_launcher",
},
"android_nocompile_tests": {
"label": "//build/android/test:android_nocompile_tests",
"type": "additional_compile_target",
},
"android_sync_integration_tests": {
"label": "//chrome/test:android_sync_integration_tests",
"type": "windowed_test_launcher",
@ -472,6 +468,10 @@
"label": "//chrome/android:chrome_modern_public_bundle_fake_modules_smoke_test",
"type": "console_test_launcher",
},
"chrome_nocompile_tests": {
"label": "//chrome/android:chrome_nocompile_tests",
"type": "additional_compile_target",
},
"chrome_official_builder": {
"label": "//:chrome_official_builder",
"type": "additional_compile_target",
@ -813,10 +813,6 @@
"label": "//testing:empty_main",
"type": "additional_compile_target",
},
"errorprone_plugin_tests": {
"label": "//tools/android/errorprone_plugin/test:errorprone_plugin_tests",
"type": "additional_compile_target",
},
"events_unittests": {
"label": "//ui/events:events_unittests",
"type": "windowed_test_launcher",

@ -837,9 +837,8 @@
'lollipop',
],
'additional_compile_targets': [
'android_nocompile_tests',
'chrome_nocompile_tests',
'cronet_test_instrumentation_apk',
'errorprone_plugin_tests',
'monochrome_static_initializers',
],
'test_suites': {