From b32617666a30972f9bcc3c4c619b862f14350d22 Mon Sep 17 00:00:00 2001 From: Young-il Choi Date: Thu, 18 Jul 2013 17:17:47 +0900 Subject: [PATCH 1/3] std: run test fix for ARM android --- src/libstd/run.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libstd/run.rs b/src/libstd/run.rs index ef3d881c5fead..68986ff11c211 100644 --- a/src/libstd/run.rs +++ b/src/libstd/run.rs @@ -1311,11 +1311,11 @@ mod tests { let output = str::from_bytes(prog.finish_with_output().output); let r = os::env(); - for &(k, v) in r.iter() { + for &(ref k, ref v) in r.iter() { // don't check android RANDOM variables - if k != ~"RANDOM" { - assert!(output.contains(fmt!("%s=%s", k, v)) || - output.contains(fmt!("%s=\'%s\'", k, v))); + if *k != ~"RANDOM" { + assert!(output.contains(fmt!("%s=%s", *k, *v)) || + output.contains(fmt!("%s=\'%s\'", *k, *v))); } } } From 492cbcee6dd042913254bf31bf94c4f5c7f5e66a Mon Sep 17 00:00:00 2001 From: Young-il Choi Date: Wed, 7 Aug 2013 20:42:44 +0900 Subject: [PATCH 2/3] mk: install.mk fix to specify ADB variables not adb --- mk/install.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/install.mk b/mk/install.mk index 07cb21217ae3f..4b50c5aa7963f 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -199,7 +199,7 @@ endef $(foreach target,$(CFG_TARGET_TRIPLES), \ $(if $(findstring $(target),"arm-linux-androideabi"), \ $(if $(findstring adb,$(CFG_ADB)), \ - $(if $(findstring device,$(shell 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 install: install-runtime-target for $(target) enabled \ $(info install: android device attached) \ $(eval $(call DEF_ADB_DEVICE_STATUS, true))), \ From d463f4cb10aeb93bff9c4a376b6c0e46b4abe304 Mon Sep 17 00:00:00 2001 From: Young-il Choi Date: Wed, 7 Aug 2013 20:43:46 +0900 Subject: [PATCH 3/3] mk: test.mk fix to specify ADB variables not adb --- mk/tests.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/tests.mk b/mk/tests.mk index 682ea3e5f6946..8e921d300b557 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -123,7 +123,7 @@ endef $(foreach target,$(CFG_TARGET_TRIPLES), \ $(if $(findstring $(target),"arm-linux-androideabi"), \ $(if $(findstring adb,$(CFG_ADB)), \ - $(if $(findstring device,$(shell 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: $(target) test enabled \ $(info check: android device attached) \ $(eval $(call DEF_ADB_DEVICE_STATUS, true))), \