undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf/run: add get_var_from_env_or_config()

Browse Source 
Add get_var_from_env_or_config() to easily set variables
from a config file if they are defined there and not already set.

This can also set them to a default value if one is provided.

As an example, use this function to set GIT_PERF_REPEAT_COUNT
from the perf.repeatCount config option or from the default
value.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2017-09-23 19:55:56 +00:00 committed by Junio C Hamano
parent e3d5e1207e
commit e6b71539de
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
t/perf/perf-lib.sh
View File

@ -59,9 +59,6 @@ perf_results_dir=$TEST_OUTPUT_DIRECTORY/test-results
mkdir -p "$perf_results_dir"
rm -f "$perf_results_dir"/$(basename "$0" .sh).subtests
if test -z "$GIT_PERF_REPEAT_COUNT"; then
GIT_PERF_REPEAT_COUNT=3
fi
die_if_build_dir_not_repo () {
if ! ( cd "$TEST_DIRECTORY/.." &&
git rev-parse --build-dir >/dev/null 2>&1 ); then

21
t/perf/run
View File

@ -34,6 +34,7 @@ unpack_git_rev () {
(cd "$(git rev-parse --show-cdup)" && git archive --format=tar $rev) |
(cd build/$rev && tar x)
}
build_git_rev () {
rev=$1
for config in config.mak config.mak.autogen config.status
@ -92,6 +93,26 @@ run_dirs () {
done
}
get_var_from_env_or_config () {
env_var="$1"
conf_var="$2"
# $3 can be set to a default value
# Do nothing if the env variable is already set
eval "test -z \"\${$env_var+x}\"" || return
# Check if the variable is in the config file
test -n "$GIT_PERF_CONFIG_FILE" &&
conf_value=$(git config -f "$GIT_PERF_CONFIG_FILE" "$conf_var") &&
eval "$env_var=\"$conf_value\"" || {
test -n "${3+x}" &&
eval "$env_var=\"$3\""
}
}
get_var_from_env_or_config "GIT_PERF_REPEAT_COUNT" "perf.repeatCount" 3
export GIT_PERF_REPEAT_COUNT
GIT_PERF_AGGREGATING_LATER=t
export GIT_PERF_AGGREGATING_LATER