commit 6ed53f2e440618d32cc9b68354edc3f2c994c814
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Sep 04 04:27:06 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 04 04:27:06 2024 +0000
tree 4151c9a34a4b9337cd0fba3e115067ba26096684
parent 9d3787b166b6c77321ead85325c001d80866f996
parent 3e3cbeb3a55358a9094280881246461b154db8e2

Merge "Move COMPATIBILITY.tradefed_tests_dir to proper place" into main

core/tasks/tradefed-tests-list.mk

diff --git a/core/tasks/tradefed-tests-list.mk b/core/tasks/tradefed-tests-list.mk
index 61bf136..47c360d 100644
--- a/core/tasks/tradefed-tests-list.mk
+++ b/core/tasks/tradefed-tests-list.mk
@@ -15,6 +15,11 @@
 # List all TradeFed tests from COMPATIBILITY.tradefed_tests_dir
 .PHONY: tradefed-tests-list
 
+COMPATIBILITY.tradefed_tests_dir := \
+  $(COMPATIBILITY.tradefed_tests_dir) \
+  tools/tradefederation/core/res/config \
+  tools/tradefederation/core/javatests/res/config
+
 tradefed_tests :=
 $(foreach dir, $(COMPATIBILITY.tradefed_tests_dir), \
   $(eval tradefed_tests += $(shell find $(dir) -type f -name "*.xml")))