diff options
| -rw-r--r-- | mk/tests.mk | 16 | ||||
| -rw-r--r-- | src/libstd/io/net/tcp.rs | 3 | ||||
| -rw-r--r-- | src/libstd/io/net/udp.rs | 3 |
3 files changed, 12 insertions, 10 deletions
diff --git a/mk/tests.mk b/mk/tests.mk index d50f9878bd1..65cf751b57b 100644 --- a/mk/tests.mk +++ b/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; \ diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs index 023a9bddca9..b901ea99cbe 100644 --- a/src/libstd/io/net/tcp.rs +++ b/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; diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs index 8a866c2a357..952ca7f730e 100644 --- a/src/libstd/io/net/udp.rs +++ b/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(); |