From: bangerth Date: Sun, 19 Sep 2010 18:55:47 +0000 (+0000) Subject: In those directories in which now all .cc files correspond to tests, simplify the... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1db0d4522211b276392075c04eab91d4ae2826f0;p=dealii-svn.git In those directories in which now all .cc files correspond to tests, simplify the Makefile. git-svn-id: https://svn.dealii.org/trunk@22076 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/hsl/Makefile b/tests/hsl/Makefile index 38969d7a79..7de41a4da0 100644 --- a/tests/hsl/Makefile +++ b/tests/hsl/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/petsc/Makefile b/tests/petsc/Makefile index 381c3f731a..d40682b73a 100644 --- a/tests/petsc/Makefile +++ b/tests/petsc/Makefile @@ -1,6 +1,6 @@ ############################################################ # $Id$ -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008 by the deal.II authors +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2010 by the deal.II authors ############################################################ ############################################################ @@ -20,14 +20,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)) ############################################################ @@ -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/trilinos/Makefile b/tests/trilinos/Makefile index 381c3f731a..d40682b73a 100644 --- a/tests/trilinos/Makefile +++ b/tests/trilinos/Makefile @@ -1,6 +1,6 @@ ############################################################ # $Id$ -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008 by the deal.II authors +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2010 by the deal.II authors ############################################################ ############################################################ @@ -20,14 +20,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)) ############################################################ @@ -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/umfpack/Makefile b/tests/umfpack/Makefile index 562bf6a91e..0b5ea82109 100644 --- a/tests/umfpack/Makefile +++ b/tests/umfpack/Makefile @@ -1,6 +1,6 @@ ############################################################ # $Id: Makefile 13843 2006-09-06 21:29:34Z kanschat $ -# 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 ############################################################ ############################################################ @@ -26,14 +26,8 @@ default: run-tests ############################################################ -tests_x = umfpack* - - -# 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)) ############################################################ @@ -42,4 +36,4 @@ include ../Makefile.rules include Makefile.depend include Makefile.tests -.PHONY: default \ No newline at end of file +.PHONY: default