diff --git a/build/Makefile.am.analysis b/build/Makefile.am.analysis
index d0e00ca49..a44077ab4 100644
--- a/build/Makefile.am.analysis
+++ b/build/Makefile.am.analysis
@@ -17,6 +17,8 @@ genlcov:
< cairo-lcov.info > cairo-lcov.info.tmp
LANG=C $(LTP_GENHTML) --prefix $(top_builddir) --output-directory cairo-lcov --title "Cairo Code Coverage" --show-details cairo-lcov.info.tmp
$(RM) cairo-lcov.info.tmp
+
+html-local: lcov
else
lcov lcov-perf genlcov:
@echo You need to configure Cairo with support for gcov enabled.
diff --git a/perf/Makefile.am b/perf/Makefile.am
index 1d05d8ec5..8588fe05a 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -141,7 +141,7 @@ perf: cairo-perf$(EXEEXT) cairo-perf-trace$(EXEEXT)
html-local: index.html
index.html: cairo-perf$(EXEEXT)
- $(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-diff -h HEAD > $@
+ $(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-diff -t -h HEAD > $@
EXTRA_VALGRIND_FLAGS = $(CAIRO_EXTRA_VALGRIND_FLAGS)
diff --git a/perf/cairo-perf-diff b/perf/cairo-perf-diff
index e695cfccf..2ab447e05 100755
--- a/perf/cairo-perf-diff
+++ b/perf/cairo-perf-diff
@@ -52,12 +52,14 @@ END
exit 1
}
+benchmarks="cairo-perf"
+
# First, pull off any known options
while true; do
case $1 in
-f|--force) force_cairo_perf="true";;
-h|--html) html_output="true";;
- -t|--trace) use_traces="true";;
+ -t|--trace) benchmarks="${benchmarks} cairo-perf-trace";;
*) break;;
esac
@@ -212,15 +214,10 @@ run_cairo_perf_if_not_cached() {
build $build_dir $sha || exit 1
}
- if [ "$use_traces" = "true" ]; then
- cmd="cairo-perf-trace"
- else
- cmd="cairo-perf"
- fi
- echo "Running \"$cmd $CAIRO_PERF_OPTIONS\" against $rev. Results will be cached in:"
- echo "$perf"
- pwd
- (./$cmd $CAIRO_PERF_OPTIONS || echo "*** Performance test crashed") >> $perf
+ echo "Running \"cairo-perf $CAIRO_PERF_OPTIONS\" against $rev. Results will be cached in:"
+ for cmd in $benchmarks; do
+ (./$cmd $CAIRO_PERF_OPTIONS || echo "*** Performance test crashed") >> $perf
+ done
cd $owd
}
diff --git a/perf/make-html.py b/perf/make-html.py
index 79a299217..0b4533581 100755
--- a/perf/make-html.py
+++ b/perf/make-html.py
@@ -27,6 +27,7 @@ print '''\
Performance Changes