From 30c33b1c2bd802ed3f88dc27fbd3d9eedebb366c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 2 May 2017 17:25:45 -0700 Subject: [PATCH] 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 --- core/tasks/device-tests.mk | 2 +- core/tasks/general-tests.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/tasks/device-tests.mk b/core/tasks/device-tests.mk index 084353b7af..b1b936af31 100644 --- a/core/tasks/device-tests.mk +++ b/core/tasks/device-tests.mk @@ -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 diff --git a/core/tasks/general-tests.mk b/core/tasks/general-tests.mk index 9629bfa89c..763dd5157f 100644 --- a/core/tasks/general-tests.mk +++ b/core/tasks/general-tests.mk @@ -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