git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH] perf-lib: fix start/stop of perf tests
@ 2013-06-29 13:38 Thomas Gummerer
  2013-06-29 16:51 ` Thomas Rast
  0 siblings, 1 reply; 3+ messages in thread
From: Thomas Gummerer @ 2013-06-29 13:38 UTC (permalink / raw)
  To: git; +Cc: trast, gitster, Thomas Gummerer

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(-)

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] perf-lib: fix start/stop of perf tests
  2013-06-29 13:38 [PATCH] perf-lib: fix start/stop of perf tests Thomas Gummerer
@ 2013-06-29 16:51 ` Thomas Rast
  2013-06-30  1:46   ` Junio C Hamano
  0 siblings, 1 reply; 3+ messages in thread
From: Thomas Rast @ 2013-06-29 16:51 UTC (permalink / raw)
  To: Thomas Gummerer; +Cc: git, gitster

Thomas Gummerer <t.gummerer@gmail.com> writes:

> 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.

>  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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] perf-lib: fix start/stop of perf tests
  2013-06-29 16:51 ` Thomas Rast
@ 2013-06-30  1:46   ` Junio C Hamano
  0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2013-06-30  1:46 UTC (permalink / raw)
  To: Thomas Rast; +Cc: Thomas Gummerer, git

Thanks, both.  Will queue.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-06-30  1:46 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-29 13:38 [PATCH] perf-lib: fix start/stop of perf tests Thomas Gummerer
2013-06-29 16:51 ` Thomas Rast
2013-06-30  1:46   ` Junio C Hamano

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).