Skip to content

Commit a284c3f

Browse files
committed
Auto merge of #5856 - Eh2406:min-test, r=alexcrichton
run some tests with minimal-versions on CI In #5757 we discovered that sum test don't pass with minimal-versions, and so only added CI for `cargo check`. This PR is to see if that is still needed, and if it is then which test rely on upstream bugfix.
2 parents 6cc8320 + 620d5cc commit a284c3f

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ matrix:
3232
# increased every 6 weeks or so when the first PR to use a new feature.
3333
- env: TARGET=x86_64-unknown-linux-gnu
3434
ALT=i686-unknown-linux-gnu
35-
rust: 1.27.2
35+
rust: 1.28.0
3636
script:
3737
- rustup toolchain install nightly
3838
- cargo +nightly generate-lockfile -Z minimal-versions
3939
- cargo -V
40-
- cargo check --tests
40+
- cargo test
4141

4242
- env: TARGET=x86_64-unknown-linux-gnu
4343
ALT=i686-unknown-linux-gnu

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ semver = { version = "0.9.0", features = ["serde"] }
4747
serde = "1.0"
4848
serde_derive = "1.0"
4949
serde_ignored = "0.0.4"
50-
serde_json = "1.0"
51-
shell-escape = "0.1"
50+
serde_json = "1.0.24"
51+
shell-escape = "0.1.4"
5252
tar = { version = "0.4.15", default-features = false }
5353
tempfile = "3.0"
5454
termcolor = "1.0"

appveyor.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ environment:
77
OTHER_TARGET: i686-pc-windows-msvc
88
MAKE_TARGETS: test-unit-x86_64-pc-windows-msvc
99
MINIMAL_VERSIONS: true
10+
CFG_DISABLE_CROSS_TESTS: 1
1011

1112
install:
1213
- appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
@@ -23,5 +24,8 @@ clone_depth: 1
2324
build: false
2425

2526
test_script:
27+
# we don't have ci time to run the full `cargo test` with `minimal-versions` like
28+
# - if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +stable test
29+
# so we just run `cargo check --tests` like
2630
- if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +stable check --tests
2731
- if NOT defined MINIMAL_VERSIONS cargo test

src/cargo/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#![cfg_attr(feature = "cargo-clippy", allow(boxed_local))] // bug rust-lang-nursery/rust-clippy#1123
55
#![cfg_attr(feature = "cargo-clippy", allow(cyclomatic_complexity))] // large project
66
#![cfg_attr(feature = "cargo-clippy", allow(derive_hash_xor_eq))] // there's an intentional incoherence
7-
#![cfg_attr(feature = "cargo-clippy", allow(explicit_into_iter_loop))] // (unclear why)
8-
#![cfg_attr(feature = "cargo-clippy", allow(explicit_iter_loop))] // (unclear why)
7+
#![cfg_attr(feature = "cargo-clippy", allow(explicit_into_iter_loop))] // explicit loops are clearer
8+
#![cfg_attr(feature = "cargo-clippy", allow(explicit_iter_loop))] // explicit loops are clearer
99
#![cfg_attr(feature = "cargo-clippy", allow(identity_op))] // used for vertical alignment
1010
#![cfg_attr(feature = "cargo-clippy", allow(implicit_hasher))] // large project
1111
#![cfg_attr(feature = "cargo-clippy", allow(large_enum_variant))] // large project

0 commit comments

Comments
 (0)