From 84a2c8968a57ed7593db1515718115218072bc0d Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 5 Sep 2007 12:38:27 -0400 Subject: [PATCH] [test,perf] Support TARGETS_EXCLUDE make variable --- perf/Makefile.am | 6 ++++-- test/Makefile.am | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/perf/Makefile.am b/perf/Makefile.am index d3f96f0ae..7814be5ec 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 a8f2fec20..e5474a21e 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -525,10 +525,11 @@ EXTRA_PROGRAMS += $(TESTS) $(DISABLED_TESTS) # 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 = \