Skip to content

Commit

Permalink
Fix android device detection when connected to a remote emulator (in …
Browse files Browse the repository at this point in the history 
…this case device name contains ':').

Use $(CFG_ADB) for all adb invocations.
  • Loading branch information
@vadimcn
vadimcn committed Jan 4, 2014
1 parent 8bfd2a8 commit c78a407
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions mk/tests.mk
View file
Expand Up @@ -133,7 +133,7 @@ endef
$(foreach target,$(CFG_TARGET), \
$(if $(findstring $(target),"arm-linux-androideabi"), \
$(if $(findstring adb,$(CFG_ADB)), \
$(if $(findstring device,$(shell $(CFG_ADB) devices 2>/dev/null | grep -E '^[_A-Za-z0-9-]+[[:blank:]]+device')), \
$(if $(findstring device,$(shell $(CFG_ADB) devices 2>/dev/null | grep -E '^[:_A-Za-z0-9-]+[[:blank:]]+device')), \
$(info check: android device attached) \
$(eval $(call DEF_ADB_DEVICE_STATUS, true)), \
$(info check: android device not attached) \
Expand All @@ -149,21 +149,21 @@ ifeq ($(CFG_ADB_DEVICE_STATUS),true)
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 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 $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(CFG_RUNTIME_arm-linux-androideabi) \
$(CFG_ADB_TEST_DIR)) \
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(STDLIB_GLOB_arm-linux-androideabi) \
$(CFG_ADB_TEST_DIR)) \
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(EXTRALIB_GLOB_arm-linux-androideabi) \
$(CFG_ADB_TEST_DIR)) \
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(LIBRUSTUV_GLOB_arm-linux-androideabi) \
$(CFG_ADB_TEST_DIR)) \
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(LIBGREEN_GLOB_arm-linux-androideabi) \
$(CFG_ADB_TEST_DIR)) \
$(shell $(CFG_ADB) remount 1>/dev/null) \
$(shell $(CFG_ADB) shell rm -r $(CFG_ADB_TEST_DIR) >/dev/null) \
$(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)) \
)
else
CFG_ADB_TEST_DIR=
Expand Down

5 comments on commit c78a407

@bors
Copy link
Contributor

@bors bors commented on c78a407 Jan 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at vadimcn@c78a407

@bors
Copy link
Contributor

@bors bors commented on c78a407 Jan 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging vadimcn/rust/test-adb = c78a407 into auto

@bors
Copy link
Contributor

@bors bors commented on c78a407 Jan 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vadimcn/rust/test-adb = c78a407 merged ok, testing candidate = 57db916

@bors
Copy link
Contributor

@bors bors commented on c78a407 Jan 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3370
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1213
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1216
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3373
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2475
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2478
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3389
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2478
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2483
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3391
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2478
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2482
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/2552
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3378
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2480
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2484
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3152

@bors
Copy link
Contributor

@bors bors commented on c78a407 Jan 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 57db916

Please sign in to comment.