diff options
| author | bors <bors@rust-lang.org> | 2013-08-09 10:59:08 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-09 10:59:08 -0700 |
| commit | c20b90647e3378cabd8975026637b60b7e40bec4 (patch) | |
| tree | 8a66f772935b20ed31fcf46aa7da43b1cac3ec50 | |
| parent | 74efdf6197aaee39bd14f8d97b75dbba08f1d32e (diff) | |
| parent | d463f4cb10aeb93bff9c4a376b6c0e46b4abe304 (diff) | |
| download | rust-c20b90647e3378cabd8975026637b60b7e40bec4.tar.gz rust-c20b90647e3378cabd8975026637b60b7e40bec4.zip | |
auto merge of #8369 : yichoi/rust/arm-test, r=sanxiyn
fix some part of test code to pass make check on ARM Android
| -rw-r--r-- | mk/install.mk | 2 | ||||
| -rw-r--r-- | mk/tests.mk | 2 | ||||
| -rw-r--r-- | src/libstd/run.rs | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mk/install.mk b/mk/install.mk index 07cb21217ae..4b50c5aa796 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))), \ diff --git a/mk/tests.mk b/mk/tests.mk index 682ea3e5f69..8e921d300b5 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))), \ diff --git a/src/libstd/run.rs b/src/libstd/run.rs index 99cf96eaae2..2d81a981074 100644 --- a/src/libstd/run.rs +++ b/src/libstd/run.rs @@ -1309,11 +1309,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))); } } } |