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

Sort inputs to compatibility suite zip files

Browse Source 
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
This commit is contained in:
Colin Cross
2017-05-02 17:25:45 -07:00
parent ea60db9a83
commit 30c33b1c2b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@
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 $(COMPATIBILITY.device-tests.FILES) > $@.list echo $(sort $(COMPATIBILITY.device-tests.FILES)) > $@.list
sed -i -e 's/\s\+/\n/g' $@.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

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

@@ -16,7 +16,7 @@
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 $(COMPATIBILITY.general-tests.FILES) > $@.list echo $(sort $(COMPATIBILITY.general-tests.FILES)) > $@.list
sed -i -e 's/\s\+/\n/g' $@.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