diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2019-05-07 10:54:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-08 02:00:28 (GMT) |
| commit | fab80ee79ddf59a5d00812005bef0fa3acf5b6bf (patch) | |
| tree | b6a8154e66fb83bc855498123bb21abf666ead9e | |
| parent | df0f5021951bd0ae5e7db0d89fd7e5c141c334be (diff) | |
| download | git-fab80ee79ddf59a5d00812005bef0fa3acf5b6bf.zip git-fab80ee79ddf59a5d00812005bef0fa3acf5b6bf.tar.gz git-fab80ee79ddf59a5d00812005bef0fa3acf5b6bf.tar.bz2 | |
perf tests: add "bindir" prefix to git tree test results
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>
| -rwxr-xr-x | t/perf/aggregate.perl | 4 | ||||
| -rwxr-xr-x | t/perf/run | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl index c8f4a78..b951747 100755 --- a/t/perf/aggregate.perl +++ b/t/perf/aggregate.perl @@ -100,6 +100,7 @@ usage() unless $rc; while (scalar @ARGV) { my $arg = $ARGV[0]; my $dir; + my $prefix = ''; last if -f $arg or $arg eq "--"; if (! -d $arg) { my $rev = Git::command_oneline(qw(rev-parse --verify), $arg); @@ -109,10 +110,11 @@ while (scalar @ARGV) { } else { $dir = realpath($arg); $dirnames{$dir} = $dir; + $prefix .= 'bindir'; } push @dirs, $dir; $dirnames{$dir} ||= $arg; - my $prefix = $dir; + $prefix .= $dir; $prefix =~ tr/^a-zA-Z0-9/_/c; $prefixes{$dir} = $prefix . '.'; shift @ARGV; @@ -102,7 +102,7 @@ run_dirs_helper () { unset GIT_TEST_INSTALLED elif test -d "$mydir" 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" else rev=$(git rev-parse --verify "$mydir" 2>/dev/null) || |