Skip to content

Commit

Permalink
Fix i686 Linux/musl builds
Browse files Browse the repository at this point in the history
  • Loading branch information
Susurrus committed Apr 18, 2017
1 parent e453f66 commit 63e6b4a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ matrix:
- env: TARGET=i686-unknown-linux-musl
# - env: TARGET=x86_64-unknown-linux-gnu # this is the default job
- env: TARGET=x86_64-unknown-linux-musl
- env: TARGET=x86_64-unknown-linux-musl DISABLE_TESTS=1

# OSX
- env: TARGET=i686-apple-darwin
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ Tier 1:
* powerpc-unknown-linux-gnu
* mips-unknown-linux-gnu
* mipsel-unknown-linux-gnu
* i686-unknown-linux-musl

Tier 2:
* i686-unknown-freebsd
* x86_64-unknown-freebsd
* x86_64-unknown-netbsd
* i686-unknown-linux-musl
* x86_64-unknown-linux-musl

## Usage
Expand Down
4 changes: 4 additions & 0 deletions test/sys/test_aio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,10 @@ fn test_read_into_mut_slice() {
}

// Test reading into an immutable buffer. It should fail
// FIXME: This test fails to panic on Linux/musl
#[test]
#[should_panic(expected = "Can't read into an immutable buffer")]
#[cfg_attr(target_env = "musl", ignore)]
fn test_read_immutable_buffer() {
let rbuf: &'static [u8] = b"CDEF";
let f = tempfile().unwrap();
Expand Down Expand Up @@ -412,9 +414,11 @@ fn test_lio_listio_signal() {
}

// Try to use lio_listio to read into an immutable buffer. It should fail
// FIXME: This test fails to panic on Linux/musl
#[test]
#[cfg(not(any(target_os = "ios", target_os = "macos")))]
#[should_panic(expected = "Can't read into an immutable buffer")]
#[cfg_attr(target_env = "musl", ignore)]
fn test_lio_listio_read_immutable() {
let rbuf: &'static [u8] = b"abcd";
let f = tempfile().unwrap();
Expand Down

0 comments on commit 63e6b4a

Please sign in to comment.