Split up Travis into 4 jobs

This improves parallelism (Travis will run 5 jobs at once) and avoids
redundancy (the core_io + nightly builds are being run twice, in the
stable and beta builds).

Author: jack-fortanix

.travis.yml

@@ -7,6 +7,7 @@ branches:
     # Not really necessary, just to get a green badge on “master”
     - master
 language: rust
+os: linux
 dist: xenial
 addons:
   apt:
@@ -15,21 +16,18 @@ addons:
     - libclang-3.8-dev
     - clang-3.8
     - cmake
-rust:
-  - stable
-  - beta
-matrix:
-  allow_failures:
-  - rust: beta
 env:
   global:
     - RUST_BACKTRACE=1
     # Pinned to this particular nightly version because of core_io. This can be
     # re-pinned whenever core_io is updated to the latest nightly.
     - CORE_IO_NIGHTLY=nightly-2019-07-01
     - LLVM_CONFIG_PATH=llvm-config-3.8
+matrix:
+  include:
+      - env: TOOLCHAIN="stable"
+      - env: TOOLCHAIN="beta"
+      - env: TOOLCHAIN="coreio_nightly"
+      - env: TOOLCHAIN="sgx"
 script:
-  - rustup toolchain add $CORE_IO_NIGHTLY
-  - rustup toolchain add nightly
-  - rustup target add --toolchain nightly x86_64-fortanix-unknown-sgx
   - ./ct.sh

ct.sh

@@ -2,20 +2,28 @@
 set -ex
 cd "$(dirname "$0")"
 
-if [ "${TRAVIS_BRANCH}" = "staging" ];
-then
-    rm -rf ./target
-fi
-
 cd "./mbedtls"
 
-cargo test
-cargo test --features spin_threading
-cargo test --features rust_threading
-cargo test --features zlib
-cargo test --features pkcs12
-cargo test --features pkcs12_rc2
-cargo test --features force_aesni_support
-cargo +$CORE_IO_NIGHTLY test --no-default-features --features core_io,rdrand,time,custom_time,custom_gmtime_r
-cargo +$CORE_IO_NIGHTLY test --no-default-features --features core_io,rdrand
-cargo +nightly test --no-run --target=x86_64-fortanix-unknown-sgx --features=sgx --no-default-features
+if [ $TOOLCHAIN = "stable" ] || [ $TOOLCHAIN = "beta" ]; then
+
+    rustup toolchain add $TOOLCHAIN
+    rustup default $TOOLCHAIN
+    cargo test
+    cargo test --features spin_threading
+    cargo test --features rust_threading
+    cargo test --features zlib
+    cargo test --features pkcs12
+    cargo test --features pkcs12_rc2
+    cargo test --features force_aesni_support
+
+elif [ $TOOLCHAIN = "coreio_nightly" ]; then
+
+    rustup toolchain add $CORE_IO_NIGHTLY
+    cargo +$CORE_IO_NIGHTLY test --no-default-features --features core_io,rdrand,time,custom_time,custom_gmtime_r
+    cargo +$CORE_IO_NIGHTLY test --no-default-features --features core_io,rdrand
+
+elif [ $TOOLCHAIN = "sgx" ]; then
+    rustup toolchain add nightly
+    cargo +nightly test --no-run --target=x86_64-fortanix-unknown-sgx --features=sgx --no-default-features
+
+fi