[cairo-commit] perf/Makefile.am test/Makefile.am

[Behdad Esfahbod]

 perf/Makefile.am |    6 ++++--
 test/Makefile.am |    5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
diff-tree 84a2c8968a57ed7593db1515718115218072bc0d (from b85032584b32af968dc8d8a0fcfc9f3e1d2770a0)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Sep 5 12:38:27 2007 -0400

    [test,perf] Support TARGETS_EXCLUDE make variable

diff --git a/perf/Makefile.am b/perf/Makefile.am
index d3f96f0..7814be5 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -67,10 +67,12 @@ $(top_builddir)/src/libcairo.la:
 
 # Do a funny transition of CAIRO_TEST_TARGET through TARGETS such that
 # one can limit tested targets both through CAIRO_TEST_TARGET env var
-# and TARGETS make var on the command line.
+# and TARGETS make var on the command line.  Same for the rest.
 TARGETS = $(CAIRO_TEST_TARGET)
+TARGETS_EXCLUDE = $(CAIRO_TEST_TARGET_EXCLUDE)
 ITERS = $(CAIRO_PERF_ITERATIONS)
-CAIRO_PERF_ENVIRONMENT = CAIRO_TEST_TARGET="$(TARGETS)" CAIRO_PERF_ITERATIONS="$(ITERS)"
+
+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"
diff --git a/test/Makefile.am b/test/Makefile.am
index a8f2fec..e5474a2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -525,10 +525,11 @@ EXTRA_PROGRAMS += $(TESTS) $(DISABLED_TE
 
 # Do a funny transition of CAIRO_TEST_TARGET through TARGETS such that
 # one can limit tested targets both through CAIRO_TEST_TARGET env var
-# and TARGETS make var on the command line.
+# and TARGETS make var on the command line.  Same for the rest.
 TARGETS = $(CAIRO_TEST_TARGET)
+TARGETS_EXCLUDE = $(CAIRO_TEST_TARGET_EXCLUDE)
 
-TESTS_ENVIRONMENT = CAIRO_XFAIL_TESTS="$(XFAIL_TESTS)" CAIRO_TEST_TARGET="$(TARGETS)"
+TESTS_ENVIRONMENT = CAIRO_XFAIL_TESTS="$(XFAIL_TESTS)" CAIRO_TEST_TARGET="$(TARGETS)" CAIRO_TEST_TARGET_EXCLUDE="$(TARGETS_EXCLUDE)"
 
 EXTRA_VALGRIND_FLAGS = $(CAIRO_EXTRA_VALGRIND_FLAGS)
 VALGRIND_FLAGS = \