Skip to content

Commit 9a6139c

Browse files
pitdickerpitdicker
committed
Extend CI configuration
1 parent d162a5e commit 9a6139c

File tree

3 files changed

+141
-54
lines changed

3 files changed

+141
-54
lines changed

‎.travis.yml‎

Lines changed: 119 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,117 @@
11
language: rust
22
sudo: false
33

4-
# We aim to test all the following in any combination:
5-
# - standard tests, benches, documentation, all available features
6-
# - pinned stable, latest stable, beta and nightly Rust releases
7-
# - Linux, OS X, Android, iOS, bare metal (i.e. no_std)
8-
# - x86_64, ARMv7, a Big-Endian arch (MIPS)
4+
# We support too many combinations of Rust releases, crate features, operating
5+
# systems, and architectures to even remotely test all combinations.
6+
# Yet it turns out we can test most of these independent of each other, because
7+
# they serve different goals or test different pieces of code.
8+
#
9+
# RUST RELEASES
10+
# Goal: make sure we don't use language features unavailable on a certain
11+
# version, and build without warnings.
12+
# We have different builders use 4 Rust releases, a pinned stable release,
13+
# the latest stable, beta and nightly.
14+
#
15+
# ARCHITECTURES
16+
# Goal: test against issues caused by differences in endianness, pointer sizes,
17+
# etc.
18+
# We run tests on 4 different architectures.
19+
# - x64_84, default on Travis (Linux) and AppVeyor (Windows)
20+
# - i686, second AppVeyor (Windows) configuration
21+
# - MIPS, big-endian Linux emulated with QEMU (thanks to Trust)
22+
# - ARMv7, Android emulated with QEMU (thanks to Trust)
23+
#
24+
# OPERATING SYSTEMS
25+
# Goal: test on many operating systems, to verify the OsRng code, which is
26+
# mostly architecture-independend.
27+
# We run tests on Linux, OS X, Windows, Android (emulated), and Node.js (using
28+
# cargo-web).
29+
# One builder cross-compiles for many of the remaining OSes, which ensures we
30+
# keep building, but doesn't run tests.
31+
# OSes supported by Rand but which we can't cross-compile because there
32+
# is no pre-build standard library available: Dragonfly BSD, Haiku, OpenBSD.
33+
#
34+
# CRATE FEATURES, TESTS, AND SUB-CRATES
35+
# Goal: Run unit tests, doctests, examples, and benchmarks (converted to tests)
36+
# for all crates, in configurations that cover all interesting
37+
# combinations of features.
38+
# Tests run on rand:
39+
# - test no_std support, but only the unit tests:
40+
# `cargo test --lib --no-default-features`
41+
# - run unit tests and doctests with all features which are available on stable:
42+
# `cargo test --features=serde1,log`
43+
# - test examples:
44+
# `cargo test --examples`
45+
# Additional tests on nightly:
46+
# - run unit tests and doctests with all features which are available on nightly:
47+
# `cargo test --features=serde1,log,nightly`
48+
# - test no_std support, including the nightly alloc feature:
49+
# cargo test --lib --no-default-features --features alloc
50+
# - run benchmarks as tests:
51+
# `cargo test --benches --features=nightly`
52+
# Tests on subcrates:
53+
# `cargo test --package rand_core`
54+
# `cargo test --package rand_core --features=alloc` (requires nightly)
55+
# `cargo test --package rand_core --no-default-features`
56+
# `cargo test --package rand_isaac --features=serde1`
57+
# `cargo test --package rand_xorshift --features=serde1`
958
matrix:
1059
include:
1160
- rust: 1.22.0
61+
env: DESCRIPTION="pinned stable Rust release"
1262
install:
1363
script:
14-
# TODO: use --tests instead of --lib on more recent compiler
1564
- cargo test --lib --no-default-features
65+
- cargo test --features=serde1,log
66+
- cargo test --examples
67+
- cargo test --package rand_core
1668
- cargo test --package rand_core --no-default-features
17-
- cargo test --features serde1,log
69+
- cargo test --package rand_isaac --features=serde1
70+
# - cargo test --package rand_xorshift --features=serde1
71+
1872
- rust: stable
73+
env: DESCRIPTION="stable Rust release, macOS, iOS (cross-compile only)"
1974
os: osx
2075
install:
76+
- rustup target add aarch64-apple-ios
2177
script:
22-
- cargo test --tests --no-default-features
78+
- cargo test --lib --no-default-features
79+
- cargo test --features=serde1,log
80+
- cargo test --examples
81+
- cargo test --package rand_core
2382
- cargo test --package rand_core --no-default-features
24-
- cargo test --features serde1,log
83+
- cargo test --package rand_isaac --features=serde1
84+
# - cargo test --package rand_xorshift --features=serde1
85+
- cargo build --target=aarch64-apple-ios
86+
2587
- rust: beta
88+
env: DESCRIPTION="beta Rust release"
2689
install:
2790
script:
28-
- cargo test --tests --no-default-features
91+
- cargo test --lib --no-default-features
92+
- cargo test --features=serde1,log
93+
- cargo test --examples
94+
- cargo test --package rand_core
2995
- cargo test --package rand_core --no-default-features
30-
- cargo test --features serde1,log
96+
- cargo test --package rand_isaac --features=serde1
97+
# - cargo test --package rand_xorshift --features=serde1
98+
3199
- rust: nightly
100+
env: DESCRIPTION="nightly features, benchmarks, documentation"
32101
install:
33102
- cargo --list | egrep "^\s*deadlinks$" -q || cargo install cargo-deadlinks
103+
- cargo deadlinks -V
34104
before_script:
35105
- pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
36106
script:
37-
- cargo test --tests --no-default-features --features=alloc
38-
- cargo test --package rand_core --no-default-features --features=alloc,serde1
39-
- cargo test --features serde1,log,nightly,alloc
40-
- cargo test --all --benches
107+
- cargo test --lib --no-default-features --features alloc
108+
- cargo test --features=serde1,log,nightly
109+
- cargo test --benches --features=nightly
110+
- cargo test --examples
111+
- cargo test --package rand_core
112+
- cargo test --package rand_core --no-default-features --features=alloc
113+
- cargo test --package rand_isaac --features=serde1
114+
# - cargo test --package rand_xorshift --features=serde1
41115
# remove cached documentation, otherwise files from previous PRs can get included
42116
- rm -rf target/doc
43117
- cargo doc --no-deps --all --all-features
@@ -46,52 +120,54 @@ matrix:
46120
- travis-cargo --only nightly doc-upload
47121

48122
- rust: nightly
123+
env: DESCRIPTION="WASM via emscripten, stdweb and wasm-bindgen"
49124
install:
50125
- rustup target add wasm32-unknown-unknown
51-
# Use cargo-update since we need a real update-or-install command
52-
# Only install if not already installed:
53-
#- cargo --list | egrep "\binstall-update$" -q || cargo install cargo-update
54-
#- cargo install-update -i cargo-web
55-
# Cargo has errors with sub-commands so ignore updating for now:
126+
- rustup target add wasm32-unknown-emscripten
127+
# cargo-web takes ±10 min. to install, and cargo and cargo-update offer
128+
# no reliable update-or-install command. We ignore updating for now
129+
# (just drop the Travis' caches when necessary)
56130
- cargo --list | egrep "^\s*web$" -q || cargo install cargo-web
131+
- cargo web -V
132+
addons:
133+
chrome: stable
57134
script:
58-
- cargo web test --target wasm32-unknown-unknown --nodejs --features=stdweb
59-
60-
- rust: nightly
61-
install:
62-
- rustup target add wasm32-unknown-unknown
63-
script:
64-
- cargo build --target wasm32-unknown-unknown --features wasm-bindgen
135+
# testing wasm32-unknown-emscripten fails because of rust-lang/rust#49877
136+
- cargo build --target wasm32-unknown-emscripten
137+
#- cargo web test --target wasm32-unknown-emscripten
138+
#- cargo web test --nodejs --target wasm32-unknown-emscripten
139+
- cargo build --target wasm32-unknown-unknown # without any features
140+
- cargo web test --nodejs --target wasm32-unknown-unknown --features=stdweb
141+
- cargo build --target wasm32-unknown-unknown --features=wasm-bindgen
65142

66143
- rust: nightly
144+
env: DESCRIPTION="cross-platform builder (doesn't run tests)"
67145
install:
68-
- rustup target add thumbv6m-none-eabi
146+
- rustup target add x86_64-sun-solaris
147+
- rustup target add x86_64-unknown-cloudabi
148+
- rustup target add x86_64-unknown-freebsd
149+
- rustup target add x86_64-unknown-fuchsia
150+
- rustup target add x86_64-unknown-netbsd
151+
- rustup target add x86_64-unknown-redox
69152
script:
70-
# Bare metal target; no std; only works on nightly
71-
- cargo build --no-default-features --target thumbv6m-none-eabi --release
153+
- cargo build --target=x86_64-sun-solaris
154+
- cargo build --target=x86_64-unknown-cloudabi
155+
- cargo build --target=x86_64-unknown-freebsd
156+
- cargo build --target=x86_64-unknown-fuchsia
157+
- cargo build --target=x86_64-unknown-netbsd
158+
- cargo build --target=x86_64-unknown-redox
72159

73160
# Trust cross-built/emulated targets. We must repeat all non-default values.
74161
- rust: stable
75162
sudo: required
76163
dist: trusty
77164
services: docker
78-
env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1
165+
env: DESCRIPTION="Linux (MIPS, big-endian)" TARGET=mips-unknown-linux-gnu
79166
- rust: stable
80167
sudo: required
81168
dist: trusty
82169
services: docker
83-
env: TARGET=mips-unknown-linux-gnu
84-
- rust: stable
85-
sudo: required
86-
dist: trusty
87-
services: docker
88-
env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1
89-
- rust: stable
90-
os: osx
91-
sudo: required
92-
dist: trusty
93-
services: docker
94-
env: TARGET=armv7-apple-ios DISABLE_TESTS=1
170+
env: DESCRIPTION="Android (ARMv7)" TARGET=armv7-linux-androideabi
95171

96172
before_install:
97173
- set -e

‎appveyor.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@ install:
3232
build: false
3333

3434
test_script:
35-
- cargo test --all # cannot use --all and --features together
36-
- cargo test --all --benches
37-
- cargo test --features serde1,log,nightly
38-
- cargo test --tests --no-default-features --features=alloc,serde1
39-
- cargo test --package rand_core --no-default-features --features=alloc,serde1
35+
- cargo test --lib --no-default-features --features alloc
36+
- cargo test --features=serde1,log,nightly
37+
- cargo test --benches --features=nightly
38+
- cargo test --examples
39+
- cargo test --package rand_core
40+
- cargo test --package rand_core --no-default-features --features=alloc
41+
- cargo test --package rand_isaac --features=serde1
42+
# - cargo test --package rand_xorshift --features=serde1

‎utils/ci/script.sh‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,22 @@ main() {
1212
fi
1313

1414
if [ ! -z $NIGHTLY ]; then # have nightly Rust
15-
cross test --tests --no-default-features --features alloc --target $TARGET
16-
cross test --package rand_core --no-default-features --features alloc --target $TARGET
17-
cross test --features serde1,log,nightly,alloc --target $TARGET
18-
cross test --all --benches --target $TARGET
15+
cross test --lib --no-default-features --features alloc --target $TARGET
16+
cross test --features=serde1,log,nightly --target $TARGET
17+
cross test --benches --features=nightly --target $TARGET
18+
cross test --examples --target $TARGET
19+
cross test --package rand_core --target $TARGET
20+
cross test --package rand_core --no-default-features --features=alloc --target $TARGET
21+
cross test --package rand_isaac --features=serde1 --target $TARGET
22+
# cross test --package rand_xorshift --features=serde1 --target $TARGET
1923
else # have stable Rust
20-
cross test --tests --no-default-features --target $TARGET
24+
cross test --lib --no-default-features --target $TARGET
25+
cross test --features=serde1,log --target $TARGET
26+
cross test --examples --target $TARGET
27+
cross test --package rand_core --target $TARGET
2128
cross test --package rand_core --no-default-features --target $TARGET
22-
cross test --features serde1,log --target $TARGET
29+
cross test --package rand_isaac --features=serde1 --target $TARGET
30+
# cross test --package rand_xorshift --features=serde1 --target $TARGET
2331
fi
2432
}
2533

0 commit comments

Comments
 (0)