From: kanschat Date: Sun, 23 Jun 2013 15:19:55 +0000 (+0000) Subject: By default only run tests for configured features. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa57d8ebdbb23eee1cf8587d9f5e06a782ebde4e;p=dealii-svn.git By default only run tests for configured features. git-svn-id: https://svn.dealii.org/trunk@29847 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/Makefile.rules b/tests/Makefile.rules index 7acbce28e2..3ab6b359dd 100644 --- a/tests/Makefile.rules +++ b/tests/Makefile.rules @@ -259,24 +259,27 @@ report+mail: ############################################################ # 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) +# We first test if $tests exists and in this case do not do anything. +ifeq ($(tests),) + 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 = $(basename $(tests2)) endif -tests_cc = $(tests2) -tests_base = $(basename $(tests2)) -tests = $(foreach file, $(tests_base), $(wildcard $(file)/ncpu_*)) - +show-tests: + @echo $(tests) ############################################################ # link with all libraries: libraries = $(lib-deal2.g)