perf/run: add get_var_from_env_or_config()

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>

diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index b50211b2591d19904fa3c995b01aea2121db476a..2f88fc12a9b5c6ba5973b584a12b33a545c59bff 100644 (file)
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -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
 
 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
 die_if_build_dir_not_repo () {
        if ! ( cd "$TEST_DIRECTORY/.." &&
                    git rev-parse --build-dir >/dev/null 2>&1 ); then

diff --git a/t/perf/run b/t/perf/run
index 1e7c2a59e45dcfbd8f84fb7e29cf8b0448aa73d2..41580ac6df44aaef85701fb07091c7f8ba8774b6 100755 (executable)
--- a/t/perf/run
+++ b/t/perf/run
@@ -34,6 +34,7 @@ unpack_git_rev () {
        (cd "$(git rev-parse --show-cdup)" && git archive --format=tar $rev) |
        (cd build/$rev && tar x)
 }
        (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
 build_git_rev () {
        rev=$1
        for config in config.mak config.mak.autogen config.status


@@ -92,6 +93,26 @@ run_dirs () {
        done
 }
 
        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
 
 GIT_PERF_AGGREGATING_LATER=t
 export GIT_PERF_AGGREGATING_LATER