From 279366a0b279658b52e646c637a56489e825ee67 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 13 Jan 2014 19:44:18 -0800 Subject: [PATCH] mk: Make TESTNAME and VERBOSE work with android. Closes #10957 --- mk/tests.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mk/tests.mk b/mk/tests.mk index d50f9878bd1..65cf751b57b 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -445,17 +445,17 @@ check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4 $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)) @$$(call E, run: $$< via adb) - @$(CFG_ADB) push $$< $(CFG_ADB_TEST_DIR) - @$(CFG_ADB) shell '(cd $(CFG_ADB_TEST_DIR); LD_LIBRARY_PATH=. \ + $$(Q)$(CFG_ADB) push $$< $(CFG_ADB_TEST_DIR) + $$(Q)$(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 \ - $$(call CRATE_TEST_EXTRA_ARGS,$(1),$(2),$(3),$(4)))' \ + $$(call CRATE_TEST_EXTRA_ARGS,$(1),$(2),$(3),$(4)) $(TESTARGS))' \ > 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/ + $$(Q)cat tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp + $$(Q)touch tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).log + $$(Q)$(CFG_ADB) pull $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log tmp/ + $$(Q)$(CFG_ADB) shell rm $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log + $$(Q)$(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; \