Skip to content

Commit 8b62582

Browse files
committed
---
yaml --- r: 83099 b: refs/heads/auto c: 602b3cd h: refs/heads/master i: 83097: c420aa4 83095: 95c1641 v: v3
1 parent f4acb95 commit 8b62582

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: c56bf67150ecd87b0467bd4b2bd6099c83eff65e
16+
refs/heads/auto: 602b3cd56cb57782ef5772b3b737def4d9f3fd05
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libextra/test.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -640,11 +640,20 @@ pub fn run_tests_console(opts: &TestOpts,
640640
}
641641
}
642642
let st = @mut ConsoleTestState::new(opts);
643-
match tests.iter().map(|t| t.desc.name.to_str().len()).max() {
644-
Some(l) => { st.max_name_len = l; },
643+
fn len_if_padded(t: &TestDescAndFn) -> uint {
644+
match t.testfn.padding() {
645+
PadNone => 0u,
646+
PadOnLeft | PadOnRight => t.desc.name.to_str().len(),
647+
}
648+
}
649+
match tests.iter().max_by(|t|len_if_padded(*t)) {
650+
Some(t) => {
651+
let n = t.desc.name.to_str();
652+
debug2!("Setting max_name_len from: {}", n);
653+
st.max_name_len = n.len();
654+
},
645655
None => {}
646656
}
647-
debug2!("tests max_name_len: {}", st.max_name_len);
648657
run_tests(opts, tests, |x| callback(&x, st));
649658
match opts.save_metrics {
650659
None => (),

0 commit comments

Comments
 (0)