diff options
author | Christian Couder <chriscool@tuxfamily.org> | 2017-09-23 19:55:56 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-09-24 16:58:34 +0900 |
commit | afda85c25d097e04d6c054817964cc8bba3ff0fa (patch) | |
tree | df44ea406ce809b3709ee41a91a0723515cf36b8 /t/perf | |
parent | perf/run: update get_var_from_env_or_config() for subsections (diff) | |
download | tgif-afda85c25d097e04d6c054817964cc8bba3ff0fa.tar.xz |
perf/run: add run_subsection()
Let's actually use the subsections we find in the config file
to run the perf tests separately for each subsection.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/perf')
-rwxr-xr-x | t/perf/run | 47 |
1 files changed, 35 insertions, 12 deletions
diff --git a/t/perf/run b/t/perf/run index bd39398b9c..cb8687bfcf 100755 --- a/t/perf/run +++ b/t/perf/run @@ -125,23 +125,46 @@ get_var_from_env_or_config () { test -n "${4+x}" && eval "$env_var=\"$4\"" } -get_var_from_env_or_config "GIT_PERF_REPEAT_COUNT" "perf" "repeatCount" 3 -export GIT_PERF_REPEAT_COUNT +run_subsection () { + get_var_from_env_or_config "GIT_PERF_REPEAT_COUNT" "perf" "repeatCount" 3 + export GIT_PERF_REPEAT_COUNT -get_var_from_env_or_config "GIT_PERF_DIRS_OR_REVS" "perf" "dirsOrRevs" -set -- $GIT_PERF_DIRS_OR_REVS "$@" + get_var_from_env_or_config "GIT_PERF_DIRS_OR_REVS" "perf" "dirsOrRevs" + 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_OPTS" "perf" "makeOpts" + get_var_from_env_or_config "GIT_PERF_MAKE_COMMAND" "perf" "makeCommand" + get_var_from_env_or_config "GIT_PERF_MAKE_OPTS" "perf" "makeOpts" -GIT_PERF_AGGREGATING_LATER=t -export GIT_PERF_AGGREGATING_LATER + GIT_PERF_AGGREGATING_LATER=t + export GIT_PERF_AGGREGATING_LATER + + if test $# = 0 -o "$1" = -- -o -f "$1"; then + set -- . "$@" + fi + + run_dirs "$@" + ./aggregate.perl "$@" +} cd "$(dirname $0)" . ../../GIT-BUILD-OPTIONS -if test $# = 0 -o "$1" = -- -o -f "$1"; then - set -- . "$@" +mkdir -p test-results +get_subsections "perf" >test-results/run_subsections.names + +if test $(wc -l <test-results/run_subsections.names) -eq 0 +then + ( + run_subsection "$@" + ) +else + while read -r subsec + do + ( + GIT_PERF_SUBSECTION="$subsec" + export GIT_PERF_SUBSECTION + echo "======== Run for subsection '$GIT_PERF_SUBSECTION' ========" + run_subsection "$@" + ) + done <test-results/run_subsections.names fi -run_dirs "$@" -./aggregate.perl "$@" |