mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf tests: add "bindir" prefix to git tree test results

Browse Source 
Change the output file names in test-results/ to be
"test-results/bindir_<munged dir>" rather than just
"test-results/<munged dir>".

This is for consistency with the "build_" directories we have for
built revisions, i.e. "test-results/build_<SHA-1>".

There's no user-visible functional changes here, it just makes it
easier to see at a glance what "test-results" files are of what "type"
as they're all explicitly grouped together now, and to grep this code
to find both the run_dirs_helper() implementation and its
corresponding aggregate.perl code.

Note that we already guarantee that the rest of the
PERF_RESULTS_PREFIX is an absolute path, and since it'll start with
e.g. "/" which we munge to "_" we'll up with a readable string like
"bindir_home_avar[...]".

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2019-05-07 12:54:33 +02:00
committed by Junio C Hamano
parent df0f502195
commit fab80ee79d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/perf/aggregate.perl
View File

@ -100,6 +100,7 @@ usage() unless $rc;
while (scalar @ARGV) { while (scalar @ARGV) {
my $arg = $ARGV[0]; my $arg = $ARGV[0];
my $dir; my $dir;
my $prefix = '';
last if -f $arg or $arg eq "--"; last if -f $arg or $arg eq "--";
if (! -d $arg) { if (! -d $arg) {
my $rev = Git::command_oneline(qw(rev-parse --verify), $arg); my $rev = Git::command_oneline(qw(rev-parse --verify), $arg);
@ -109,10 +110,11 @@ while (scalar @ARGV) {
} else { } else {
$dir = realpath($arg); $dir = realpath($arg);
$dirnames{$dir} = $dir; $dirnames{$dir} = $dir;
$prefix .= 'bindir';
} }
push @dirs, $dir; push @dirs, $dir;
$dirnames{$dir} ||= $arg; $dirnames{$dir} ||= $arg;
my $prefix = $dir; $prefix .= $dir;
$prefix =~ tr/^a-zA-Z0-9/_/c; $prefix =~ tr/^a-zA-Z0-9/_/c;
$prefixes{$dir} = $prefix . '.'; $prefixes{$dir} = $prefix . '.';
shift @ARGV; shift @ARGV;

2
t/perf/run
View File

@ -102,7 +102,7 @@ run_dirs_helper () {
unset GIT_TEST_INSTALLED unset GIT_TEST_INSTALLED
elif test -d "$mydir" elif test -d "$mydir"
then then
PERF_RESULTS_PREFIX=$(cd $mydir && printf "%s" "$(pwd)" | tr -c "[a-zA-Z0-9]" "_"). PERF_RESULTS_PREFIX=bindir$(cd $mydir && printf "%s" "$(pwd)" | tr -c "[a-zA-Z0-9]" "_").
set_git_test_installed "$mydir" set_git_test_installed "$mydir"
else else
rev=$(git rev-parse --verify "$mydir" 2>/dev/null) || rev=$(git rev-parse --verify "$mydir" 2>/dev/null) ||