itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add debug info to git::two_deps_only_update_one test

Browse Source
This commit is contained in:
Dale Wijnand 2018-11-26 10:50:26 +00:00
parent 5ddc8b1338
commit 2e35475121
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/testsuite/git.rs
View File

@ -11,6 +11,7 @@ use std::thread;
use support::paths::{self, CargoPathExt}; use support::paths::{self, CargoPathExt};
use support::sleep_ms; use support::sleep_ms;
use support::{basic_lib_manifest, basic_manifest, git, main_file, path2url, project}; use support::{basic_lib_manifest, basic_manifest, git, main_file, path2url, project};
use support::Project;
#[test] #[test]
fn cargo_compile_simple_git_dep() { fn cargo_compile_simple_git_dep() {
@ -1090,6 +1091,18 @@ fn two_deps_only_update_one() {
).file("src/main.rs", "fn main() {}") ).file("src/main.rs", "fn main() {}")
.build(); .build();
fn oid_to_short_sha(oid: git2::Oid) -> String {
oid.to_string()[..8].to_string()
}
fn git_repo_head_sha(p: &Project) -> String {
let repo = git2::Repository::open(p.root()).unwrap();
let head = repo.head().unwrap().target().unwrap();
oid_to_short_sha(head)
}
println!("dep1 head sha: {}", git_repo_head_sha(&git1));
println!("dep2 head sha: {}", git_repo_head_sha(&git2));
p.cargo("build") p.cargo("build")
.with_stderr( .with_stderr(
"[UPDATING] git repository `[..]`\n\ "[UPDATING] git repository `[..]`\n\
@ -1106,7 +1119,8 @@ fn two_deps_only_update_one() {
.unwrap(); .unwrap();
let repo = git2::Repository::open(&git1.root()).unwrap(); let repo = git2::Repository::open(&git1.root()).unwrap();
git::add(&repo); git::add(&repo);
git::commit(&repo); let oid = git::commit(&repo);
println!("dep1 head sha: {}", oid_to_short_sha(oid));
p.cargo("update -p dep1") p.cargo("update -p dep1")
.with_stderr(&format!( .with_stderr(&format!(