Skip to content

Commit 7cb0d37

Browse files
committed
Merge branch 'tg/perf-remove-stale-result'
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
2 parents 403ac13 + b8dcc45 commit 7cb0d37

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

t/perf/aggregate.perl

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,7 @@ sub print_default_results {
219219
for my $i (0..$#dirs) {
220220
my $d = $dirs[$i];
221221
my $base = "$resultsdir/$prefixes{$d}$t";
222-
$times{$prefixes{$d}.$t} = [];
223-
foreach my $type (qw(times size)) {
224-
if (-e "$base.$type") {
225-
$times{$prefixes{$d}.$t} = [get_times("$base.$type")];
226-
last;
227-
}
228-
}
222+
$times{$prefixes{$d}.$t} = [get_times("$base.result")];
229223
my ($r,$u,$s) = @{$times{$prefixes{$d}.$t}};
230224
my $w = length format_times($r,$u,$s,$firstr);
231225
$colwidth[$i] = $w if $w > $colwidth[$i];
@@ -267,7 +261,7 @@ sub print_sorted_results {
267261
my ($prevr, $prevu, $prevs, $prevrev);
268262
for my $i (0..$#dirs) {
269263
my $d = $dirs[$i];
270-
my ($r, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.times");
264+
my ($r, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.result");
271265
if ($i > 0 and defined $r and defined $prevr and $prevr > 0) {
272266
my $percent = 100.0 * ($r - $prevr) / $prevr;
273267
push @evolutions, { "percent" => $percent,
@@ -327,7 +321,7 @@ sub print_codespeed_results {
327321
my $commitid = $prefixes{$d};
328322
$commitid =~ s/^build_//;
329323
$commitid =~ s/\.$//;
330-
my ($result_value, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.times");
324+
my ($result_value, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.result");
331325

332326
my %vals = (
333327
"commitid" => $commitid,

t/perf/perf-lib.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ test_perf_ () {
214214
else
215215
test_ok_ "$1"
216216
fi
217-
"$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".times
217+
"$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".result
218218
}
219219

220220
test_perf () {
@@ -223,7 +223,7 @@ test_perf () {
223223

224224
test_size_ () {
225225
say >&3 "running: $2"
226-
if test_eval_ "$2" 3>"$base".size; then
226+
if test_eval_ "$2" 3>"$base".result; then
227227
test_ok_ "$1"
228228
else
229229
test_failure_ "$@"

0 commit comments

Comments
 (0)