[PATCH 1/2] perf-lib: split starting the test from the execution
Separate the execution part to make future changes to the tests simpler.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
---
t/perf/perf-lib.sh | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index c61d535..95e483c 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -148,13 +148,8 @@ exit $ret' >&3 2>&4
return "$eval_ret"
}
-
-test_perf () {
+perf_test_ () {
test_start_
- test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
- test "$#" = 2 ||
- error "bug in the test script: not 2 or 3 parameters to test-expect-success"
- export test_prereq
if ! test_skip "$@"
then
base=$(basename "$0" .sh)
@@ -191,6 +186,14 @@ test_perf () {
test_finish_
}
+test_perf () {
+ test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
+ test "$#" = 2 ||
+ error "bug in the test script: not 2 or 3 parameters to test-expect-success"
+ export test_prereq
+ perf_test_ "$1" "$2"
+}
+
# We extend test_done to print timings at the end (./run disables this
# and does it after running everything)
test_at_end_hook_ () {
--
1.8.3.4.1238.ga800761
Thomas Gummerer <t.gummerer@gmail.com>