Merge "build/make: Add default suite for all native tests/benchmarks"

This commit is contained in:
Treehugger Robot
2018-03-08 01:38:04 +00:00
committed by Gerrit Code Review

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