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

Commit 30c33b1c authored by Colin Cross's avatar Colin Cross
Browse files

Sort inputs to compatibility suite zip files 

Sort the inputs to remove duplicates, which fixes:
found two file paths to be copied into dest path: "target/testcases/minikin_perftests/minikin_perftests", both ["target/testcases/minikin_perftests/minikin_perftests"]"out/target/product/bullhead/testcases/minikin_perftests/minikin_perftests" and ["target/testcases/minikin_perftests/minikin_perftests"]"out/target/product/bullhead/testcases/minikin_perftests/minikin_perftests"!

Test: m -j device-tests
Change-Id: I8d7e83cd077c62461c9a08e7f1b49c321fbcb0e3
parent ea60db9a

core/tasks/device-tests.mk

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


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

$(device-tests-zip): $(COMPATIBILITY.device-tests.FILES) $(SOONG_ZIP)

	echo $(COMPATIBILITY.device-tests.FILES) > $@.list

	echo $(sort $(COMPATIBILITY.device-tests.FILES)) > $@.list

	sed -i -e 's/\s\+/\n/g' $@.list

	grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true

	grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.list || true

core/tasks/general-tests.mk

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

$(general-tests-zip): $(COMPATIBILITY.general-tests.FILES) $(SOONG_ZIP)

	echo $(COMPATIBILITY.general-tests.FILES) > $@.list

	echo $(sort $(COMPATIBILITY.general-tests.FILES)) > $@.list

	sed -i -e 's/\s\+/\n/g' $@.list

	grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true

	grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.list || true