Re: [PATCH] perf-lib: remove old result files before running tests
From: Thomas Gummerer <hidden>
Date: 2019-11-22 08:12:21
On 11/21, Jeff King wrote:
But I wonder if it would be simpler to just always use the same file for the test result, overwriting it each time, and let the reader figure out the type. The aggregate script's get_times() already uses a regex to distinguish the two. That's enough for the two types we have, and we could later add a header line if it becomes necessary. Something like the patch below. That removes any confusion about cruft files being left behind, or which file should be preferred, etc.
Yeah, I like what you have below much more than what I had, thanks!
The diff would be even smaller if we just kept calling it "times", but that's probably unnecessarily confusing.
Yup, I prefer a more readable end result to a small diff :)
quoted hunk ↗ jump to hunk
-Peff ---diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl index 66554d2161..112fc23dbe 100755 --- a/t/perf/aggregate.perl +++ b/t/perf/aggregate.perl@@ -219,13 +219,7 @@ sub print_default_results { for my $i (0..$#dirs) { my $d = $dirs[$i]; my $base = "$resultsdir/$prefixes{$d}$t"; - $times{$prefixes{$d}.$t} = []; - foreach my $type (qw(times size)) { - if (-e "$base.$type") { - $times{$prefixes{$d}.$t} = [get_times("$base.$type")]; - last; - } - } + $times{$prefixes{$d}.$t} = [get_times("$base.result")]; my ($r,$u,$s) = @{$times{$prefixes{$d}.$t}}; my $w = length format_times($r,$u,$s,$firstr); $colwidth[$i] = $w if $w > $colwidth[$i];@@ -267,7 +261,7 @@ sub print_sorted_results { my ($prevr, $prevu, $prevs, $prevrev); for my $i (0..$#dirs) { my $d = $dirs[$i]; - my ($r, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.times"); + my ($r, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.result"); if ($i > 0 and defined $r and defined $prevr and $prevr > 0) { my $percent = 100.0 * ($r - $prevr) / $prevr; push @evolutions, { "percent" => $percent,@@ -327,7 +321,7 @@ sub print_codespeed_results { my $commitid = $prefixes{$d}; $commitid =~ s/^build_//; $commitid =~ s/\.$//; - my ($result_value, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.times"); + my ($result_value, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.result"); my %vals = ( "commitid" => $commitid,diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index b58a43ea43..13e389367a 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh@@ -214,7 +214,7 @@ test_perf_ () { else test_ok_ "$1" fi - "$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".times + "$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".result } test_perf () {@@ -223,7 +223,7 @@ test_perf () { test_size_ () { say >&3 "running: $2" - if test_eval_ "$2" 3>"$base".size; then + if test_eval_ "$2" 3>"$base".result; then test_ok_ "$1" else test_failure_ "$@"