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

Commit 530ff743 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add google-tradefed's config path to tradefed_tests_dir" into main am:... 

Merge "Add google-tradefed's config path to tradefed_tests_dir" into main am: ad274cc0 am: 40fde746

Original change: https://android-review.googlesource.com/c/platform/build/+/3502993



Change-Id: I2c5633ee5f1ced1f93eb0197a37b13a9f6e07e2c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f2179c8a 40fde746

core/tasks/tradefed-tests-list.mk

+10 −2
Original line number Diff line number Diff line
@@ -18,11 +18,19 @@ 
COMPATIBILITY.tradefed_tests_dir := \

  $(COMPATIBILITY.tradefed_tests_dir) \

  tools/tradefederation/core/res/config \

  tools/tradefederation/core/javatests/res/config

  tools/tradefederation/core/javatests/res/config \

  vendor/google_tradefederation/contrib/res/config \

  vendor/google_tradefederation/core/res/config \

  vendor/google_tradefederation/core/javatests/res/config \

  vendor/google_tradefederation/core/prod_tests/res/config



tradefed_tests :=

$(foreach dir, $(COMPATIBILITY.tradefed_tests_dir), \

  $(eval tradefed_tests += $(shell find $(dir) -type f -name "*.xml")))

  $(if $(wildcard $(dir)/*), \

    $(eval tradefed_tests += $(shell find $(dir) -type f -name "*.xml")) \

  ) \

)



tradefed_tests_list_intermediates := $(call intermediates-dir-for,PACKAGING,tradefed_tests_list,HOST,COMMON)

tradefed_tests_list_zip := $(tradefed_tests_list_intermediates)/tradefed-tests_list.zip

all_tests :=