StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't read test mapping list in Make" am: 2feb102e4d am: 4979af18b9 am: 99a26d0bfd am: 7d9504703a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2506833

Change-Id: I8516ca50a2459cd1ab166becc3587cc6e3a70d96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2023-03-24 18:13:28 +00:00
committed by Automerger Merge Worker
parent 71784e92c0 7d9504703a
commit 868a13368d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/tasks/test_mapping.mk
View File

@@ -21,17 +21,17 @@
intermediates := $(call intermediates-dir-for,PACKAGING,test_mapping)
test_mappings_zip := $(intermediates)/test_mappings.zip
test_mapping_list := $(OUT_DIR)/.module_paths/TEST_MAPPING.list
test_mappings := $(file <$(test_mapping_list))
$(test_mappings_zip) : PRIVATE_test_mappings := $(subst $(newline),\n,$(test_mappings))
$(test_mappings_zip) : PRIVATE_all_disabled_presubmit_tests := $(ALL_DISABLED_PRESUBMIT_TESTS)
$(test_mappings_zip) : PRIVATE_test_mapping_list := $(test_mapping_list)
$(test_mappings_zip) : $(test_mappings) $(SOONG_ZIP)
$(test_mappings_zip) : .KATI_DEPFILE := $(test_mappings_zip).d
$(test_mappings_zip) : $(test_mapping_list) $(SOONG_ZIP)
@echo "Building artifact to include TEST_MAPPING files and tests to skip in presubmit check."
rm -rf $@ $(dir $@)/disabled-presubmit-tests
echo $(sort $(PRIVATE_all_disabled_presubmit_tests)) | tr " " "\n" > $(dir $@)/disabled-presubmit-tests
echo -e "$(PRIVATE_test_mappings)" > $@.list
$(SOONG_ZIP) -o $@ -C . -l $@.list -C $(dir $@) -f $(dir $@)/disabled-presubmit-tests
rm -f $@.list $(dir $@)/disabled-presubmit-tests
$(SOONG_ZIP) -o $@ -C . -l $(PRIVATE_test_mapping_list) -C $(dir $@) -f $(dir $@)/disabled-presubmit-tests
echo "$@ : " $$(cat $(PRIVATE_test_mapping_list)) > $@.d
rm -f $(dir $@)/disabled-presubmit-tests
test_mapping : $(test_mappings_zip)