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

Commit c6b28799 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Create artifacts to include the list of test configs"

parents 68a6b90f 8f126311

core/tasks/device-tests.mk

+13 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agrls eed to in writing, software

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and
@@ -16,14 +16,23 @@ 
.PHONY: device-tests



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

# Create an artifact to include a list of test config files in device-tests.

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

$(device-tests-zip) : .KATI_IMPLICIT_OUTPUTS := $(device-tests-list-zip)

$(device-tests-zip) : PRIVATE_device_tests_list := $(PRODUCT_OUT)/device-tests_list



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

	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

	rm -f $(PRIVATE_device_tests_list)

	$(hide) grep -e .*.config$$ $@-host.list | sed s%$(HOST_OUT)%host%g > $(PRIVATE_device_tests_list)

	$(hide) grep -e .*.config$$ $@-target.list | sed s%$(PRODUCT_OUT)%target%g >> $(PRIVATE_device_tests_list)

	$(hide) $(SOONG_ZIP) -d -o $(device-tests-list-zip) -C $(dir $@) -f $(PRIVATE_device_tests_list)

	rm -f $@.list $@-host.list $@-target.list $(PRIVATE_device_tests_list)



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

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

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



tests: device-tests

core/tasks/general-tests.mk

+13 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agrls eed to in writing, software

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and
@@ -15,12 +15,21 @@ 
.PHONY: general-tests



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

# Create an artifact to include a list of test config files in general-tests.

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

$(general-tests-zip) : .KATI_IMPLICIT_OUTPUTS := $(general-tests-list-zip)

$(general-tests-zip) : PRIVATE_general_tests_list := $(PRODUCT_OUT)/general-tests_list



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

	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

	rm -f $(PRIVATE_general_tests_list)

	$(hide) grep -e .*.config$$ $@-host.list | sed s%$(HOST_OUT)%host%g > $(PRIVATE_general_tests_list)

	$(hide) grep -e .*.config$$ $@-target.list | sed s%$(PRODUCT_OUT)%target%g >> $(PRIVATE_general_tests_list)

	$(hide) $(SOONG_ZIP) -d -o $(general-tests-list-zip) -C $(dir $@) -f $(PRIVATE_general_tests_list)

	rm -f $@.list $@-host.list $@-target.list $(PRIVATE_general_tests_list)



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

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