From: guido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 4 Apr 2000 17:00:40 +0000 (+0000)
Subject: tests run up to wave
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44257b8e1dc86885ddd7a67af308fd9be74290b8;p=dealii-svn.git

tests run up to wave


git-svn-id: https://svn.dealii.org/branches/Branch-3-0@2676 0785d39b-7218-0410-832d-ea1e28bc413d
---

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)