Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45efec67 authored by Cole Faust's avatar Cole Faust
Browse files

Test that TestSuiteInfoProvider is accurate 

Compare it against LOCAL_COMPATIBILITY_SUITE.

Bug: 388850000
Test: m nothing
Change-Id: I9c0e99bce4163f649fe488e645ab1ec1789df120
parent 47f65b9b

core/base_rules.mk

+16 −0
Original line number Diff line number Diff line
@@ -214,6 +214,22 @@ else 
  actual_partition_tag := $(if $(partition_tag),data,system)

endif

endif



# if this is a soong module, verify that LOCAL_COMPATIBILITY_SUITE (legacy) matches

# LOCAL_SOONG_PROVIDER_TEST_SUITES (new, via TestSuiteInfoProvider instead of AndroidMk stuff),

# modulo "null-sute", "mts", and "mcts". mts/mcts are automatically added if there's a different

# suite starting with "m(c)ts-". null-suite seems useless and is sometimes automatically added

# if no other suites are added.

ifneq (,$(filter $(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)))

  a := $(filter-out null-suite mts mcts,$(sort $(LOCAL_COMPATIBILITY_SUITE)))

  b := $(filter-out null-suite mts mcts,$(sort $(LOCAL_SOONG_PROVIDER_TEST_SUITES)))

  ifneq ($(a),$(b))

    $(error $(LOCAL_MODULE): LOCAL_COMPATIBILITY_SUITE did not match LOCAL_SOONG_PROVIDER_TEST_SUITES$(newline)  LOCAL_COMPATIBILITY_SUITE: $(a)$(newline)  LOCAL_SOONG_PROVIDER_TEST_SUITES: $(b)$(newline))

  endif

  a :=

  b :=

endif



# 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.

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ LOCAL_SOONG_MODULE_INFO_JSON := 
LOCAL_SOONG_MODULE_TYPE :=

LOCAL_SOONG_PROGUARD_DICT :=

LOCAL_SOONG_PROGUARD_USAGE_ZIP :=

LOCAL_SOONG_PROVIDER_TEST_SUITES :=

LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=

LOCAL_SOONG_TRANSITIVE_RES_PACKAGES :=

LOCAL_SOONG_DEVICE_RRO_DIRS :=