summaryrefslogtreecommitdiff
path: root/t/perf
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-13 14:50:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-13 14:50:34 (GMT)
commit6cfa633565cc16f77d6e6d56fa608680828105a1 (patch)
tree4429f943b60568c8acb109515836a01abe764437 /t/perf
parent7a188da354b0dd2525d8534a50e7684efbcf7039 (diff)
parentf2e875d6df20a71c8d5b73e16e37763dcc8264b4 (diff)
downloadgit-6cfa633565cc16f77d6e6d56fa608680828105a1.zip
git-6cfa633565cc16f77d6e6d56fa608680828105a1.tar.gz
git-6cfa633565cc16f77d6e6d56fa608680828105a1.tar.bz2
Merge branch 'jk/perf-aggregate-wo-libjson'
The script to aggregate perf result unconditionally depended on libjson-perl even though it did not have to, which has been corrected. * jk/perf-aggregate-wo-libjson: t/perf: depend on perl JSON only when using --codespeed
Diffstat (limited to 't/perf')
-rwxr-xr-xt/perf/aggregate.perl4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl
index 494907a..76dd48f 100755
--- a/t/perf/aggregate.perl
+++ b/t/perf/aggregate.perl
@@ -3,7 +3,6 @@
use lib '../../perl/build/lib';
use strict;
use warnings;
-use JSON;
use Getopt::Long;
use Git;
@@ -342,7 +341,8 @@ sub print_codespeed_results {
}
}
- print to_json(\@data, {utf8 => 1, pretty => 1, canonical => 1}), "\n";
+ require JSON;
+ print JSON::to_json(\@data, {utf8 => 1, pretty => 1, canonical => 1}), "\n";
}
binmode STDOUT, ":utf8" or die "PANIC on binmode: $!";