From d63a8153dae0de4c3e9e8047df2fc0b1dd82db41 Mon Sep 17 00:00:00 2001 From: Simran Basi Date: Wed, 7 Mar 2018 12:36:55 -0800 Subject: [PATCH] build/make: Add default suite for all native tests/benchmarks Not all native tests have the "tests" tag so adjust the logic to be: NATIVE_TESTS||NATIVE_BENCHMARKS||(APPS&&tags==tests) Bug: 74339384 Test: Rebuilt module-info.json, verified native tests now have their suite set to null-suite and have auto_test_config=True Double checked a frameworks App unittest as well. Change-Id: Idea00adcebfc1a78b0c6d8ade40feddb1e90ed83 --- core/base_rules.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/base_rules.mk b/core/base_rules.mk index ff4893076..22e7aef46 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -494,12 +494,15 @@ 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. # 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 -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 endif endif