kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

perf/run: update get_var_from_env_or_config() for subsections 

As we will set some config options in subsections, let's
teach get_var_from_env_or_config() to get the config options
from the subsections if they are set there.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Christian Couder 2017-09-23 19:55:56 +00:00 committed by Junio C Hamano
parent 2638441e07
commit 9ba95ed23c
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
t/perf/run
View File

@ -102,29 +102,37 @@ get_subsections () {


get_var_from_env_or_config () { get_var_from_env_or_config () {
env_var="$1" env_var="$1"
conf_var="$2" conf_sec="$2"
# $3 can be set to a default value conf_var="$3"
# $4 can be set to a default value


# Do nothing if the env variable is already set # Do nothing if the env variable is already set
eval "test -z \"\${$env_var+x}\"" || return eval "test -z \"\${$env_var+x}\"" || return


test -z "$GIT_PERF_CONFIG_FILE" && return

# Check if the variable is in the config file # Check if the variable is in the config file
test -n "$GIT_PERF_CONFIG_FILE" && if test -n "$GIT_PERF_SUBSECTION"
conf_value=$(git config -f "$GIT_PERF_CONFIG_FILE" "$conf_var") && then
eval "$env_var=\"$conf_value\"" || { var="$conf_sec.$GIT_PERF_SUBSECTION.$conf_var"
test -n "${3+x}" && conf_value=$(git config -f "$GIT_PERF_CONFIG_FILE" "$var") &&
eval "$env_var=\"$3\"" eval "$env_var=\"$conf_value\"" && return
} fi
var="$conf_sec.$conf_var"
conf_value=$(git config -f "$GIT_PERF_CONFIG_FILE" "$var") &&
eval "$env_var=\"$conf_value\"" && return

test -n "${4+x}" && eval "$env_var=\"$4\""
} }


get_var_from_env_or_config "GIT_PERF_REPEAT_COUNT" "perf.repeatCount" 3 get_var_from_env_or_config "GIT_PERF_REPEAT_COUNT" "perf" "repeatCount" 3
export GIT_PERF_REPEAT_COUNT export GIT_PERF_REPEAT_COUNT


get_var_from_env_or_config "GIT_PERF_DIRS_OR_REVS" "perf.dirsOrRevs" get_var_from_env_or_config "GIT_PERF_DIRS_OR_REVS" "perf" "dirsOrRevs"
set -- $GIT_PERF_DIRS_OR_REVS "$@" set -- $GIT_PERF_DIRS_OR_REVS "$@"


get_var_from_env_or_config "GIT_PERF_MAKE_COMMAND" "perf.makeCommand" get_var_from_env_or_config "GIT_PERF_MAKE_COMMAND" "perf" "makeCommand"
get_var_from_env_or_config "GIT_PERF_MAKE_OPTS" "perf.makeOpts" get_var_from_env_or_config "GIT_PERF_MAKE_OPTS" "perf" "makeOpts"


GIT_PERF_AGGREGATING_LATER=t GIT_PERF_AGGREGATING_LATER=t
export GIT_PERF_AGGREGATING_LATER export GIT_PERF_AGGREGATING_LATER