diff options
| author | bors <bors@rust-lang.org> | 2013-09-16 07:45:45 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-16 07:45:45 -0700 |
| commit | 507a7f093d51829ccde225542bda2a805be32ba2 (patch) | |
| tree | cf3faaf76b1f7057a559296cab2390bf310b1bda | |
| parent | 2562f480f53fd3d15822034d441441ffbd04dbe4 (diff) | |
| parent | 942bc3161ed380ee7873b11fb4ba53d45476ca32 (diff) | |
| download | rust-507a7f093d51829ccde225542bda2a805be32ba2.tar.gz rust-507a7f093d51829ccde225542bda2a805be32ba2.zip | |
auto merge of #9121 : sanxiyn/rust/arm, r=alexcrichton
Ignore failing tests on Android to prepare for #9120.
| -rw-r--r-- | mk/rt.mk | 7 | ||||
| -rw-r--r-- | src/test/run-pass/packed-struct-vec.rs | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mk/rt.mk b/mk/rt.mk index e31f2228e3f..35ee42f9cb4 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -102,15 +102,15 @@ else ifeq ($(OSTYPE_$(1)), apple-darwin) LIBUV_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/libuv/libuv.a JEMALLOC_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc/lib/libjemalloc_pic.a else ifeq ($(OSTYPE_$(1)), unknown-freebsd) - LIBUV_OSTYPE_$(1)_$(2) := unix/freebsd + LIBUV_OSTYPE_$(1)_$(2) := freebsd LIBUV_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/libuv/libuv.a JEMALLOC_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc/lib/libjemalloc_pic.a else ifeq ($(OSTYPE_$(1)), linux-androideabi) - LIBUV_OSTYPE_$(1)_$(2) := unix/android + LIBUV_OSTYPE_$(1)_$(2) := android LIBUV_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/libuv/libuv.a JEMALLOC_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc/lib/libjemalloc_pic.a else - LIBUV_OSTYPE_$(1)_$(2) := unix/linux + LIBUV_OSTYPE_$(1)_$(2) := linux LIBUV_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/libuv/libuv.a JEMALLOC_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc/lib/libjemalloc_pic.a endif @@ -178,6 +178,7 @@ export PYTHONPATH := $(PYTHONPATH):$$(S)src/gyp/pylib $$(LIBUV_MAKEFILE_$(1)_$(2)): $$(LIBUV_DEPS) (cd $(S)src/libuv/ && \ $$(CFG_PYTHON) ./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) -D ninja \ + -DOS=$$(LIBUV_OSTYPE_$(1)_$(2)) \ -Goutput_dir=$$(@D) --generator-output $$(@D)) # XXX: Shouldn't need platform-specific conditions here diff --git a/src/test/run-pass/packed-struct-vec.rs b/src/test/run-pass/packed-struct-vec.rs index 930ef17dbf5..e66c4619b3c 100644 --- a/src/test/run-pass/packed-struct-vec.rs +++ b/src/test/run-pass/packed-struct-vec.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// xfail-android: FIXME(#9116) Bus error + use std::sys; #[packed] |