should_panic: bool, no_run: bool, should_ignore: bool,
as_test_harness: bool, compile_fail: bool, error_codes: Vec<String>,
line: usize, filename: String) {
- let name = format!("{} - line {}", filename, line);
- self.cnt += 1;
+ let name = if self.use_headers {
+ let s = self.current_header.as_ref().map(|s| &**s).unwrap_or("");
+ format!("{} - {} (line {})", filename, s, line)
+ } else {
+ format!("{} - {} (line {})", filename, self.names.join("::"), line)
+ };
let cfgs = self.cfgs.clone();
let libs = self.libs.clone();
let externs = self.externs.clone();
$(RUSTC) --cfg 'feature="bar"' --crate-type lib foo.rs
$(HOST_RPATH_ENV) '$(RUSTDOC)' --test --cfg 'feature="bar"' \
-L $(TMPDIR) foo.rs |\
- grep -q 'foo.rs - line 11 ... ok'
+ grep -q 'foo.rs - foo (line 11) ... ok'
for _ in res.stdout.split("\n")
.filter(|s| s.starts_with("test "))
.inspect(|s| {
- let tmp: Vec<&str> = s.split(" - line ").collect();
+ let tmp: Vec<&str> = s.split(" - ").collect();
if tmp.len() == 2 {
let path = tmp[0].rsplit("test ").next().unwrap();
if let Some(ref mut v) = files.get_mut(path) {
tested += 1;
- let line = tmp[1].split(" ...")
- .next()
- .unwrap_or("0")
- .parse()
- .unwrap_or(0);
+ let mut iter = tmp[1].split("(line ");
+ iter.next();
+ let line = iter.next()
+ .unwrap_or(")")
+ .split(")")
+ .next()
+ .unwrap_or("0")
+ .parse()
+ .unwrap_or(0);
if let Ok(pos) = v.binary_search(&line) {
v.remove(pos);
} else {