From: bangerth Date: Sun, 19 Sep 2010 22:29:25 +0000 (+0000) Subject: More changes like the previous ones: no need to say anything about tests_x if all... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fac15c1c31eb72b7072fa5c8c55dc30b4c59a565;p=dealii-svn.git More changes like the previous ones: no need to say anything about tests_x if all .cc files correspond to one test. git-svn-id: https://svn.dealii.org/trunk@22077 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/fe/Makefile b/tests/fe/Makefile index 0c8b3866bd..04af9df404 100644 --- a/tests/fe/Makefile +++ b/tests/fe/Makefile @@ -21,33 +21,8 @@ default: run-tests ############################################################ -tests_x=fe_data_test traits fe_tools fe_tools_* mapping \ - mapping_c1 shapes derivatives function numbering mapping_*_eulerian \ - transfer internals derivatives_face \ - dgq_1 \ - q_* \ - interpolate_q1 \ - rt_* \ - abf_* \ - fe_sys_* \ - rtdiff \ - rtn_* \ - interpolate_rt interpolate_rtn \ - dgp_monomial_1 dgp_monomial_2 \ - system_index system_1 interpolate_system \ - non_primitive_* \ - nedelec* \ - up_and_down \ - check_derivatives \ - injection_* \ - copy_* \ - cell_similarity_* - -# from above list of regular expressions, generate the real set of -# tests -expand = $(shell echo $(addsuffix .cc,$(1)) \ - | $(PERL) -pi -e 's/\.cc//g;') -tests = $(call expand,$(tests_x)) +# all .cc-files are tests: +tests = $(basename $(wildcard *.cc)) ############################################################ diff --git a/tests/lapack/Makefile b/tests/lapack/Makefile index 7639e7181a..4cff915ae0 100644 --- a/tests/lapack/Makefile +++ b/tests/lapack/Makefile @@ -1,6 +1,6 @@ ############################################################ # $Id$ -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2010 by the deal.II authors ############################################################ ############################################################ @@ -20,14 +20,8 @@ default: run-tests ############################################################ -tests_x = tridiagonal_ev1 solver_cg full_matrix_* - - -# from above list of regular expressions, generate the real set of -# tests -expand = $(shell echo $(addsuffix .cc,$(1)) \ - | $(PERL) -pi -e 's/\.cc//g;') -tests = $(call expand,$(tests_x)) +# all .cc-files are tests: +tests = $(basename $(wildcard *.cc)) ############################################################ @@ -36,4 +30,4 @@ include ../Makefile.rules include Makefile.depend include Makefile.tests -.PHONY: default \ No newline at end of file +.PHONY: default diff --git a/tests/metis/Makefile b/tests/metis/Makefile index 38969d7a79..7de41a4da0 100644 --- a/tests/metis/Makefile +++ b/tests/metis/Makefile @@ -21,14 +21,8 @@ default: run-tests ############################################################ -tests_x = * - -# from above list of regular expressions, generate the real set of -# tests -expand = $(shell echo $(addsuffix .cc,$(1)) \ - | $(PERL) -pi -e 's/\.cc//g;') -tests = $(call expand,$(tests_x)) - +# all .cc-files are tests: +tests = $(basename $(wildcard *.cc)) ############################################################ diff --git a/tests/multigrid/Makefile b/tests/multigrid/Makefile index 21e2cf2c1a..fe1052be16 100644 --- a/tests/multigrid/Makefile +++ b/tests/multigrid/Makefile @@ -21,18 +21,8 @@ default: run-tests ############################################################ -tests_x = cycles dof_* count_* boundary_* renumbering_* \ - transfer* \ - smoother_block \ - mg_output \ - mg_renumbered* \ - step-16 - -# from above list of regular expressions, generate the real set of -# tests -expand = $(shell echo $(addsuffix .cc,$(1)) \ - | $(PERL) -pi -e 's/\.cc//g;') -tests = $(call expand,$(tests_x)) +# all .cc-files are tests: +tests = $(basename $(wildcard *.cc)) ############################################################ diff --git a/tests/test/Makefile b/tests/test/Makefile index 033ee6752e..ac08cfb744 100644 --- a/tests/test/Makefile +++ b/tests/test/Makefile @@ -1,6 +1,6 @@ ############################################################ # $Id: Makefile 13841 2006-09-06 21:04:19Z kanschat $ -# Copyright (C) 2006 by the deal.II authors +# Copyright (C) 2006, 2010 by the deal.II authors ############################################################ ############################################################ @@ -19,13 +19,8 @@ default: run-tests ############################################################ -tests_x = no_compile_* no_link_* no_run_* no_diff_* ok_* - -# from above list of regular expressions, generate the real set of -# tests -expand = $(shell echo $(addsuffix .cc,$(1)) \ - | $(PERL) -pi -e 's/\.cc//g;') -tests = $(call expand,$(tests_x)) +# all .cc-files are tests: +tests = $(basename $(wildcard *.cc)) ############################################################ # phony header file to force compilation whenever