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

Commit c34c3738 authored by Luca Farsi's avatar Luca Farsi
Browse files

Build file lists for general-tests and device-tests 

Add build targets that will just spit out a list of what files will be
in general-tests.zip and device-tests.zip, so that these can be
referenced by other tools without needing to actually build any
artifacts.

Test: m device-tests-files-list, m general-tests-files-list
Bug: 378926009
Change-Id: Ifc30a38ef97cf7a199f146bb6cf63d13d2f44f1d
parent a351519b

core/tasks/device-tests.mk

+9 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 




.PHONY: device-tests

.PHONY: device-tests-files-list



device-tests-zip := $(PRODUCT_OUT)/device-tests.zip

# Create an artifact to include a list of test config files in device-tests.
@@ -21,6 +22,7 @@ device-tests-list-zip := $(PRODUCT_OUT)/device-tests_list.zip 
# Create an artifact to include all test config files in device-tests.

device-tests-configs-zip := $(PRODUCT_OUT)/device-tests_configs.zip

my_host_shared_lib_for_device_tests := $(call copy-many-files,$(COMPATIBILITY.device-tests.HOST_SHARED_LIBRARY.FILES))

device_tests_files_list := $(PRODUCT_OUT)/device-tests_files



$(device-tests-zip) : .KATI_IMPLICIT_OUTPUTS := $(device-tests-list-zip) $(device-tests-configs-zip)

$(device-tests-zip) : PRIVATE_device_tests_list := $(PRODUCT_OUT)/device-tests_list
@@ -45,7 +47,14 @@ $(device-tests-zip) : $(COMPATIBILITY.device-tests.FILES) $(COMPATIBILITY.device 
	rm -f $@.list $@-host.list $@-target.list $@-host-test-configs.list $@-target-test-configs.list \

		$(PRIVATE_device_tests_list)



$(device_tests_files_list) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_device_tests)

$(device_tests_files_list) :

	echo $(sort $(COMPATIBILITY.device-tests.FILES) $(COMPATIBILITY.device-tests.SOONG_INSTALLED_COMPATIBILITY_SUPPORT_FILES)) | tr " " "\n" > $@.full_list

	grep $(HOST_OUT_TESTCASES) $@.full_list > $@ || true

	grep $(TARGET_OUT_TESTCASES) $@.full_list >> $@ || true



device-tests: $(device-tests-zip)

device-tests-files-list: $(device_tests_files_list)



$(call dist-for-goals, device-tests, $(device-tests-zip) $(device-tests-list-zip) $(device-tests-configs-zip))

core/tasks/general-tests.mk

+14 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
# limitations under the License.



.PHONY: general-tests

.PHONY: general-tests-files-list



general_tests_tools := \

    $(HOST_OUT_JAVA_LIBRARIES)/cts-tradefed.jar \
@@ -63,6 +64,10 @@ my_symlinks_for_general_tests += $(foreach f,$(my_host_shared_lib_symlinks),\ 
        $(eval _cmf_dest := $(word 3,$(_cmf_tuple))) \

        $(_cmf_dest)))



general_tests_files_list := $(PRODUCT_OUT)/general-tests_files

general_tests_host_files_list := $(PRODUCT_OUT)/general-tests_host_files

general_tests_target_files_list := $(PRODUCT_OUT)/general-tests_target_files



$(general_tests_zip) : PRIVATE_general_tests_list_zip := $(general_tests_list_zip)

$(general_tests_zip) : .KATI_IMPLICIT_OUTPUTS := $(general_tests_list_zip) $(general_tests_configs_zip)

$(general_tests_zip) : PRIVATE_TOOLS := $(general_tests_tools)
@@ -100,7 +105,16 @@ $(general_tests_zip) : $(COMPATIBILITY.general-tests.FILES) $(my_host_shared_lib 
	grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/target.list | sed s%$(PRODUCT_OUT)%target%g >> $(PRIVATE_INTERMEDIATES_DIR)/general-tests_list

	$(SOONG_ZIP) -d -o $(PRIVATE_general_tests_list_zip) -C $(PRIVATE_INTERMEDIATES_DIR) -f $(PRIVATE_INTERMEDIATES_DIR)/general-tests_list



$(general_tests_files_list) : PRIVATE_INTERMEDIATES_DIR := $(intermediates_dir)

$(general_tests_files_list) : PRIVATE_general_tests_host_files_list := $(general_tests_host_files_list)

$(general_tests_files_list) : PRIVATE_general_tests_target_files_list := $(general_tests_target_files_list)

$(general_tests_files_list) :

	echo $(sort $(COMPATIBILITY.general-tests.FILES) $(COMPATIBILITY.device-tests.SOONG_INSTALLED_COMPATIBILITY_SUPPORT_FILES)) | tr " " "\n" > $@

	grep $(HOST_OUT_TESTCASES) $@ > $(PRIVATE_general_tests_host_files_list) || true

	grep $(TARGET_OUT_TESTCASES) $@ >> $(PRIVATE_general_tests_target_files_list) || true



general-tests: $(general_tests_zip)

general-tests-files-list: $(general_tests_files_list)

$(call dist-for-goals, general-tests, $(general_tests_zip) $(general_tests_list_zip) $(general_tests_configs_zip) $(general_tests_shared_libs_zip))



$(call declare-1p-container,$(general_tests_zip),)