development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-09-13 04:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix package::include/exclude tests so they work even if running them not in cargo.git

Browse source
This commit is contained in:
Ximin Luo 2018-11-04 08:59:20 -08:00
parent 0c6bb242ba
commit dd998a096b
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tests/testsuite/package.rs
View file

@ -285,7 +285,8 @@ dependency `bar` does not specify a version.
#[test]
fn exclude() {
let p = project()
let root = paths::root().join("exclude");
let repo = git::repo(&root)
.file("Cargo.toml", r#"
[project]
name = "foo"
@ -348,7 +349,8 @@ fn exclude() {
.file("some_dir/dir_deep_5/some_dir/file", "")
.build();
p.cargo("package --no-verify -v")
cargo_process("package --no-verify -v")
.cwd(repo.root())
.with_stdout("")
.with_stderr(
"\
@ -366,7 +368,6 @@ See [..]
See [..]
[WARNING] [..] file `some_dir/file_deep_1` WILL be excluded [..]
See [..]
[WARNING] No (git) Cargo.toml found at `[..]` in workdir `[..]`
[PACKAGING] foo v0.0.1 ([..])
[ARCHIVING] [..]
[ARCHIVING] [..]
@ -386,14 +387,17 @@ See [..]
[ARCHIVING] [..]
[ARCHIVING] [..]
[ARCHIVING] [..]
[ARCHIVING] .cargo_vcs_info.json
",
).run();
assert!(p.root().join("target/package/foo-0.0.1.crate").is_file());
assert!(repo.root().join("target/package/foo-0.0.1.crate").is_file());
p.cargo("package -l")
cargo_process("package -l")
.cwd(repo.root())
.with_stdout(
"\
.cargo_vcs_info.json
Cargo.toml
dir_root_1/some_dir/file
dir_root_2/some_dir/file
@ -418,7 +422,8 @@ src/main.rs
#[test]
fn include() {
let p = project()
let root = paths::root().join("include");
let repo = git::repo(&root)
.file("Cargo.toml", r#"
[project]
name = "foo"
@ -432,16 +437,17 @@ fn include() {
.file("src/bar.txt", "") // should be ignored when packaging
.build();
p.cargo("package --no-verify -v")
cargo_process("package --no-verify -v")
.cwd(repo.root())
.with_stderr(
"\
[WARNING] manifest has no description[..]
See http://doc.crates.io/manifest.html#package-metadata for more info.
[WARNING] No (git) Cargo.toml found at `[..]` in workdir `[..]`
[PACKAGING] foo v0.0.1 ([..])
[ARCHIVING] [..]
[ARCHIVING] [..]
[ARCHIVING] [..]
[ARCHIVING] .cargo_vcs_info.json
",
).run();
}