From 44257b8e1dc86885ddd7a67af308fd9be74290b8 Mon Sep 17 00:00:00 2001 From: guido Date: Tue, 4 Apr 2000 17:00:40 +0000 Subject: [PATCH] tests run up to wave git-svn-id: https://svn.dealii.org/branches/Branch-3-0@2676 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/common/Make.global_options.in | 1 + tests/deal.II/Makefile.in | 7 ++++++- tests/lac/Makefile.in | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index a72e79d4ae..cf99de1216 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -24,6 +24,7 @@ CXX = @CXX@ GXX-VERSION = @GXX_VERSION@ OS = @OS@ PERL = @PERL@ +enable-multigrid = @enablemultigrid@ enable-multithreading= @enablemultithreading@ with-multithreading = @withmultithreading@ enable-shared = @enableshared@ diff --git a/tests/deal.II/Makefile.in b/tests/deal.II/Makefile.in index d9a50cd784..218061bab7 100644 --- a/tests/deal.II/Makefile.in +++ b/tests/deal.II/Makefile.in @@ -65,8 +65,13 @@ endif @$(CXX) $(flags) -c $< -o $@ +ifeq ($(enable-multigrid),yes) all: grid_test.check dof_test.check fe_tables.check gradients.check \ - constraints.check mg.check mglocal.check wave-test-3.check second_derivatives.check + constraints.check mg.check mglocal.check second_derivatives.check wave-test-3.check +else +all: grid_test.check dof_test.check fe_tables.check gradients.check \ + constraints.check second_derivatives.check wave-test-3.check +endif exe: $(all:.check=.testcase) benchmark run: $(all:.check=.output) diff --git a/tests/lac/Makefile.in b/tests/lac/Makefile.in index 2376cb512b..0cb7dbcdf6 100644 --- a/tests/lac/Makefile.in +++ b/tests/lac/Makefile.in @@ -60,7 +60,11 @@ endif @echo =====optimized===== $< @$(CXX) $(flags) -c $< -o $@ +ifeq ($(enable-multigrid),yes) all: solver.check mgbase.check mg.check +else +all: solver.check +endif exe: $(all:.check=.testcase) benchmark run: $(all:.check=.output) -- 2.39.5