fixup

Author: gnzlbg

.travis.yml

@@ -8,7 +8,7 @@ matrix:
     - env: TARGET=i586-unknown-linux-gnu
     - env: TARGET=i686-unknown-linux-gnu
     - env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
-    - env: TARGET=x86_64-unknown-linux-gnu-emulated NO_ADD=1
+    - env: TARGET=x86_64-unknown-linux-gnu-emulated NO_ADD=1 STDSIMD_TEST_EVERYTHING=1 FEATURES="intel"
     - env: TARGET=arm-unknown-linux-gnueabihf
     - env: TARGET=armv7-unknown-linux-gnueabihf
     - env: TARGET=aarch64-unknown-linux-gnu
@@ -33,7 +33,7 @@ install:
 
 script:
   - cargo generate-lockfile
-  - ci/run-docker.sh $TARGET
+  - ci/run-docker.sh $TARGET $FEATURES
 
 notifications:
   email:

Cargo.toml

@@ -32,3 +32,4 @@ cupid = "0.3"
 
 [features]
 strict = []
+intel = []

ci/run-docker.sh

@@ -16,6 +16,7 @@ run() {
       --env CARGO_HOME=/cargo \
       --volume `rustc --print sysroot`:/rust:ro \
       --env TARGET=$target \
+      --env FEATURES=$2 \
       --env STDSIMD_TEST_EVERYTHING \
       --volume `pwd`:/checkout:ro \
       --volume `pwd`/target:/checkout/target \
@@ -28,8 +29,8 @@ run() {
 
 if [ -z "$1" ]; then
   for d in `ls ci/docker/`; do
-    run $d
+    run $d "strict"
   done
 else
-  run $1
+  run $1 $2
 fi

ci/run.sh

@@ -17,5 +17,7 @@ esac
 
 echo "RUSTFLAGS=${RUSTFLAGS}"
 
-cargo test --target $TARGET --features "strict" --verbose -- --nocapture
-cargo test --release --target $TARGET --features "strict" --verbose -- --nocapture
+FEATURES="strict,$FEATURES"
+
+cargo test --target $TARGET --features $FEATURES --verbose -- --nocapture
+cargo test --release --target $TARGET --features $FEATURES --verbose -- --nocapture

src/x86/mod.rs

@@ -12,6 +12,8 @@ pub use self::avx2::*;
 pub use self::abm::*;
 pub use self::bmi::*;
 pub use self::bmi2::*;
+
+#[cfg(not(feature = "intel"))]
 pub use self::tbm::*;
 
 pub use self::runtime::{__unstable_detect_feature, __Feature};
@@ -40,4 +42,5 @@ mod avx2;
 mod abm;
 mod bmi;
 mod bmi2;
+#[cfg(not(feature = "intel"))]
 mod tbm;