auto merge of #11531 : brson/rust/yetmoreandroidfixes, r=alexcrichton

Author: bors

mk/tests.mk

@@ -445,17 +445,17 @@ check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4
 $$(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 '(cd $(CFG_ADB_TEST_DIR); LD_LIBRARY_PATH=. \
+	$$(Q)$(CFG_ADB) push $$< $(CFG_ADB_TEST_DIR)
+	$$(Q)$(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 \
-		$$(call CRATE_TEST_EXTRA_ARGS,$(1),$(2),$(3),$(4)))' \
+		$$(call CRATE_TEST_EXTRA_ARGS,$(1),$(2),$(3),$(4)) $(TESTARGS))' \
 		> 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/
-	@$(CFG_ADB) shell rm $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log
-	@$(CFG_ADB) pull $(CFG_ADB_TEST_DIR)/$$(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) tmp/
+	$$(Q)cat tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp
+	$$(Q)touch tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).log
+	$$(Q)$(CFG_ADB) pull $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log tmp/
+	$$(Q)$(CFG_ADB) shell rm $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log
+	$$(Q)$(CFG_ADB) pull $(CFG_ADB_TEST_DIR)/$$(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) tmp/
 	@if grep -q "result: ok" tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \
 	then \
 		rm tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).tmp; \

src/libstd/io/net/tcp.rs

@@ -136,6 +136,7 @@ mod test {
     use io::*;
     use prelude::*;
 
+    // FIXME #11530 this fails on android because tests are run as root
     iotest!(fn bind_error() {
         let mut called = false;
         io_error::cond.trap(|e| {
@@ -147,7 +148,7 @@ mod test {
             assert!(listener.is_none());
         });
         assert!(called);
-    } #[ignore(cfg(windows))])
+    } #[ignore(cfg(windows))] #[ignore(cfg(target_os = "android"))])
 
     iotest!(fn connect_error() {
         let mut called = false;

src/libstd/io/net/udp.rs

@@ -99,6 +99,7 @@ mod test {
     use super::*;
     use io::net::ip::{SocketAddr};
 
+    // FIXME #11530 this fails on android because tests are run as root
     iotest!(fn bind_error() {
         let mut called = false;
         io_error::cond.trap(|e| {
@@ -110,7 +111,7 @@ mod test {
             assert!(socket.is_none());
         });
         assert!(called);
-    } #[ignore(cfg(windows))])
+    } #[ignore(cfg(windows))] #[ignore(cfg(target_os = "android"))])
 
     iotest!(fn socket_smoke_test_ip4() {
         let server_ip = next_test_ip4();