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.

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

Report status to stderr -- last few tests #2722

Merged
merged 28 commits into from
May 20, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f88b581
report status to stderr instead of stdout
matklad May 14, 2016
c015744
fix test_cargo_build_auth
matklad May 14, 2016
7923023
fix test_cargo_build_lib
matklad May 14, 2016
c9d6130
fix test_cargo_clean
matklad May 14, 2016
1a2257b
fix a bunch of tests with regexp
matklad May 14, 2016
2904e36
fix some more tests with regexp
matklad May 14, 2016
e7839b1
fix some tests with IntelliJ-Rust automated refactoring
matklad May 15, 2016
232858f
fix test_cargo_test
matklad May 15, 2016
415d962
fix more tests with regex
matklad May 15, 2016
9f408ee
fix more test with insane regexes
matklad May 15, 2016
4b624c9
fix more tests
matklad May 15, 2016
db7d59e
fix exit_code tests
matklad May 15, 2016
97f91a1
fix test_cargo_install
matklad May 15, 2016
5751066
more regexp fixes
matklad May 18, 2016
ca29668
fix more tests with auto refactoring
matklad May 19, 2016
e78956d
more auto refactoring fixes
matklad May 19, 2016
ba1c094
fix test_cargo_registry
matklad May 20, 2016
eeebadf
fix test_cargo_package
matklad May 20, 2016
40fd7a7
one more regexp
matklad May 20, 2016
b5633e6
fix test_cargo_overrides
matklad May 20, 2016
eb9a118
fix test_cargo_bench
matklad May 20, 2016
c57c3ae
fix some cargo_compile tests
matklad May 20, 2016
d0a14eb
fix test_compile_git_deps
matklad May 20, 2016
4057f43
fix test_cargo_freshness
matklad May 20, 2016
1c991f8
fix test_cargo_publish
matklad May 20, 2016
f2eb995
fix cargo_compile_path_deps
matklad May 20, 2016
11b38e0
Merge branch 'status-2-stderr' of https://github.com/matklad/cargo in…
alexcrichton May 20, 2016
43234cd
Fix up last few remaining tests status-to-stderr
alexcrichton May 20, 2016
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
2 changes: 1 addition & 1 deletion src/cargo/core/shell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ impl MultiShell {
{
match self.verbosity {
Quiet => Ok(()),
_ => self.out().say_status(status, message, GREEN, true)
_ => self.err().say_status(status, message, GREEN, true)
}
}

Expand Down
5 changes: 5 additions & 0 deletions tests/test_bad_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ test!(bad3 {
"#);
assert_that(foo.cargo_process("publish").arg("-v"),
execs().with_status(101).with_stderr("\
[UPDATING] registry `https://[..]`
[ERROR] invalid configuration for key `http.proxy`
expected a string, but found a boolean in [..]config
"));
Expand Down Expand Up @@ -232,6 +233,7 @@ test!(bad_git_dependency {

assert_that(foo.cargo_process("build").arg("-v"),
execs().with_status(101).with_stderr("\
[UPDATING] git repository `file:///`
[ERROR] Unable to update file:///

Caused by:
Expand All @@ -258,6 +260,8 @@ test!(bad_crate_type {
assert_that(foo.cargo_process("build").arg("-v"),
execs().with_status(0).with_stderr("\
warning: crate-type \"bad_type\" was not one of lib|rlib|dylib|staticlib
[COMPILING] foo v0.0.0 (file:///[..])
[RUNNING] `rustc [..] --crate-type rlib [..]`
"));
});

Expand Down Expand Up @@ -430,6 +434,7 @@ test!(unused_keys {
assert_that(foo.cargo_process("build"),
execs().with_status(0).with_stderr("\
warning: unused manifest key: target.foo.bar
[COMPILING] foo v0.1.0 (file:///[..])
"));
});

Expand Down
Loading