threads / patch / 34306

patchperf-lib: fix start/stop of perf tests

Subject: [PATCH] perf-lib: fix start/stop of perf tests

## tl;dr

3 messages between Jun 29, 2013 and Jun 30, 2013. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Thomas Gummerer· Jun 29, 2013, 13:38 UTC · lore

ae75342 test-lib: rearrange start/end of test_expect_* and test_skip changed the way tests are started/stopped, but did not update the perf tests. They were therefore giving the wrong output, because of the wrong test count. Fix this by starting and stopping the tests correctly.

Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
---
 t/perf/perf-lib.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Show changes to t/perf/perf-lib.sh +2 −1
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index a816fbc..c61d535 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -150,6 +150,7 @@ exit $ret' >&3 2>&4
 
 
 test_perf () {
+	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"
@@ -187,7 +188,7 @@ test_perf () {
 		base="$perf_results_dir"/"$perf_results_prefix$(basename "$0" .sh)"."$test_count"
 		"$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".times
 	fi
-	echo >&3 ""
+	test_finish_
 }
 
 # We extend test_done to print timings at the end (./run disables this
-- 
1.8.3.453.g1dfc63d
Thomas Rast· Jun 29, 2013, 16:51 UTC · re: Thomas Gummerer · lore

Re: [PATCH] perf-lib: fix start/stop of perf tests

Thomas Gummerer <t.gummerer@gmail.com> writes:
Show 7 quoted lines
> ae75342 test-lib: rearrange start/end of test_expect_* and test_skip
> changed the way tests are started/stopped, but did not update the perf
> tests.  They were therefore giving the wrong output, because of the
> wrong test count.  Fix this by starting and stopping the tests
> correctly.
>
> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Doh!  Thanks for catching this.
Show 24 quoted lines
>  t/perf/perf-lib.sh | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
> index a816fbc..c61d535 100644
> --- a/t/perf/perf-lib.sh
> +++ b/t/perf/perf-lib.sh
> @@ -150,6 +150,7 @@ exit $ret' >&3 2>&4
>  
>  
>  test_perf () {
> +	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"
> @@ -187,7 +188,7 @@ test_perf () {
>  		base="$perf_results_dir"/"$perf_results_prefix$(basename "$0" .sh)"."$test_count"
>  		"$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".times
>  	fi
> -	echo >&3 ""
> +	test_finish_
>  }
>  
>  # We extend test_done to print timings at the end (./run disables this
-- 
Thomas Rast
trast@{inf,student}.ethz.ch

← back to recent threads