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

Commit acd9fe31 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Fix test suite zip generation on mac" am: 94be321c am: c1ed882b am: 3f7ab5f0 

am: ffcc178b

Change-Id: I40d4e59bf66882d87273631a50d6cb07e4345210
parents 34e0ca15 ffcc178b

core/tasks/device-tests.mk

+2 −2
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 


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

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

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

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

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

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

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

	$(hide) $(SOONG_ZIP) -d -o $@ -P host -C $(HOST_OUT) -l $@-host.list -P target -C $(PRODUCT_OUT) -l $@-target.list

	rm -f $@.list $@-host.list $@-target.list



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

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

core/tasks/general-tests.mk

+2 −2
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 


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

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

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

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

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

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

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

	$(hide) $(SOONG_ZIP) -d -o $@ -P host -C $(HOST_OUT) -l $@-host.list -P target -C $(PRODUCT_OUT) -l $@-target.list

	rm -f $@.list $@-host.list $@-target.list



general-tests: $(general-tests-zip)

$(call dist-for-goals, general-tests, $(general-tests-zip))