diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-01-28 23:29:38 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-01-29 00:16:32 -0800 |
| commit | 55280598a8a8760b0138dbf3024dc4d11a0c00af (patch) | |
| tree | 4121d10aaf73cff4a63f33ff98f1793d8095269b | |
| parent | c6bd05303c37d354e08278fcdebd95ca7fec9fd9 (diff) | |
| download | rust-55280598a8a8760b0138dbf3024dc4d11a0c00af.tar.gz rust-55280598a8a8760b0138dbf3024dc4d11a0c00af.zip | |
Fix android test deps
This changes android testing to upload *all* target crates rather than just a select subset. This should unblock #11867 which is introducing a libglob dependency in testing.
| -rw-r--r-- | mk/install.mk | 17 | ||||
| -rw-r--r-- | mk/tests.mk | 19 |
2 files changed, 12 insertions, 24 deletions
diff --git a/mk/install.mk b/mk/install.mk index 33f170f4f97..cf17a87b275 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -239,20 +239,17 @@ endif define INSTALL_RUNTIME_TARGET_N install-runtime-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2)) - $(Q)$(call ADB_SHELL,mkdir,$(CFG_RUNTIME_PUSH_DIR)) - $(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(STDLIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR)) - $(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(EXTRALIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR)) - $(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(LIBRUSTUV_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR)) - $(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(LIBGREEN_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR)) + $$(Q)$$(call ADB_SHELL,mkdir,$(CFG_RUNTIME_PUSH_DIR)) + $$(Q)$$(foreach crate,$$(TARGET_CRATES),\ + $$(call ADB_PUSH,$$(TL$(1)$(2))/$$(call CFG_LIB_GLOB_$(1),$$(crate)),\ + $$(CFG_RUNTIME_PUSH_DIR));) endef define INSTALL_RUNTIME_TARGET_CLEANUP_N install-runtime-target-$(1)-cleanup: - $(Q)$(call ADB,remount) - $(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(STDLIB_GLOB_$(1))) - $(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(EXTRALIB_GLOB_$(1))) - $(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(LIBRUSTUV_GLOB_$(1))) - $(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(LIBGREEN_GLOB_$(1))) + $$(Q)$$(call ADB,remount) + $$(Q)$$(foreach crate,$$(TARGET_CRATES),\ + $$(call ADB_SHELL,rm,$$(CFG_RUNTIME_PUSH_DIR)/$$(call CFG_LIB_GLOB_$(1),$$(crate)));) endef $(eval $(call INSTALL_RUNTIME_TARGET_N,arm-linux-androideabi,$(CFG_BUILD))) diff --git a/mk/tests.mk b/mk/tests.mk index 8ecac954ad2..ab70b3afba9 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -156,16 +156,9 @@ $(info check: android device test dir $(CFG_ADB_TEST_DIR) ready \ $(shell $(CFG_ADB) shell mkdir $(CFG_ADB_TEST_DIR)) \ $(shell $(CFG_ADB) shell mkdir $(CFG_ADB_TEST_DIR)/tmp) \ $(shell $(CFG_ADB) push $(S)src/etc/adb_run_wrapper.sh $(CFG_ADB_TEST_DIR) 1>/dev/null) \ - $(shell $(CFG_ADB) push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(CFG_RUNTIME_arm-linux-androideabi) \ - $(CFG_ADB_TEST_DIR)) \ - $(shell $(CFG_ADB) push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(STDLIB_GLOB_arm-linux-androideabi) \ - $(CFG_ADB_TEST_DIR)) \ - $(shell $(CFG_ADB) push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(EXTRALIB_GLOB_arm-linux-androideabi) \ - $(CFG_ADB_TEST_DIR)) \ - $(shell $(CFG_ADB) push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(LIBRUSTUV_GLOB_arm-linux-androideabi) \ - $(CFG_ADB_TEST_DIR)) \ - $(shell $(CFG_ADB) push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(LIBGREEN_GLOB_arm-linux-androideabi) \ - $(CFG_ADB_TEST_DIR)) \ + $(foreach crate,$(TARGET_CRATES),\ + $(shell $(CFG_ADB) push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(call CFG_LIB_GLOB_arm-linux-androideabi,$(crate)) \ + $(CFG_ADB_TEST_DIR)))\ ) else CFG_ADB_TEST_DIR= @@ -342,10 +335,8 @@ define TEST_RUNNER # test crates without rebuilding std and extra first ifeq ($(NO_REBUILD),) STDTESTDEP_$(1)_$(2)_$(3)_$(4) = $$(SREQ$(1)_T_$(2)_H_$(3)) \ - $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.extra \ - $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.rustuv \ - $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.green \ - $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.native + $$(foreach crate,$$(TARGET_CRATES),\ + $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(crate)) else STDTESTDEP_$(1)_$(2)_$(3)_$(4) = endif |