@matheusbsbs / matheus-bagliano / commits / db7ed0f20c

t/perf: correctly align non-ASCII descriptions in output

Change the test descriptions from being treated as binary blobs by perl to being treated as UTF-8. This ensures that e.g. a test description like "æ" is counted as 1 character, not 2. I have WIP performance tests for non-ASCII grep patterns on another topic that are affected by this. Now instead of: $ ./run p0000-perf-lib-sanity.sh [...] 0000.4: export a weird var 0.00(0.00+0.00) 0000.5: éḿíẗ ńöń-ÁŚĆÍÍ ćḧáŕáćẗéŕś 0.00(0.00+0.00) 0000.7: important variables available in subshells 0.00(0.00+0.00) [...] We emit: [...] 0000.4: export a weird var 0.00(0.00+0.00) 0000.5: éḿíẗ ńöń-ÁŚĆÍÍ ćḧáŕáćẗéŕś 0.00(0.00+0.00) 0000.7: important variables available in subshells 0.00(0.00+0.00) [...] Fixes code originally added in 342e9ef2d9 ("Introduce a performance testing framework", 2012-02-17). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Apr 21, 2017 at 19:44 UTC db7ed0f20c2929f3054c96497dd1cf482a198c7b

2 files changed +5

t/perf/aggregate.perl

@@ -88,6 +88,7 @@ for my $t (@tests) {

88 sub read_descr {

89 my $name = shift;

90 open my $fh, "<", $name or return "<error reading description>";

91 + binmode $fh, ":utf8" or die "PANIC on binmode: $!";

92 my $line = <$fh>;

93 close $fh or die "cannot close $name";

94 chomp $line;

@@ -147,6 +148,8 @@ for my $t (@subtests) {

148 my $totalwidth = 3*@dirs+$descrlen;

149 $totalwidth += $_ for (@colwidth);

150

151 +binmode STDOUT, ":utf8" or die "PANIC on binmode: $!";

152 +

153 printf "%-${descrlen}s", "Test";

154 for my $i (0..$#dirs) {

155 my $d = $dirs[$i];

t/perf/p0000-perf-lib-sanity.sh

@@ -33,6 +33,8 @@ test_perf 'export a weird var' '

33 test_export bar

34 '

36 +test_perf 'éḿíẗ ńöń-ÁŚĆÍÍ ćḧáŕáćẗéŕś' 'true'

37 +

38 test_expect_success 'test_export works with weird vars' '

39 echo "$bar" &&

40 test "$bar" = "weird # variable"