Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test the Resolver against the varisat Library #6980

Merged
merged 13 commits into from
May 28, 2019
Merged

Test the Resolver against the varisat Library #6980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9602b78
use varisat to verify the resolver
Eh2406 May 20, 2019
f8008a4
make n smaller in the O(n^2) parts
Eh2406 May 20, 2019
52cf0f7
use a better encoding
Eh2406 May 20, 2019
3c87b40
amortize constructing the SAT solver
Eh2406 May 21, 2019
c7e23ae
maintain almost the same interface
Eh2406 May 21, 2019
6454efd
support public & private deps
Eh2406 May 22, 2019
a25d8e9
use a topological_order to only make a var where needed
Eh2406 May 22, 2019
c68334f
Think of `publicly_exports` as being in terms of a set of `activation…
Eh2406 May 22, 2019
5143c0c
Work around accidentally quadratic debug_assert in varisat
Eh2406 May 23, 2019
514039e
make sure the complicated cases are at the end
Eh2406 May 23, 2019
a7676eb
remove a redundant clause
Eh2406 May 23, 2019
8458661
reuse vars where publicly_exports implies can_see
Eh2406 May 24, 2019
e08d032
add a helper function
Eh2406 May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ features = [
[dev-dependencies]
bufstream = "0.1"
proptest = "0.9.1"
varisat = "0.2.1"

[[bin]]
name = "cargo"
Expand Down
26 changes: 20 additions & 6 deletions tests/testsuite/resolve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::support::registry::Package;
use crate::support::resolver::{
assert_contains, assert_same, dep, dep_kind, dep_loc, dep_req, dep_req_kind, loc_names, names,
pkg, pkg_dep, pkg_id, pkg_loc, registry, registry_strategy, remove_dep, resolve,
resolve_and_validated, resolve_with_config, PrettyPrintRegistry, ToDep, ToPkgId,
resolve_and_validated, resolve_with_config, PrettyPrintRegistry, SatResolve, ToDep, ToPkgId,
};

use proptest::prelude::*;
Expand Down Expand Up @@ -41,6 +41,7 @@ proptest! {
PrettyPrintRegistry(input) in registry_strategy(50, 20, 60)
) {
let reg = registry(input.clone());
let mut sat_resolve = SatResolve::new(&reg);
// there is only a small chance that any one
// crate will be interesting.
// So we try some of the most complicated.
Expand All @@ -49,6 +50,7 @@ proptest! {
pkg_id("root"),
vec![dep_req(&this.name(), &format!("={}", this.version()))],
&reg,
Some(&mut sat_resolve),
);
}
}
Expand Down Expand Up @@ -236,6 +238,18 @@ proptest! {
}
}

#[test]
fn pub_fail() {
let input = vec![
pkg!(("a", "0.0.4")),
pkg!(("a", "0.0.5")),
pkg!(("e", "0.0.6") => [dep_req_kind("a", "<= 0.0.4", Kind::Normal, true),]),
pkg!(("kB", "0.0.3") => [dep_req("a", ">= 0.0.5"),dep("e"),]),
];
let reg = registry(input.clone());
assert!(resolve_and_validated(pkg_id("root"), vec![dep("kB")], &reg, None).is_err());
}

#[test]
fn basic_public_dependency() {
let reg = registry(vec![
Expand All @@ -245,7 +259,7 @@ fn basic_public_dependency() {
pkg!("C" => [dep("A"), dep("B")]),
]);

let res = resolve_and_validated(pkg_id("root"), vec![dep("C")], &reg).unwrap();
let res = resolve_and_validated(pkg_id("root"), vec![dep("C")], &reg, None).unwrap();
assert_same(
&res,
&names(&[
Expand Down Expand Up @@ -281,7 +295,7 @@ fn public_dependency_filling_in() {
pkg!("d" => [dep("c"), dep("a"), dep("b")]),
]);

let res = resolve_and_validated(pkg_id("root"), vec![dep("d")], &reg).unwrap();
let res = resolve_and_validated(pkg_id("root"), vec![dep("d")], &reg, None).unwrap();
assert_same(
&res,
&names(&[
Expand Down Expand Up @@ -316,7 +330,7 @@ fn public_dependency_filling_in_and_update() {
pkg!("C" => [dep("A"),dep("B")]),
pkg!("D" => [dep("B"),dep("C")]),
]);
let res = resolve_and_validated(pkg_id("root"), vec![dep("D")], &reg).unwrap();
let res = resolve_and_validated(pkg_id("root"), vec![dep("D")], &reg, None).unwrap();
assert_same(
&res,
&names(&[
Expand Down Expand Up @@ -1407,7 +1421,7 @@ fn conflict_store_bug() {
];

let reg = registry(input);
let _ = resolve_and_validated(pkg_id("root"), vec![dep("j")], &reg);
let _ = resolve_and_validated(pkg_id("root"), vec![dep("j")], &reg, None);
}

#[test]
Expand Down Expand Up @@ -1435,5 +1449,5 @@ fn conflict_store_more_then_one_match() {
]),
];
let reg = registry(input);
let _ = resolve_and_validated(pkg_id("root"), vec![dep("nA")], &reg);
let _ = resolve_and_validated(pkg_id("root"), vec![dep("nA")], &reg, None);
}
Loading