From 0c4692a1d0667f5850f59c65754a3ffbaf688afe Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 20 Jul 2009 23:34:55 +0100
Subject: [PATCH] [perf] Specify html file on cmdline instead of redirecting
 all output

Redirecting all output was causing the build messages to be entangled with
the Performance Change html.
---
 perf/Makefile.am     | 4 ++--
 perf/cairo-perf-diff | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 149b714ea..a62ad95f8 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -145,9 +145,9 @@ perf: cairo-perf$(EXEEXT) cairo-perf-trace$(EXEEXT)
 html-local: index.html
 
 perf-tag.html : cairo-perf${EXEEXT}
-	$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-diff -t -h `git describe --abbrev=0` HEAD > $@
+	$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-diff -t -h $@ `git describe --abbrev=0` HEAD
 perf-commit.html : cairo-perf${EXEEXT}
-	$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-diff -t -h HEAD > $@
+	$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-diff -t -h $@ HEAD
 
 # Summarise changes in index.html, with details in links
 index.html: perf-tag.html perf-commit.html
diff --git a/perf/cairo-perf-diff b/perf/cairo-perf-diff
index 50a014a02..469da891c 100755
--- a/perf/cairo-perf-diff
+++ b/perf/cairo-perf-diff
@@ -58,7 +58,7 @@ benchmarks="cairo-perf"
 while true; do
     case $1 in
         -f|--force) force_cairo_perf="true";;
-        -h|--html) html_output="true";;
+        -h|--html) html_output="$2"; shift ;;
         -t|--trace) benchmarks="${benchmarks} cairo-perf-trace";;
         *) break;;
     esac
@@ -243,9 +243,9 @@ if [ ! -e $new ]; then
     new=`rev2perf $new`
 fi
 
-if [ "$html_output" != "true" ]; then
+if [ -z "$html_output" ]; then
     $CAIRO_DIR/perf/cairo-perf-diff-files $old $new
 else
     $CAIRO_DIR/perf/cairo-perf-diff-files $old $new |
-    $CAIRO_DIR/perf/make-html.py
+    $CAIRO_DIR/perf/make-html.py > $html_output
 fi