From 21f99de4b23b3be9d3f2593bd787dada4f8b2408 Mon Sep 17 00:00:00 2001 From: Tongbo Liu Date: Tue, 23 Jul 2024 08:35:51 +0000 Subject: [PATCH] For android-mcts-.zip, we use mts-tradefed. For android-mcts.zip, we use mcts-tradefed. Ignore-AOSP-First: test for mainline internal use Change-Id: Id5c41d525574c8f4787fb0f94adc0db0f4ccfd38 Test: m mcts Bug: 354254853 --- core/tasks/mcts.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/core/tasks/mcts.mk b/core/tasks/mcts.mk index b858823b0f..02e916a38d 100644 --- a/core/tasks/mcts.mk +++ b/core/tasks/mcts.mk @@ -15,11 +15,22 @@ ifneq ($(wildcard test/mts/README.md),) mcts_test_suites := -mcts_test_suites += mcts +mcts_all_test_suites := +mcts_all_test_suites += mcts $(foreach module, $(mts_modules), $(eval mcts_test_suites += mcts-$(module))) $(foreach suite, $(mcts_test_suites), \ + $(eval test_suite_name := $(suite)) \ + $(eval test_suite_tradefed := mts-tradefed) \ + $(eval test_suite_readme := test/mts/README.md) \ + $(eval include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk) \ + $(eval .PHONY: $(suite)) \ + $(eval $(suite): $(compatibility_zip)) \ + $(eval $(call dist-for-goals, $(suite), $(compatibility_zip))) \ +) + +$(foreach suite, $(mcts_all_test_suites), \ $(eval test_suite_name := $(suite)) \ $(eval test_suite_tradefed := mcts-tradefed) \ $(eval test_suite_readme := test/mts/README.md) \