Skip to content

Commit 7014ad3

Browse files
committed
remove mode for run and ignore tests
1 parent da4dba8 commit 7014ad3

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

test/src/formatters/pretty.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,12 @@ impl<T: Write> PrettyFormatter<T> {
169169

170170
fn write_test_name(&mut self, desc: &TestDesc) -> io::Result<()> {
171171
let name = desc.padded_name(self.max_name_len, desc.name.padding());
172-
self.write_plain(&format!("test {} - {} ... ", name, desc.test_mode()))?;
172+
let test_mode = desc.test_mode();
173+
if test_mode == "" {
174+
self.write_plain(&format!("test {} ... ", name))?;
175+
} else {
176+
self.write_plain(&format!("test {} - {} ... ", name, test_mode))?;
177+
}
173178

174179
Ok(())
175180
}

test/src/formatters/terse.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,12 @@ impl<T: Write> TerseFormatter<T> {
158158

159159
fn write_test_name(&mut self, desc: &TestDesc) -> io::Result<()> {
160160
let name = desc.padded_name(self.max_name_len, desc.name.padding());
161-
self.write_plain(&format!("test {} - {} ... ", name, desc.test_mode()))?;
161+
let test_mode = desc.test_mode();
162+
if test_mode == "" {
163+
self.write_plain(&format!("test {} ... ", name))?;
164+
} else {
165+
self.write_plain(&format!("test {} - {} ... ", name, test_mode))?;
166+
}
162167

163168
Ok(())
164169
}

test/src/types.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ impl TestDesc {
148148
#[cfg(not(bootstrap))]
149149
pub fn test_mode(&self) -> &'static str {
150150
if self.ignore {
151-
return &"ignore";
151+
return &"";
152152
}
153153
match self.should_panic {
154154
options::ShouldPanic::Yes | options::ShouldPanic::YesWithMessage(_) => {
@@ -165,7 +165,7 @@ impl TestDesc {
165165
if self.no_run {
166166
return &"compile";
167167
}
168-
&"run"
168+
&""
169169
}
170170

171171
#[cfg(bootstrap)]

0 commit comments

Comments
 (0)