undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tg/perf-remove-stale-result'

Browse Source 
PerfTest fix to avoid stale result mixed up with the latest round
of test results.

* tg/perf-remove-stale-result:
  perf-lib: use a single filename for all measurement types
This commit is contained in:
Junio C Hamano 2019-12-06 15:09:23 -08:00
commit 7cb0d37f6d
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
t/perf/aggregate.perl
View File

@ -219,13 +219,7 @@ sub print_default_results {
for my $i (0..$#dirs) { for my $i (0..$#dirs) {
my $d = $dirs[$i]; my $d = $dirs[$i];
my $base = "$resultsdir/$prefixes{$d}$t"; my $base = "$resultsdir/$prefixes{$d}$t";
$times{$prefixes{$d}.$t} = []; $times{$prefixes{$d}.$t} = [get_times("$base.result")];
foreach my $type (qw(times size)) {
if (-e "$base.$type") {
$times{$prefixes{$d}.$t} = [get_times("$base.$type")];
last;
}
}
my ($r,$u,$s) = @{$times{$prefixes{$d}.$t}}; my ($r,$u,$s) = @{$times{$prefixes{$d}.$t}};
my $w = length format_times($r,$u,$s,$firstr); my $w = length format_times($r,$u,$s,$firstr);
$colwidth[$i] = $w if $w > $colwidth[$i]; $colwidth[$i] = $w if $w > $colwidth[$i];
@ -267,7 +261,7 @@ sub print_sorted_results {
my ($prevr, $prevu, $prevs, $prevrev); my ($prevr, $prevu, $prevs, $prevrev);
for my $i (0..$#dirs) { for my $i (0..$#dirs) {
my $d = $dirs[$i]; 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) { if ($i > 0 and defined $r and defined $prevr and $prevr > 0) {
my $percent = 100.0 * ($r - $prevr) / $prevr; my $percent = 100.0 * ($r - $prevr) / $prevr;
push @evolutions, { "percent" => $percent, push @evolutions, { "percent" => $percent,
@ -327,7 +321,7 @@ sub print_codespeed_results {
my $commitid = $prefixes{$d}; my $commitid = $prefixes{$d};
$commitid =~ s/^build_//; $commitid =~ s/^build_//;
$commitid =~ s/\.$//; $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 = ( my %vals = (
"commitid" => $commitid, "commitid" => $commitid,

4
t/perf/perf-lib.sh
View File

@ -214,7 +214,7 @@ test_perf_ () {
else else
test_ok_ "$1" test_ok_ "$1"
fi fi
"$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".times "$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".result
} }
test_perf () { test_perf () {
@ -223,7 +223,7 @@ test_perf () {
test_size_ () { test_size_ () {
say >&3 "running: $2" say >&3 "running: $2"
if test_eval_ "$2" 3>"$base".size; then if test_eval_ "$2" 3>"$base".result; then
test_ok_ "$1" test_ok_ "$1"
else else
test_failure_ "$@" test_failure_ "$@"