Skip to content

Commit 22a8715

Browse files
committed
Auto merge of #7011 - alexcrichton:resolver-extract, r=Eh2406
Extract resolver tests to their own crate These tests take a good amount of time to run locally and they're also causing a lot of dependencies to get pulled into rust-lang/rust, so let's have a separate crate that we just test on our own CI
2 parents 0a9d3ae + 290a727 commit 22a8715

File tree

14 files changed

+1497
-1480
lines changed

14 files changed

+1497
-1480
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
/target
2-
/tests/testsuite/support/cargo-test-macro/target
1+
target
32
Cargo.lock
43
.cargo
54
/config.stamp

.travis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ matrix:
4242
- (cd src/doc && mdbook build --dest-dir ../../target/doc) || travis_terminate 1
4343
if: branch != master OR type = pull_request
4444

45+
- name: resolver tests
46+
rust: stable
47+
before_script: true
48+
script:
49+
- cargo test --manifest-path crates/resolver-tests/Cargo.toml
50+
if: branch != master OR type = pull_request
51+
4552
exclude:
4653
- rust: stable
4754

Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ path = "src/cargo/lib.rs"
2121
atty = "0.2"
2222
byteorder = "1.2"
2323
bytesize = "1.0"
24-
crates-io = { path = "src/crates-io", version = "0.26" }
24+
crates-io = { path = "crates/crates-io", version = "0.26" }
2525
crossbeam-utils = "0.6"
2626
crypto-hash = "0.3.1"
2727
curl = { version = "0.4.21", features = ['http2'] }
@@ -102,9 +102,7 @@ features = [
102102

103103
[dev-dependencies]
104104
bufstream = "0.1"
105-
proptest = "0.9.1"
106-
varisat = "0.2.1"
107-
cargo-test-macro = { "path" = "tests/testsuite/support/cargo-test-macro", version = "0.1.0" }
105+
cargo-test-macro = { path = "crates/cargo-test-macro", version = "0.1.0" }
108106

109107
[[bin]]
110108
name = "cargo"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

crates/resolver-tests/Cargo.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[package]
2+
name = "resolver-tests"
3+
version = "0.1.0"
4+
authors = ["Alex Crichton <[email protected]>"]
5+
edition = "2018"
6+
7+
[dependencies]
8+
cargo = { path = "../.." }
9+
proptest = "0.9.1"
10+
lazy_static = "1.3.0"
11+
varisat = "0.2.1"
12+
atty = "0.2.11"

0 commit comments

Comments
 (0)