Android: Run benchmarks and copy metrics

diff --git a/mk/tests.mk b/mk/tests.mk
index a9702aa3250e802607ec5fb535030ad45530c0d8..048e62cca8ecfed1aecdb76b3b9a3d2c14775232 100644 (file)
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -411,12 +411,14 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
        @$(CFG_ADB) push $$< $(CFG_ADB_TEST_DIR)
        @$(CFG_ADB) shell '(cd $(CFG_ADB_TEST_DIR); LD_LIBRARY_PATH=. \
                ./$$(notdir $$<) \
-               --logfile $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log)' \
+               --logfile $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log \
+               $$(call CRATE_TEST_BENCH_ARGS,$(1),$(2),$(3),$(4)))' \
                > tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp
        @cat tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp
        @touch tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).log
        @$(CFG_ADB) pull $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log tmp/
        @$(CFG_ADB) shell rm $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log
+       @$(CFG_ADB) pull $(CFG_ADB_TEST_DIR)/$$(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) tmp/
        @if grep -q "result: ok" tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \
        then \
                rm tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \