travis: Cleanup code and check minimal versions

By using --package and bash arrays, we can make the testing scripts
much more readable. We also remove deprecated keys/functionality so
that the .travis.yml file validates without warnings.

Signed-off-by: Joe Richey <[email protected]>

Author: josephlr

.travis.yml

@@ -1,11 +1,10 @@
 language: rust
-sudo: false
+os: linux
 
-matrix:
+jobs:
   include:
     - name: "Linux, 1.32.0"
       rust: 1.32.0
-      os: linux
 
     - name: "OSX, 1.32.0"
       rust: 1.32.0
@@ -20,7 +19,7 @@ matrix:
       install:
         - rustup target add aarch64-apple-ios
       script:
-        - cargo test
+        - cargo test --package getrandom --package cpurand-getrandom --tests
         - cargo build --target aarch64-apple-ios
 
     - name: "Linux, beta"
@@ -63,46 +62,44 @@ matrix:
         - cargo web prepare-emscripten
       env: EMCC_CFLAGS="-s ERROR_ON_UNDEFINED_SYMBOLS=0"
       script:
-        # We cannot run emscripten test binaries (see rust-lang/rust#63649).
-        # However, we can still build and link all tests to make sure that works.
-        # This is actually useful as it finds stuff such as rust-random/rand#669
-        - cargo web test --target wasm32-unknown-emscripten --no-run
-        - cargo web test --target asmjs-unknown-emscripten --no-run
-        # wasi tests
+        # Test our supported web targets
+        - cargo web test --target wasm32-unknown-emscripten
+        - cargo web test --target asmjs-unknown-emscripten
         - cargo test --target wasm32-wasi
-        # stdweb tests (Node, Chrome)
-        - cd custom/stdweb
-        - cargo web test --nodejs --target=wasm32-unknown-unknown
-        - cargo web test --target=wasm32-unknown-unknown
-        # wasm-bindgen tests (Node, Firefox, Chrome)
-        - cd ../wasm-bindgen
-        - cargo test --target wasm32-unknown-unknown --test node
-        - GECKODRIVER=$HOME/geckodriver cargo test --target wasm32-unknown-unknown --test web
-        - CHROMEDRIVER=$HOME/chromedriver cargo test --target wasm32-unknown-unknown --test web
+        # stdweb (wasm32-unknown-unknown) tests (Node, Chrome)
+        - cargo web test --package stdweb-getrandom
+        - cargo web test --package stdweb-getrandom --nodejs
+        # wasm-bindgen (wasm32-unknown-unknown) tests (Node, Firefox, Chrome)
+        - cargo test --package wasm-bindgen-getrandom
+          --target wasm32-unknown-unknown --test node
+        - GECKODRIVER=$HOME/geckodriver
+          cargo test --package wasm-bindgen-getrandom
+          --target wasm32-unknown-unknown --test web
+        - CHROMEDRIVER=$HOME/chromedriver
+          cargo test --package wasm-bindgen-getrandom
+          --target wasm32-unknown-unknown --test web
 
     - &nightly_and_docs
       name: "Linux, nightly, docs"
       rust: nightly
-      os: linux
       install:
         - rustup target add wasm32-unknown-unknown
         - cargo --list | egrep "^\s*deadlinks$" -q || cargo install cargo-deadlinks
         - cargo deadlinks -V
       script:
-        # Check that our tests pass in the default configuration
-        - cargo test
-        - cargo test --benches
         # Check that setting various features does not break the build
         - cargo build --features=std
         - cargo build --features=custom
         # remove cached documentation, otherwise files from previous PRs can get included
         - rm -rf target/doc
         - cargo doc --no-deps --features=std,custom
-        - cargo doc --no-deps --manifest-path=custom/wasm-bindgen/Cargo.toml --target=wasm32-unknown-unknown
+        - cargo doc --no-deps --package cpurand-getrandom
+        - cargo doc --no-deps --package wasm-bindgen-getrandom --target=wasm32-unknown-unknown
         - cargo deadlinks --dir target/doc
-        # also test minimum dependency versions are usable
+        # Check that our tests pass in the default/minimal configuration
+        - cargo test --package getrandom --package cpurand-getrandom --tests --benches
         - cargo generate-lockfile -Z minimal-versions
-        - cargo test --features=std,custom
+        - cargo test --package getrandom --package cpurand-getrandom --tests --benches
 
     - <<: *nightly_and_docs
       name: "OSX, nightly, docs"
@@ -111,37 +108,48 @@ matrix:
     - name: "cross-platform build only"
       rust: nightly
       install:
-        - rustup target add x86_64-sun-solaris
-        - rustup target add x86_64-unknown-cloudabi
-        - rustup target add x86_64-unknown-freebsd
-        - rustup target add x86_64-fuchsia
-        - rustup target add x86_64-unknown-netbsd
-        - rustup target add x86_64-unknown-redox
-        - rustup target add x86_64-fortanix-unknown-sgx
+        - export STD_TARGETS=(
+            x86_64-sun-solaris
+            x86_64-unknown-cloudabi
+            x86_64-unknown-freebsd
+            x86_64-fuchsia
+            x86_64-unknown-netbsd
+            x86_64-unknown-redox
+            x86_64-fortanix-unknown-sgx
+          )
+        - export NO_STD_TARGETS=(
+            x86_64-unknown-uefi
+            x86_64-unknown-hermit
+            x86_64-unknown-l4re-uclibc
+            x86_64-uwp-windows-gnu
+            x86_64-wrs-vxworks
+          )
+        - for TARGET in ${STD_TARGETS[@]}; do rustup target add $TARGET; done
         # For no_std targets
         - rustup component add rust-src
-        - cargo install cargo-xbuild || true
+        - cargo --list | egrep "^\s*xbuild$" -q || cargo install cargo-xbuild
       script:
-        # We test that getrandom and cpurand build for all x86 targets
-        - cd custom/cpurand
-        - cargo build --target=x86_64-sun-solaris
-        - cargo build --target=x86_64-unknown-cloudabi
-        - cargo build --target=x86_64-unknown-freebsd
-        - cargo build --target=x86_64-fuchsia
-        - cargo build --target=x86_64-unknown-netbsd
-        - cargo build --target=x86_64-unknown-redox
-        - cargo build --target=x86_64-fortanix-unknown-sgx
-        - cargo xbuild --target=x86_64-unknown-uefi
-        - cargo xbuild --target=x86_64-unknown-hermit
-        - cargo xbuild --target=x86_64-unknown-l4re-uclibc
-        - cargo xbuild --target=x86_64-uwp-windows-gnu
-        - cargo xbuild --target=x86_64-wrs-vxworks
+        # As all of the targets here are x86, it is enough to test that
+        # getrandom and getrandom-cpu build for all x86 targets.
+        - for TARGET in ${STD_TARGETS[@]}; do
+            cargo build --package cpurand-getrandom --target $TARGET;
+          done
+        - for TARGET in ${NO_STD_TARGETS[@]}; do
+            cargo xbuild --package cpurand-getrandom --target $TARGET;
+          done
+        # Also check that minimum versions build
+        - cargo generate-lockfile -Z minimal-versions
+        - for TARGET in ${STD_TARGETS[@]}; do
+            cargo build --package cpurand-getrandom --target $TARGET;
+          done
+        - for TARGET in ${NO_STD_TARGETS[@]}; do
+            cargo xbuild --package cpurand-getrandom --target $TARGET;
+          done
 
     # Trust cross-built/emulated targets. We must repeat all non-default values.
     - name: "Linux (MIPS, big-endian)"
       env: TARGET=mips-unknown-linux-gnu
       rust: stable
-      sudo: required
       dist: trusty
       services: docker
       install:
@@ -153,7 +161,6 @@ matrix:
     - name: "Android (ARMv7)"
       env: TARGET=armv7-linux-androideabi
       rust: stable
-      sudo: required
       dist: trusty
       services: docker
       install:
@@ -181,7 +188,7 @@ before_script:
   - export RUSTFLAGS="-D warnings"
 
 script:
-  - cargo test
+  - cargo test --package getrandom --package cpurand-getrandom --tests
 
 after_script: set +e
 

benches/mod.rs

@@ -1,5 +1,4 @@
 #![feature(test)]
-extern crate getrandom;
 extern crate test;
 
 #[bench]