File tree Expand file tree Collapse file tree 2 files changed +13
-4
lines changed Expand file tree Collapse file tree 2 files changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
8
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9
- refs/heads/dist-snap: c56bf67150ecd87b0467bd4b2bd6099c83eff65e
9
+ refs/heads/dist-snap: 602b3cd56cb57782ef5772b3b737def4d9f3fd05
10
10
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
11
11
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
12
12
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
Original file line number Diff line number Diff line change @@ -640,11 +640,20 @@ pub fn run_tests_console(opts: &TestOpts,
640
640
}
641
641
}
642
642
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 => 0 u,
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
+ } ,
645
655
None => { }
646
656
}
647
- debug2 ! ( "tests max_name_len: {}" , st. max_name_len) ;
648
657
run_tests ( opts, tests, |x| callback ( & x, st) ) ;
649
658
match opts. save_metrics {
650
659
None => ( ) ,
You can’t perform that action at this time.
0 commit comments