[cairo-commit] perf/Makefile.am

[Chris Wilson]

 perf/Makefile.am |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

New commits:
commit 0d5a15f23812575c80db44ca23075293cc0dbfad
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jun 12 20:00:24 2010 +0100

    check: Disable running cairo-perf-micro
    
    Since this takes days to run now and should not find any bugs that are
    not covered by the test-suite it seems like a pointless exercise.
    Especially as I am trying to make a release!

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 441aee6..6a1b72c 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -138,11 +138,6 @@ ITERS = $(CAIRO_PERF_ITERATIONS)
 
 CAIRO_PERF_ENVIRONMENT = CAIRO_PERF_ITERATIONS="$(ITERS)" CAIRO_TEST_TARGET="$(TARGETS)" CAIRO_TEST_TARGET_EXCLUDE="$(TARGETS_EXCLUDE)"
 
-# Cap the maximum number of iterations during 'make check'
-TESTS_ENVIRONMENT = CAIRO_TEST_TARGET="$(TARGETS)" CAIRO_PERF_ITERATIONS="10"
-
-TESTS += cairo-perf-micro$(EXEEXT)
-
 perf: cairo-perf-micro$(EXEEXT) cairo-perf-trace$(EXEEXT)
 	-$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-micro$(EXEEXT)
 	-$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-trace$(EXEEXT)
@@ -170,19 +165,17 @@ CLEANFILES += \
 	callgrind.out.* \
 	index.html
 
-check-valgrind perf-valgrind:
-	$(MAKE) $(AM_MAKEFLAGS) check \
-	    TESTS_ENVIRONMENT='$(TESTS_ENVIRONMENT) \
+perf-valgrind:
+	$(MAKE) $(AM_MAKEFLAGS) perf \
 	    $(top_builddir)/libtool --mode=execute \
 	    valgrind $(VALGRIND_MEMCHECK_FLAGS) $(EXTRA_VALGRIND_FLAGS)' \
 	    | tee valgrind-log
 
 perf-callgrind:
-	$(MAKE) $(AM_MAKEFLAGS) check \
-	    TESTS_ENVIRONMENT='$(TESTS_ENVIRONMENT) \
+	$(MAKE) $(AM_MAKEFLAGS) perf \
 	    $(top_builddir)/libtool --mode=execute \
 	    valgrind $(VALGRIND_CALLGRIND_FLAGS) $(EXTRA_VALGRIND_FLAGS)'
 
-.PHONY: perf check-valgrind perf-valgrind perf-callgrind
+.PHONY: perf perf-valgrind perf-callgrind
 
 EXTRA_DIST += Makefile.win32