From 3e5451b4a64f74210d8460a32d31f09b0c873c13 Mon Sep 17 00:00:00 2001 From: kanschat Date: Sun, 23 Jun 2013 15:12:18 +0000 Subject: [PATCH] Do not put testing unconfigured features on the list. git-svn-id: https://svn.dealii.org/trunk@29846 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/Makefile.rules | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.rules b/tests/Makefile.rules index 7c0522db16..7acbce28e2 100644 --- a/tests/Makefile.rules +++ b/tests/Makefile.rules @@ -257,12 +257,26 @@ report+mail: done ############################################################ -# by default, all .cc-files are tests. individual Makefiles -# may overrule this: -ifeq ($(tests),) -tests = $(basename $(wildcard *.cc)) +# all .cc-files are tests by default. After that, find out which tests +# require unconfigured prerequisites and eliminate those. + +tests_all = $(wildcard *.cc) +ifeq ($(USE_CONTRIB_PETSC),no) + tests1 = $(foreach file, $(tests_all), $(shell grep -L PETScWrappers $(file))) +else + tests1 = $(tests_all) endif +ifeq ($(USE_CONTRIB_TRILINOS),no) + tests2 = $(foreach file, $(tests1), $(shell grep -L TrilinosWrappers $(file))) +else + tests2 = $(tests1) +endif + +tests_cc = $(tests2) +tests_base = $(basename $(tests2)) +tests = $(foreach file, $(tests_base), $(wildcard $(file)/ncpu_*)) + ############################################################ # link with all libraries: libraries = $(lib-deal2.g) -- 2.39.5