From: wolf Date: Mon, 9 Feb 2004 13:35:48 +0000 (+0000) Subject: Make process of listing tests significantly simpler. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9620042d217486040c2b29202c7273115980effc;p=dealii-svn.git Make process of listing tests significantly simpler. git-svn-id: https://svn.dealii.org/trunk@8431 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/Makefile.rules b/tests/Makefile.rules index 941edeaf29..8ee24760d7 100644 --- a/tests/Makefile.rules +++ b/tests/Makefile.rules @@ -1,7 +1,7 @@ ###################################################################### # Makefile.rules,v 1.11 2001/04/24 13:18:09 wolf Exp # -# Copyright (C) 2001, 2002, 2003, the deal.II authors +# Copyright (C) 2001, 2002, 2003, 2004, the deal.II authors # # Common make rules for test files. To be included by the Makefiles # in the subdirectories. @@ -151,7 +151,8 @@ new-platform: output run-tests ############################################################ clean: - -rm -f Makefile.depend *.$(OBJEXT) *.g.$(OBJEXT) *.output *~ + -rm -f Makefile.depend Makefile.tests *.$(OBJEXT) \ + *.g.$(OBJEXT) *.output *~ distclean: clean -rm -f *.exe *.testcase *.inp *.gpl *.eps *.gnuplot @@ -169,5 +170,12 @@ Makefile.depend: $(shell echo *.cc) @$D/common/scripts/make_dependencies $(INCLUDE) $^ \ | $(PERL) -pi -e 's/\.o:/.g.o:/g;' > $@ +Makefile.tests: $(shell echo *.cc) Makefile + @echo =====Targets======= $@ + @for i in $(tests) ; do \ + echo "$$i.exe : $$i.g.\$$(OBJEXT) \$$(libraries)"; \ + done \ + > $@ + .PHONY: report show-tests diff --git a/tests/bits/Makefile b/tests/bits/Makefile index 02faa5f18e..d83430e30f 100644 --- a/tests/bits/Makefile +++ b/tests/bits/Makefile @@ -22,208 +22,48 @@ default: run-tests ############################################################ -anna_1.exe : anna_1.g.$(OBJEXT) $(libraries) -anna_2.exe : anna_2.g.$(OBJEXT) $(libraries) -anna_3.exe : anna_3.g.$(OBJEXT) $(libraries) -anna_4.exe : anna_4.g.$(OBJEXT) $(libraries) -anna_5.exe : anna_5.g.$(OBJEXT) $(libraries) -anna_6.exe : anna_6.g.$(OBJEXT) $(libraries) -geometry_info_1.exe : geometry_info_1.g.$(OBJEXT) $(libraries) -full_matrix_1.exe : full_matrix_1.g.$(OBJEXT) $(libraries) -data_out_01.exe : data_out_01.g.$(OBJEXT) $(libraries) -data_out_02.exe : data_out_02.g.$(OBJEXT) $(libraries) -data_out_faces_01.exe : data_out_faces_01.g.$(OBJEXT) $(libraries) -data_out_faces_02.exe : data_out_faces_02.g.$(OBJEXT) $(libraries) -data_out_rotation_01.exe: data_out_rotation_01.g.$(OBJEXT) $(libraries) -data_out_rotation_02.exe: data_out_rotation_02.g.$(OBJEXT) $(libraries) -data_out_stack_01.exe : data_out_stack_01.g.$(OBJEXT) $(libraries) -dof_tools_00a.exe : dof_tools_00a.g.$(OBJEXT) $(libraries) -dof_tools_01a.exe : dof_tools_01a.g.$(OBJEXT) $(libraries) -dof_tools_01b.exe : dof_tools_01b.g.$(OBJEXT) $(libraries) -dof_tools_01c.exe : dof_tools_01c.g.$(OBJEXT) $(libraries) -dof_tools_01d.exe : dof_tools_01d.g.$(OBJEXT) $(libraries) -dof_tools_02a.exe : dof_tools_02a.g.$(OBJEXT) $(libraries) -dof_tools_02b.exe : dof_tools_02b.g.$(OBJEXT) $(libraries) -dof_tools_02c.exe : dof_tools_02c.g.$(OBJEXT) $(libraries) -dof_tools_02d.exe : dof_tools_02d.g.$(OBJEXT) $(libraries) -dof_tools_03.exe : dof_tools_03.g.$(OBJEXT) $(libraries) -dof_tools_04.exe : dof_tools_04.g.$(OBJEXT) $(libraries) -dof_tools_05.exe : dof_tools_05.g.$(OBJEXT) $(libraries) -dof_tools_06.exe : dof_tools_06.g.$(OBJEXT) $(libraries) -dof_tools_07.exe : dof_tools_07.g.$(OBJEXT) $(libraries) -dof_tools_08.exe : dof_tools_08.g.$(OBJEXT) $(libraries) -dof_tools_09.exe : dof_tools_09.g.$(OBJEXT) $(libraries) -dof_tools_10.exe : dof_tools_10.g.$(OBJEXT) $(libraries) -dof_tools_11.exe : dof_tools_11.g.$(OBJEXT) $(libraries) -dof_tools_12.exe : dof_tools_12.g.$(OBJEXT) $(libraries) -dof_tools_13.exe : dof_tools_13.g.$(OBJEXT) $(libraries) -dof_tools_14.exe : dof_tools_14.g.$(OBJEXT) $(libraries) -dof_tools_15a.exe : dof_tools_15a.g.$(OBJEXT) $(libraries) -dof_tools_15b.exe : dof_tools_15b.g.$(OBJEXT) $(libraries) -dof_tools_15c.exe : dof_tools_15c.g.$(OBJEXT) $(libraries) -dof_tools_15d.exe : dof_tools_15d.g.$(OBJEXT) $(libraries) -dof_tools_16a.exe : dof_tools_16a.g.$(OBJEXT) $(libraries) -dof_tools_16b.exe : dof_tools_16b.g.$(OBJEXT) $(libraries) -dof_tools_16c.exe : dof_tools_16c.g.$(OBJEXT) $(libraries) -dof_tools_16d.exe : dof_tools_16d.g.$(OBJEXT) $(libraries) -dof_tools_17a.exe : dof_tools_17a.g.$(OBJEXT) $(libraries) -dof_tools_17b.exe : dof_tools_17b.g.$(OBJEXT) $(libraries) -dof_tools_17c.exe : dof_tools_17c.g.$(OBJEXT) $(libraries) -dof_tools_17d.exe : dof_tools_17d.g.$(OBJEXT) $(libraries) -dof_tools_18a.exe : dof_tools_18a.g.$(OBJEXT) $(libraries) -dof_tools_18b.exe : dof_tools_18b.g.$(OBJEXT) $(libraries) -dof_tools_18c.exe : dof_tools_18c.g.$(OBJEXT) $(libraries) -dof_tools_18d.exe : dof_tools_18d.g.$(OBJEXT) $(libraries) -fe_tools_01a.exe : fe_tools_01a.g.$(OBJEXT) $(libraries) -fe_tools_01b.exe : fe_tools_01b.g.$(OBJEXT) $(libraries) -fe_tools_01c.exe : fe_tools_01c.g.$(OBJEXT) $(libraries) -fe_tools_02.exe : fe_tools_02.g.$(OBJEXT) $(libraries) -fe_tools_03.exe : fe_tools_03.g.$(OBJEXT) $(libraries) -fe_tools_04.exe : fe_tools_04.g.$(OBJEXT) $(libraries) -fe_tools_05.exe : fe_tools_05.g.$(OBJEXT) $(libraries) -fe_tools_06.exe : fe_tools_06.g.$(OBJEXT) $(libraries) -fe_tools_07.exe : fe_tools_07.g.$(OBJEXT) $(libraries) -fe_tools_08.exe : fe_tools_08.g.$(OBJEXT) $(libraries) -fe_tools_09.exe : fe_tools_09.g.$(OBJEXT) $(libraries) -fe_tools_10.exe : fe_tools_10.g.$(OBJEXT) $(libraries) -fe_tools_11.exe : fe_tools_11.g.$(OBJEXT) $(libraries) -gerold_1.exe : gerold_1.g.$(OBJEXT) $(libraries) -roy_1.exe : roy_1.g.$(OBJEXT) $(libraries) -denis_1.exe : denis_1.g.$(OBJEXT) $(libraries) -point_inside_1.exe : point_inside_1.g.$(OBJEXT) $(libraries) -point_inside_2.exe : point_inside_2.g.$(OBJEXT) $(libraries) -unit_support_points.exe : unit_support_points.g.$(OBJEXT) $(libraries) -parameter_handler_1.exe : parameter_handler_1.g.$(OBJEXT) $(libraries) -parameter_handler_2.exe : parameter_handler_2.g.$(OBJEXT) $(libraries) -parameter_handler_3.exe : parameter_handler_3.g.$(OBJEXT) $(libraries) -parameter_handler_4.exe : parameter_handler_4.g.$(OBJEXT) $(libraries) -parameter_handler_5.exe : parameter_handler_5.g.$(OBJEXT) $(libraries) -sparse_lu_decomposition_1.exe: sparse_lu_decomposition_1.g.$(OBJEXT) $(libraries) -block_sparse_matrix_1.exe:block_sparse_matrix_1.g.$(OBJEXT) $(libraries) -hyper_ball_3d.exe : hyper_ball_3d.g.$(OBJEXT) $(libraries) -cylinder.exe : cylinder.g.$(OBJEXT) $(libraries) -coarsening_3d.exe : coarsening_3d.g.$(OBJEXT) $(libraries) -mesh_3d_1.exe : mesh_3d_1.g.$(OBJEXT) $(libraries) -mesh_3d_2.exe : mesh_3d_2.g.$(OBJEXT) $(libraries) -mesh_3d_3.exe : mesh_3d_3.g.$(OBJEXT) $(libraries) -mesh_3d_4.exe : mesh_3d_4.g.$(OBJEXT) $(libraries) -mesh_3d_5.exe : mesh_3d_5.g.$(OBJEXT) $(libraries) -mesh_3d_6.exe : mesh_3d_6.g.$(OBJEXT) $(libraries) -mesh_3d_7.exe : mesh_3d_7.g.$(OBJEXT) $(libraries) -mesh_3d_8.exe : mesh_3d_8.g.$(OBJEXT) $(libraries) -mesh_3d_9.exe : mesh_3d_9.g.$(OBJEXT) $(libraries) -mesh_3d_10.exe : mesh_3d_10.g.$(OBJEXT) $(libraries) -mesh_3d_11.exe : mesh_3d_11.g.$(OBJEXT) $(libraries) -mesh_3d_12.exe : mesh_3d_12.g.$(OBJEXT) $(libraries) -mesh_3d_13.exe : mesh_3d_13.g.$(OBJEXT) $(libraries) -mesh_3d_14.exe : mesh_3d_14.g.$(OBJEXT) $(libraries) -mesh_3d_15.exe : mesh_3d_15.g.$(OBJEXT) $(libraries) -mesh_3d_16.exe : mesh_3d_16.g.$(OBJEXT) $(libraries) -normals_1.exe : normals_1.g.$(OBJEXT) $(libraries) -normals_2.exe : normals_2.g.$(OBJEXT) $(libraries) -normals_3.exe : normals_3.g.$(OBJEXT) $(libraries) -normals_4.exe : normals_4.g.$(OBJEXT) $(libraries) -mapping_cartesian_1.exe : mapping_cartesian_1.g.$(OBJEXT) $(libraries) -mapping_q4_3d.exe : mapping_q4_3d.g.$(OBJEXT) $(libraries) -q_points.exe : q_points.g.$(OBJEXT) $(libraries) -q_point_sum_1.exe : q_point_sum_1.g.$(OBJEXT) $(libraries) -q_point_sum_2.exe : q_point_sum_2.g.$(OBJEXT) $(libraries) -q_point_sum_3.exe : q_point_sum_3.g.$(OBJEXT) $(libraries) -q_point_sum_4.exe : q_point_sum_4.g.$(OBJEXT) $(libraries) -volume_1.exe : volume_1.g.$(OBJEXT) $(libraries) -volume_2.exe : volume_2.g.$(OBJEXT) $(libraries) -volume_3.exe : volume_3.g.$(OBJEXT) $(libraries) -volume_4.exe : volume_4.g.$(OBJEXT) $(libraries) -find_cell_1.exe : find_cell_1.g.$(OBJEXT) $(libraries) -find_cell_2.exe : find_cell_2.g.$(OBJEXT) $(libraries) -find_cell_3.exe : find_cell_3.g.$(OBJEXT) $(libraries) -sparse_matrix_01.exe : sparse_matrix_01.g.$(OBJEXT) $(libraries) -sparse_matrix_01a.exe : sparse_matrix_01a.g.$(OBJEXT) $(libraries) -sparse_matrix_02.exe : sparse_matrix_02.g.$(OBJEXT) $(libraries) -sparse_matrix_03.exe : sparse_matrix_03.g.$(OBJEXT) $(libraries) -sparse_matrix_04.exe : sparse_matrix_04.g.$(OBJEXT) $(libraries) -sparse_matrix_05.exe : sparse_matrix_05.g.$(OBJEXT) $(libraries) -sparse_matrix_05a.exe : sparse_matrix_05a.g.$(OBJEXT) $(libraries) -sparse_matrix_06.exe : sparse_matrix_06.g.$(OBJEXT) $(libraries) -sparse_matrix_07.exe : sparse_matrix_07.g.$(OBJEXT) $(libraries) -sparse_matrix_08.exe : sparse_matrix_08.g.$(OBJEXT) $(libraries) -sparse_matrix_09.exe : sparse_matrix_09.g.$(OBJEXT) $(libraries) -sparse_matrix_10.exe : sparse_matrix_10.g.$(OBJEXT) $(libraries) +tests_x = anna_? \ + geometry_info_1 \ + point_inside_? \ + full_matrix_1 \ + data_out_0* \ + data_out_faces_0* \ + data_out_rotation_0* \ + data_out_stack_01 \ + dof_tools_[0-9]* \ + fe_tools_[0-9]* \ + roy_1 \ + denis_1 \ + unit_support_points \ + parameter_handler_* \ + sparse_lu_decomposition_1 block_sparse_matrix_1 \ + hyper_ball_3d cylinder coarsening_3d \ + mesh_3d_* \ + normals_* \ + q_point_sum_* \ + volume_* \ + mapping_cartesian_1 \ + mapping_q4_3d \ + q_points \ + find_cell_* \ + sparse_matrix_* \ + vector_* -petsc_01.exe : petsc_01.g.$(OBJEXT) $(libraries) -petsc_02.exe : petsc_02.g.$(OBJEXT) $(libraries) -petsc_03.exe : petsc_03.g.$(OBJEXT) $(libraries) -petsc_03a.exe : petsc_03a.g.$(OBJEXT) $(libraries) -petsc_03b.exe : petsc_03b.g.$(OBJEXT) $(libraries) -petsc_04.exe : petsc_04.g.$(OBJEXT) $(libraries) -petsc_05.exe : petsc_05.g.$(OBJEXT) $(libraries) -petsc_06.exe : petsc_06.g.$(OBJEXT) $(libraries) -petsc_07.exe : petsc_07.g.$(OBJEXT) $(libraries) -petsc_08.exe : petsc_08.g.$(OBJEXT) $(libraries) -petsc_09.exe : petsc_09.g.$(OBJEXT) $(libraries) -petsc_10.exe : petsc_10.g.$(OBJEXT) $(libraries) -petsc_11.exe : petsc_11.g.$(OBJEXT) $(libraries) -petsc_12.exe : petsc_12.g.$(OBJEXT) $(libraries) -petsc_13.exe : petsc_13.g.$(OBJEXT) $(libraries) -petsc_14.exe : petsc_14.g.$(OBJEXT) $(libraries) -petsc_15.exe : petsc_15.g.$(OBJEXT) $(libraries) -petsc_16.exe : petsc_16.g.$(OBJEXT) $(libraries) -petsc_17.exe : petsc_17.g.$(OBJEXT) $(libraries) -petsc_18.exe : petsc_18.g.$(OBJEXT) $(libraries) - -tests = anna_1 anna_2 anna_3 anna_4 anna_5 anna_6 \ - geometry_info_1 point_inside_1 point_inside_2 \ - full_matrix_1 \ - data_out_01 data_out_02 data_out_faces_01 data_out_faces_02 \ - data_out_rotation_01 data_out_rotation_02 data_out_stack_01 \ - dof_tools_00a \ - dof_tools_01a dof_tools_01b dof_tools_01c dof_tools_01d \ - dof_tools_02a dof_tools_02b dof_tools_02c dof_tools_02d \ - dof_tools_03 dof_tools_04 dof_tools_05 dof_tools_06 \ - dof_tools_07 dof_tools_08 dof_tools_09 dof_tools_10 \ - dof_tools_11 dof_tools_12 dof_tools_13 dof_tools_14 \ - dof_tools_15a dof_tools_15b dof_tools_15c dof_tools_15d \ - dof_tools_16a dof_tools_16b dof_tools_16c dof_tools_16d \ - dof_tools_17a dof_tools_17b dof_tools_17c dof_tools_17d \ - dof_tools_18a dof_tools_18b dof_tools_18c dof_tools_18d \ - fe_tools_01a fe_tools_01b fe_tools_01c \ - fe_tools_02 fe_tools_03 fe_tools_04 \ - fe_tools_05 fe_tools_06 fe_tools_07 fe_tools_08 fe_tools_09 \ - fe_tools_10 fe_tools_11\ - roy_1 \ - denis_1 \ - unit_support_points \ - parameter_handler_1 parameter_handler_2 \ - parameter_handler_3 parameter_handler_4 \ - parameter_handler_5 \ - sparse_lu_decomposition_1 block_sparse_matrix_1 \ - hyper_ball_3d cylinder coarsening_3d \ - mesh_3d_1 mesh_3d_2 mesh_3d_3 mesh_3d_4 mesh_3d_5 \ - mesh_3d_6 mesh_3d_7 mesh_3d_8 mesh_3d_9 mesh_3d_10 \ - mesh_3d_11 mesh_3d_12 mesh_3d_13 mesh_3d_14 mesh_3d_15 \ - mesh_3d_16 \ - normals_1 normals_2 normals_3 normals_4 \ - q_point_sum_1 q_point_sum_2 q_point_sum_3 q_point_sum_4 \ - volume_1 volume_2 volume_3 volume_4 \ - mapping_cartesian_1 \ - mapping_q4_3d \ - q_points find_cell_1 find_cell_2 find_cell_3 \ - sparse_matrix_01a \ - sparse_matrix_01 sparse_matrix_02 sparse_matrix_03 \ - sparse_matrix_04 sparse_matrix_05 sparse_matrix_05a \ - sparse_matrix_06 \ - sparse_matrix_07 sparse_matrix_08 sparse_matrix_09 \ - sparse_matrix_10 - -ifeq ($(USE_CONTRIB_HSL),yes) - tests += petsc_01 petsc_02 petsc_03 petsc_03a petsc_03b \ - petsc_04 petsc_05 petsc_06 \ - petsc_07 petsc_08 petsc_09 petsc_10 petsc_11 petsc_12 \ - petsc_13 petsc_14 petsc_15 petsc_16 petsc_17 petsc_18 +ifeq ($(USE_CONTRIB_PETSC),yes) + tests_x += petsc_* endif +# 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)) + ############################################################ include ../Makefile.rules include Makefile.depend +include Makefile.tests + +.PHONY: default \ No newline at end of file