dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show ignore message in console and json output

This commit is contained in:
Antonio Yang 2022-03-04 00:22:15 +08:00 committed by Mark Rousskov
parent f58d51b3c0
commit 14daf47e0a
3 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/test/src/console.rs
View File

@ -118,7 +118,7 @@ impl ConsoleTestState {
TestResult::TrIgnored => {
#[cfg(not(bootstrap))]
if let Some(msg) = ignore_message {
format!("ignored, {msg}")
format!("ignored: {msg}")
} else {
"ignored".to_owned()
}

21
library/test/src/formatters/json.rs
View File

@ -121,6 +121,27 @@ impl<T: Write> OutputFormatter for JsonFormatter<T> {
),
TestResult::TrIgnored => {
#[cfg(not(bootstrap))]
if let Some(msg) = desc.ignore_message {
self.write_event(
"test",
desc.name.as_slice(),
"ignored",
exec_time,
stdout,
Some(&*format!(r#""message": "{}""#, EscapedString(msg))),
)
} else {
self.write_event(
"test",
desc.name.as_slice(),
"ignored",
exec_time,
stdout,
None,
)
}
#[cfg(bootstrap)]
self.write_event("test", desc.name.as_slice(), "ignored", exec_time, stdout, None)
}

19
library/test/src/formatters/pretty.rs
View File

@ -45,8 +45,12 @@ impl<T: Write> PrettyFormatter<T> {
self.write_short_result("FAILED", term::color::RED)
}
pub fn write_ignored(&mut self) -> io::Result<()> {
self.write_short_result("ignored", term::color::YELLOW)
pub fn write_ignored(&mut self, may_message: Option<&'static str>) -> io::Result<()> {
if let Some(message) = may_message {
self.write_short_result(&format!("ignored, {}", message), term::color::YELLOW)
} else {
self.write_short_result("ignored", term::color::YELLOW)
}
}
pub fn write_time_failed(&mut self) -> io::Result<()> {
@ -59,10 +63,10 @@ impl<T: Write> PrettyFormatter<T> {
pub fn write_short_result(
&mut self,
result: &str,
result: impl AsRef<str>,
color: term::color::Color,
) -> io::Result<()> {
self.write_pretty(result, color)
self.write_pretty(result.as_ref(), color)
}
pub fn write_pretty(&mut self, word: &str, color: term::color::Color) -> io::Result<()> {
@ -214,7 +218,12 @@ impl<T: Write> OutputFormatter for PrettyFormatter<T> {
match *result {
TestResult::TrOk => self.write_ok()?,
TestResult::TrFailed | TestResult::TrFailedMsg(_) => self.write_failed()?,
TestResult::TrIgnored => self.write_ignored()?,
TestResult::TrIgnored => {
#[cfg(not(bootstrap))]
self.write_ignored(desc.ignore_message)?;
#[cfg(bootstrap)]
self.write_ignored(None)?;
}
TestResult::TrBench(ref bs) => {
self.write_bench()?;
self.write_plain(&format!(": {}", fmt_bench_samples(bs)))?;