Merge branch 'nd/status-refresh-progress'

diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index b50211b2591d19904fa3c995b01aea2121db476a..11d1922cf58edb78b8e311e3fa041ae54b625e74 100644 (file)
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -56,12 +56,10 @@ MODERN_GIT=$GIT_BUILD_DIR/bin-wrappers/git
 export MODERN_GIT
 
 perf_results_dir=$TEST_OUTPUT_DIRECTORY/test-results
+test -n "$GIT_PERF_SUBSECTION" && perf_results_dir="$perf_results_dir/$GIT_PERF_SUBSECTION"
 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
@@ -181,8 +179,8 @@ exit $ret' >&3 2>&4
        return "$eval_ret"
 }
 
-
-test_perf () {
+test_wrapper_ () {
+       test_wrapper_func_=$1; shift
        test_start_
        test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
        test "$#" = 2 ||
@@ -193,35 +191,57 @@ test_perf () {
                base=$(basename "$0" .sh)
                echo "$test_count" >>"$perf_results_dir"/$base.subtests
                echo "$1" >"$perf_results_dir"/$base.$test_count.descr
-               if test -z "$verbose"; then
-                       printf "%s" "perf $test_count - $1:"
-               else
-                       echo "perf $test_count - $1:"
-               fi
-               for i in $(test_seq 1 $GIT_PERF_REPEAT_COUNT); do
-                       say >&3 "running: $2"
-                       if test_run_perf_ "$2"
-                       then
-                               if test -z "$verbose"; then
-                                       printf " %s" "$i"
-                               else
-                                       echo "* timing run $i/$GIT_PERF_REPEAT_COUNT:"
-                               fi
+               base="$perf_results_dir"/"$perf_results_prefix$(basename "$0" .sh)"."$test_count"
+               "$test_wrapper_func_" "$@"
+       fi
+
+       test_finish_
+}
+
+test_perf_ () {
+       if test -z "$verbose"; then
+               printf "%s" "perf $test_count - $1:"
+       else
+               echo "perf $test_count - $1:"
+       fi
+       for i in $(test_seq 1 $GIT_PERF_REPEAT_COUNT); do
+               say >&3 "running: $2"
+               if test_run_perf_ "$2"
+               then
+                       if test -z "$verbose"; then
+                               printf " %s" "$i"
                        else
-                               test -z "$verbose" && echo
-                               test_failure_ "$@"
-                               break
+                               echo "* timing run $i/$GIT_PERF_REPEAT_COUNT:"
                        fi
-               done
-               if test -z "$verbose"; then
-                       echo " ok"
                else
-                       test_ok_ "$1"
+                       test -z "$verbose" && echo
+                       test_failure_ "$@"
+                       break
                fi
-               base="$perf_results_dir"/"$perf_results_prefix$(basename "$0" .sh)"."$test_count"
-               "$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".times
+       done
+       if test -z "$verbose"; then
+               echo " ok"
+       else
+               test_ok_ "$1"
        fi
-       test_finish_
+       "$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".times
+}
+
+test_perf () {
+       test_wrapper_ test_perf_ "$@"
+}
+
+test_size_ () {
+       say >&3 "running: $2"
+       if test_eval_ "$2" 3>"$base".size; then
+               test_ok_ "$1"
+       else
+               test_failure_ "$@"
+       fi
+}
+
+test_size () {
+       test_wrapper_ test_size_ "$@"
 }
 
 # We extend test_done to print timings at the end (./run disables this