From 4eaa087b63da3885b164fa7a921b70cb76fdcaba Mon Sep 17 00:00:00 2001 From: sebcrozet Date: Thu, 24 May 2018 23:56:47 +0200 Subject: [PATCH] Dedicate a specific CI job to nalgebra-lapack + fix Xargo build. --- .travis.yml | 3 ++- ci/build.sh | 28 +++++++++++++++++++--------- ci/test.sh | 9 ++++++--- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7dff84ed..3f6c3bcf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,8 @@ rust: - stable env: - - CARGO_FEATURE_SYSTEM_NETLIB=1 CARGO_FEATURE_EXCLUDE_LAPACKE=1 CARGO_FEATURE_EXCLUDE_CBLAS=1 + - + - LAPACK=1 CARGO_FEATURE_SYSTEM_NETLIB=1 CARGO_FEATURE_EXCLUDE_LAPACKE=1 CARGO_FEATURE_EXCLUDE_CBLAS=1 - NO_STD=1 CARGO_FEATURES="" - NO_STD=1 CARGO_FEATURES="alloc" diff --git a/ci/build.sh b/ci/build.sh index b70a404b..4c5c4d1b 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -3,16 +3,26 @@ set -ev if [ -z "$NO_STD" ]; then - cargo build --verbose; - cargo build --verbose --features "arbitrary"; - cargo build --verbose --features "mint"; - cargo build --verbose --features "alloc"; - cargo build --verbose --features "serde-serialize"; - cargo build --verbose --features "abomonation-serialize"; - cargo build --verbose --features "debug"; - cargo build --verbose --features "debug arbitrary mint serde-serialize abomonation-serialize"; + if [ -z "$LAPACK" ]; then + cargo build --verbose -p nalgebra; + cargo build --verbose -p nalgebra --features "arbitrary"; + cargo build --verbose -p nalgebra --features "mint"; + cargo build --verbose -p nalgebra --features "alloc"; + cargo build --verbose -p nalgebra --features "serde-serialize"; + cargo build --verbose -p nalgebra --features "abomonation-serialize"; + cargo build --verbose -p nalgebra --features "debug"; + cargo build --verbose -p nalgebra --features "debug arbitrary mint serde-serialize abomonation-serialize"; + else + cargo build -p nalgebra-lapack; + fi else + if [ "$CARGO_FEATURES" == "alloc" ]; then + cat << EOF > Xargo.toml +[target.x86_64-unknown-linux-gnu.dependencies] +alloc = {} +EOF + fi rustup component add rust-src - cargo install xargo; + cargo install xargo xargo build --verbose --no-default-features --target=x86_64-unknown-linux-gnu --features "${CARGO_FEATURES}"; fi \ No newline at end of file diff --git a/ci/test.sh b/ci/test.sh index 4e938bc4..d75dfa0f 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -3,7 +3,10 @@ set -ev if [ -z "$NO_STD" ]; then - cargo test --verbose; - cargo test --verbose "debug arbitrary mint serde-serialize abomonation-serialize"; - cd nalgebra-lapack; cargo test --verbose; + if [ -z "$LAPACK" ]; then + cargo test --verbose; + cargo test --verbose "debug arbitrary mint serde-serialize abomonation-serialize"; + else + cd nalgebra-lapack; cargo test --verbose; + fi fi \ No newline at end of file