Android: Change directory before running tests
This commit is contained in:
parent
2ec9b8ce2f
commit
5e87f2f89e
13
mk/tests.mk
13
mk/tests.mk
|
@ -143,8 +143,9 @@ CFG_ADB_TEST_DIR=/data/tmp
|
|||
|
||||
$(info check: android device test dir $(CFG_ADB_TEST_DIR) ready \
|
||||
$(shell adb remount 1>/dev/null) \
|
||||
$(shell adb shell mkdir $(CFG_ADB_TEST_DIR) 1>/dev/null) \
|
||||
$(shell adb shell rm -rf $(CFG_ADB_TEST_DIR)/* 1>/dev/null) \
|
||||
$(shell adb shell rm -r $(CFG_ADB_TEST_DIR) >/dev/null) \
|
||||
$(shell adb shell mkdir $(CFG_ADB_TEST_DIR)) \
|
||||
$(shell adb shell mkdir $(CFG_ADB_TEST_DIR)/tmp) \
|
||||
$(shell adb push $(S)src/etc/adb_run_wrapper.sh $(CFG_ADB_TEST_DIR) 1>/dev/null) \
|
||||
$(shell adb push $(CFG_ANDROID_CROSS_PATH)/arm-linux-androideabi/lib/armv7-a/libgnustl_shared.so \
|
||||
$(CFG_ADB_TEST_DIR) 1>/dev/null) \
|
||||
|
@ -408,10 +409,10 @@ $$(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 LD_LIBRARY_PATH=$(CFG_ADB_TEST_DIR) \
|
||||
$(CFG_ADB_TEST_DIR)/`echo $$< | sed 's/.*\///'` \
|
||||
--logfile $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log > \
|
||||
tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp
|
||||
@$(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)' \
|
||||
> 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/
|
||||
|
|
Loading…
Reference in New Issue