itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add tests for fixed metadata download behavior

Browse Source
This commit is contained in:
Jon Gjengset 2020-12-17 10:01:24 -08:00
parent 7367e4390c
commit ee286bce4b
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cargo/ops/cargo_output_metadata.rs
View File

@ -142,6 +142,8 @@ fn build_resolve_graph(
)?;
// Download all Packages. This is needed to serialize the information for every package.
// Note that even with --filter-platform we end up downloading host dependencies as well,
// as that is the behavior of download_accessible.
let package_map: BTreeMap<PackageId, Package> = ws_resolve
.pkg_set
.download_accessible(

50
tests/testsuite/metadata.rs
View File

@ -1,5 +1,7 @@
//! Tests for the `cargo metadata` command.
use cargo_test_support::install::cargo_home;
use cargo_test_support::paths::CargoPathExt;
use cargo_test_support::registry::Package;
use cargo_test_support::{basic_bin_manifest, basic_lib_manifest, main_file, project, rustc_host};
@ -2343,8 +2345,27 @@ fn filter_platform() {
.replace("$ALT_TRIPLE", alt_target)
.replace("$HOST_TRIPLE", &rustc_host());
// We're going to be checking that we don't download excessively,
// so we need to ensure that downloads will happen.
let clear = || {
cargo_home().join("registry/cache").rm_rf();
cargo_home().join("registry/src").rm_rf();
p.build_dir().rm_rf();
};
// Normal metadata, no filtering, returns *everything*.
p.cargo("metadata")
.with_stderr_unordered(
"\
[UPDATING] [..]
[WARNING] please specify `--format-version` flag explicitly to avoid compatibility problems
[DOWNLOADING] crates ...
[DOWNLOADED] normal-dep v0.0.1 [..]
[DOWNLOADED] host-dep v0.0.1 [..]
[DOWNLOADED] alt-dep v0.0.1 [..]
[DOWNLOADED] cfg-dep v0.0.1 [..]
",
)
.with_json(
&r#"
{
@ -2454,10 +2475,20 @@ fn filter_platform() {
.replace("$FOO", &foo),
)
.run();
clear();
// Filter on alternate, removes cfg and host.
p.cargo("metadata --filter-platform")
.arg(alt_target)
.with_stderr_unordered(
"\
[WARNING] please specify `--format-version` flag explicitly to avoid compatibility problems
[DOWNLOADING] crates ...
[DOWNLOADED] normal-dep v0.0.1 [..]
[DOWNLOADED] host-dep v0.0.1 [..]
[DOWNLOADED] alt-dep v0.0.1 [..]
",
)
.with_json(
&r#"
{
@ -2526,10 +2557,19 @@ fn filter_platform() {
.replace("$FOO", &foo),
)
.run();
clear();
// Filter on host, removes alt and cfg.
p.cargo("metadata --filter-platform")
.arg(rustc_host())
.with_stderr_unordered(
"\
[WARNING] please specify `--format-version` flag explicitly to avoid compatibility problems
[DOWNLOADING] crates ...
[DOWNLOADED] normal-dep v0.0.1 [..]
[DOWNLOADED] host-dep v0.0.1 [..]
",
)
.with_json(
&r#"
{
@ -2598,11 +2638,21 @@ fn filter_platform() {
.replace("$FOO", &foo),
)
.run();
clear();
// Filter host with cfg, removes alt only
p.cargo("metadata --filter-platform")
.arg(rustc_host())
.env("RUSTFLAGS", "--cfg=foobar")
.with_stderr_unordered(
"\
[WARNING] please specify `--format-version` flag explicitly to avoid compatibility problems
[DOWNLOADING] crates ...
[DOWNLOADED] normal-dep v0.0.1 [..]
[DOWNLOADED] host-dep v0.0.1 [..]
[DOWNLOADED] cfg-dep v0.0.1 [..]
",
)
.with_json(
&r#"
{