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>maint
parent
df0f502195
commit
fab80ee79d
|
@ -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) ||
|
||||
|
|
Loading…
Reference in New Issue