Skip to content

Commit 1f13563

Browse files
committed
allow ios builds to fail
The ios builds build properly, but fail to link for some reason since yesterday when compiled with cargo test (they used to work). Need to investigate more.
1 parent 68870a9 commit 1f13563

File tree

5 files changed

+50
-27
lines changed

5 files changed

+50
-27
lines changed

.appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ install:
1212
- rustc -vV
1313
- cargo -vV
1414
build: false
15-
test_script: C:\msys64\usr\bin\sh ci\run.sh
15+
test_script: C:\msys64\usr\bin\bash ci\run.sh

.travis.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ matrix:
3131
- os: osx
3232
env: TARGET=i686-apple-darwin
3333
script: ci/run.sh
34-
osx_image: xcode9.2
34+
osx_image: xcode9.4
3535
- os: osx
3636
env: TARGET=x86_64-apple-darwin
3737
script: ci/run.sh
38-
osx_image: xcode9.2
38+
osx_image: xcode9.4
3939
# *BSDs:
4040
#- env: TARGET=i686-unknown-freebsd NORUN=1
4141
# script: ci/run.sh
@@ -50,15 +50,19 @@ matrix:
5050
- os: osx
5151
env: TARGET=i386-apple-ios
5252
script: ci/run.sh
53+
osx_image: xcode9.4
5354
- os: osx
5455
env: TARGET=x86_64-apple-ios
5556
script: ci/run.sh
57+
osx_image: xcode9.4
5658
- os: osx
5759
env: TARGET=armv7-apple-ios NORUN=1
5860
script: ci/run.sh
61+
osx_image: xcode9.4
5962
- os: osx
6063
env: TARGET=aarch64-apple-ios NORUN=1
6164
script: ci/run.sh
65+
osx_image: xcode9.4
6266
# WASM:
6367
- env: TARGET=wasm32-unknown-unknown NORUN=1
6468
script: ci/run.sh
@@ -87,6 +91,11 @@ matrix:
8791
#- env: TARGET=x86_64-unknown-freebsd NORUN=1
8892
#- env: TARGET=x86_64-unknown-netbsd NORUN=1
8993
#- env: TARGET=x86_64-sun-solaris NORUN=1
94+
95+
# FIXME: iOS
96+
# https://github.com/gnzlbg/packed_simd/issues/26
97+
- env: TARGET=i386-apple-ios
98+
- env: TARGET=x86_64-apple-ios
9099

91100
install:
92101
- rustup target add $TARGET || true

ci/run.sh

+21-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/usr/bin/env bash
22

33
set -ex
44

@@ -15,10 +15,15 @@ if [[ "${NORUN}" == "1" ]]; then
1515
export CARGO_SUBCMD=build
1616
fi
1717

18+
echo "TARGET=${TARGET}"
19+
rustc --version
1820
echo "RUSTFLAGS=${RUSTFLAGS}"
1921
echo "FEATURES=${FEATURES}"
2022
echo "NORUN=${NORUN}"
2123
echo "CARGO_SUBCMD=${CARGO_SUBCMD}"
24+
echo "RUST_TEST_THREADS=${RUST_TEST_THREADS}"
25+
echo "RUST_BACKTRACE=${RUST_BACKTRACE}"
26+
echo "RUST_TEST_NOCAPTURE=${RUST_TEST_NOCAPTURE}"
2227

2328
cargo_test() {
2429
cmd="cargo ${CARGO_SUBCMD} --target=${TARGET} ${1}"
@@ -46,17 +51,20 @@ case ${TARGET} in
4651
x86*)
4752
if [[ ${TARGET} == *"ios"* ]]; then
4853
echo "ERROR: ${TARGET} must run in the iOS simulator"
54+
exit 1
4955
fi
5056

5157
cargo_test
5258
cargo_test "--release"
5359

54-
export RUSTFLAGS="${RUSTFLAGS} -C target-feature=+sse4.2"
55-
cargo_test "--release"
56-
export RUSTFLAGS="${RUSTFLAGS} -C target-feature=+avx"
60+
ORIGINAL_RUSFTFLAGS=${RUSTFLAGS}
61+
62+
export RUSTFLAGS="${ORIGINAL_RUSTFLAGS} -C target-feature=+sse4.2"
5763
cargo_test "--release"
58-
export RUSTFLAGS="${RUSTFLAGS} -C target-feature=+avx2"
64+
export RUSTFLAGS="${ORIGINAL_RUSTFLAGS} -C target-feature=+avx2"
5965
cargo_test "--release"
66+
67+
export RUSTFLAGS=${ORIGINAL_RUSFTFLAGS}
6068
;;
6169
armv7*)
6270
cargo_test
@@ -84,6 +92,8 @@ case ${TARGET} in
8492
cargo_test "--release"
8593

8694
# FIXME: this doesn't compile succesfully
95+
# https://github.com/gnzlbg/packed_simd/issues/18
96+
#
8797
# export RUSTFLAGS="${RUSTFLAGS} -C target-feature=+msa -C target-cpu=mips64r5"
8898
# cargo_test "--release"
8999
;;
@@ -98,10 +108,14 @@ case ${TARGET} in
98108
cargo_test
99109
cargo_test "--release"
100110

101-
export RUSTFLAGS="${RUSTFLAGS} -C target-feature=+altivec"
111+
ORIGINAL_RUSFTFLAGS=${RUSTFLAGS}
112+
113+
export RUSTFLAGS="${ORIGINAL_RUSTFLAGS} -C target-feature=+altivec"
102114
cargo_test "--release"
103-
export RUSTFLAGS="${RUSTFLAGS} -C target-feature=+vsx"
115+
export RUSTFLAGS="${ORIGINAL_RUSTFLAGS} -C target-feature=+vsx"
104116
cargo_test "--release"
117+
118+
export RUSTFLAGS=${ORIGINAL_RUSFTFLAGS}
105119
;;
106120
*)
107121
cargo_test

readme.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ the full testsuite passes on the target.
1515
| `i586-unknown-linux-gnu` |||
1616
| `i686-unknown-linux-gnu` |||
1717
| `x86_64-unknown-linux-gnu` |||
18-
| `arm-unknown-linux-gnueabi` | | |
18+
| `arm-unknown-linux-gnueabi` | | |
1919
| `arm-unknown-linux-gnueabihf` |||
2020
| `armv7-unknown-linux-gnueabi` |||
2121
| `aarch64-unknown-linux-gnu` |||
2222
| `mips-unknown-linux-gnu` |||
2323
| `mipsel-unknown-linux-musl` |||
2424
| `mips64-unknown-linux-gnuabi64` |||
2525
| `mips64el-unknown-linux-gnuabi64` |||
26-
| `powerpc-unknown-linux-gnu` | | |
27-
| `powerpc64-unknown-linux-gnu` | | |
28-
| `powerpc64le-unknown-linux-gnu` | | |
26+
| `powerpc-unknown-linux-gnu` | | |
27+
| `powerpc64-unknown-linux-gnu` | | |
28+
| `powerpc64le-unknown-linux-gnu` | | |
2929
| `s390x-unknown-linux-gnu` ||* |
3030
| `sparc64-unknown-linux-gnu` ||* |
3131
| **MacOSX targets:** | **build** | **run** |
@@ -41,18 +41,18 @@ the full testsuite passes on the target.
4141
| `arm-linux-androideabi` |||
4242
| `aarch64-linux-android` |||
4343
| **iOS targets:** | **build** | **run** |
44-
| `i386-apple-ios` || |
45-
| `x86_64-apple-ios` || |
46-
| `armv7-apple-ios` || ** |
47-
| `aarch64-apple-ios` || ** |
44+
| `i386-apple-ios` || |
45+
| `x86_64-apple-ios` || |
46+
| `armv7-apple-ios` || ** |
47+
| `aarch64-apple-ios` || ** |
4848
| **xBSD targets:** | **build** | **run** |
49-
| `i686-unknown-freebsd` | | ** |
50-
| `x86_64-unknown-freebsd` | | ** |
51-
| `x86_64-unknown-netbsd` | | ** |
49+
| `i686-unknown-freebsd` | |** |
50+
| `x86_64-unknown-freebsd` | |** |
51+
| `x86_64-unknown-netbsd` | |** |
5252
| **Solaris targets:** | **build** | **run** |
53-
| `x86_64-sun-solaris` | | ** |
53+
| `x86_64-sun-solaris` | |** |
5454
| **WASM targets:** | **build** | **run** |
55-
| `wasm32-unknown-unknown` || ** |
55+
| `wasm32-unknown-unknown` || ** |
5656

5757
[*] most of the test suite passes correctly on these platform but
5858
there are correctness bugs open in the issue tracker.
@@ -79,8 +79,8 @@ dual licensed as above, without any additional terms or conditions.
7979

8080
[travis]: https://travis-ci.org/gnzlbg/packed_simd
8181
[Travis-CI Status]: https://travis-ci.org/gnzlbg/packed_simd.svg?branch=master
82-
[appveyor]: https://ci.appveyor.com/project/gnzlbg/packed_simd/branch/master
83-
[Appveyor Status]: https://ci.appveyor.com/api/projects/status/lobb2qte2q5gbxbo?svg=true
82+
[appveyor]: https://ci.appveyor.com/project/gnzlbg/packed-simd/branch/master
83+
[Appveyor Status]: https://ci.appveyor.com/api/projects/status/h9079ut0qaeruccr/branch/master?svg=true
8484
[Latest Version]: https://img.shields.io/crates/v/packed_simd.svg
8585
[crates.io]: https://crates.io/crates/packed_simd
8686
[docs]: https://docs.rs/packed_simd/badge.svg

src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ extern crate cfg_if;
4343
cfg_if! {
4444
if #[cfg(all(target_arch = "arm", target_feature = "v7", target_feature = "neon"))] {
4545
extern crate coresimd;
46-
#[allow(unused)]
46+
#[allow(unused_imports)]
4747
use coresimd::arch;
4848
} else {
49-
#[allow(unused)]
49+
#[allow(unused_imports)]
5050
use core::arch;
5151
}
5252
}

0 commit comments

Comments
 (0)