openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "build/make: Add default suite for all native tests/benchmarks" into pi-dev

This commit is contained in:
TreeHugger Robot 2018-03-15 22:39:31 +00:00 committed by Android (Google) Code Review
parent bb4986c6ce 1ef901c167
commit b429175200
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/base_rules.mk
View File

@ -494,12 +494,15 @@ endif
endif endif
endif endif
# For modules tagged as tests but lacking a suite tag, set null-suite as the default. # For test modules that lack a suite tag, set null-suite as the default.
# We only support adding a default suite to native tests, native benchmarks, and instrumentation tests. # We only support adding a default suite to native tests, native benchmarks, and instrumentation tests.
# This is because they are the only tests we currently auto-generate test configs for. # This is because they are the only tests we currently auto-generate test configs for.
ifneq ($(filter $(my_module_tags),tests),)
ifndef LOCAL_COMPATIBILITY_SUITE ifndef LOCAL_COMPATIBILITY_SUITE
ifneq ($(filter NATIVE_TESTS NATIVE_BENCHMARK APPS, $(LOCAL_MODULE_CLASS)),) ifneq ($(filter NATIVE_TESTS NATIVE_BENCHMARK, $(LOCAL_MODULE_CLASS)),)
LOCAL_COMPATIBILITY_SUITE := null-suite
endif
ifneq ($(filter APPS, $(LOCAL_MODULE_CLASS)),)
ifneq ($(filter $(my_module_tags),tests),)
LOCAL_COMPATIBILITY_SUITE := null-suite LOCAL_COMPATIBILITY_SUITE := null-suite
endif endif
endif endif