p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix test suite zip generation on mac"

This commit is contained in:
Treehugger Robot 2017-08-01 03:51:28 +00:00 committed by Gerrit Code Review
parent 571e5d47b7 f3a4340435
commit 94be321cae
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/tasks/device-tests.mk
View File

@ -17,11 +17,11 @@
device-tests-zip := $(PRODUCT_OUT)/device-tests.zip device-tests-zip := $(PRODUCT_OUT)/device-tests.zip
$(device-tests-zip): $(COMPATIBILITY.device-tests.FILES) $(SOONG_ZIP) $(device-tests-zip): $(COMPATIBILITY.device-tests.FILES) $(SOONG_ZIP)
echo $(sort $(COMPATIBILITY.device-tests.FILES)) > $@.list echo $(sort $(COMPATIBILITY.device-tests.FILES)) | tr " " "\n" > $@.list
sed -i -e 's/\s\+/\n/g' $@.list
grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true
grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.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 $(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) device-tests: $(device-tests-zip)
$(call dist-for-goals, device-tests, $(device-tests-zip)) $(call dist-for-goals, device-tests, $(device-tests-zip))

4
core/tasks/general-tests.mk
View File

@ -16,11 +16,11 @@
general-tests-zip := $(PRODUCT_OUT)/general-tests.zip general-tests-zip := $(PRODUCT_OUT)/general-tests.zip
$(general-tests-zip): $(COMPATIBILITY.general-tests.FILES) $(SOONG_ZIP) $(general-tests-zip): $(COMPATIBILITY.general-tests.FILES) $(SOONG_ZIP)
echo $(sort $(COMPATIBILITY.general-tests.FILES)) > $@.list echo $(sort $(COMPATIBILITY.general-tests.FILES)) | tr " " "\n" > $@.list
sed -i -e 's/\s\+/\n/g' $@.list
grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true
grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.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 $(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) general-tests: $(general-tests-zip)
$(call dist-for-goals, general-tests, $(general-tests-zip)) $(call dist-for-goals, general-tests, $(general-tests-zip))