From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon, 15 Apr 2013 08:22:26 +0000 (+0530)
Subject: Write to bench.out-tmp only once
X-Git-Tag: upstream/2.30~9217
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=206a6699116215c591c8562c67106f7e17146608;p=external%2Fglibc.git

Write to bench.out-tmp only once

Appending benchmark program output on every run could result in a case
where the benchmark run was cancelled, resulting in a partially
written file.  This file gets used again on the next run, resulting in
results being appended to old results.

It could have been possible to remove the file before every benchmark
run, but it is easier to just write the output to bench.out-tmp only
once.
---

diff --git a/ChangeLog b/ChangeLog
index 6a02e77..2284d7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-15  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* benchtests/Makefile (bench): Write all output to
+	bench-out.tmp together.
+
 2013-04-15  Andreas Schwab  <schwab@suse.de>
 
 	* nscd/nscd.c (main): Don't fork again after closing files.
diff --git a/benchtests/Makefile b/benchtests/Makefile
index 3e794d7..bd0925b 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -121,10 +121,10 @@ run-bench = $(test-wrapper-env) \
 	    $($*-ENV) $(rtld-prefix) $${run}
 
 bench: $(binaries-bench)
-	for run in $^; do \
-	  echo "Running $${run}"; \
-	  $(run-bench) >>  $(objpfx)bench.out-tmp; \
-	done; \
+	{ for run in $^; do \
+	  echo "Running $${run}" >&2; \
+	  $(run-bench); \
+	done; } > $(objpfx)bench.out-tmp; \
 	if [ -f $(objpfx)bench.out ]; then \
 	  mv -f $(objpfx)bench.out $(objpfx)bench.out.old; \
 	fi; \