From f8a37cb837ced9b68e5b4f4745158e44cb75de79 Mon Sep 17 00:00:00 2001
From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Wed, 21 Aug 2013 22:43:23 +0000
Subject: [PATCH] On to the next folder

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30393 0785d39b-7218-0410-832d-ea1e28bc413d
---
 tests/CMakeLists.txt   |  14 +++++-
 tests/Makefile         | 108 -----------------------------------------
 tests/umfpack/Makefile |  10 ----
 3 files changed, 13 insertions(+), 119 deletions(-)
 delete mode 100644 tests/Makefile
 delete mode 100644 tests/umfpack/Makefile

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8c5760ddaf..54978f662e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -64,6 +64,15 @@ SET_IF_EMPTY(DEAL_II_TEST_TIME_LIMIT 120)
 
 MESSAGE(STATUS "Proceed to test definitions")
 
+#$(if $(DEAL_II_USE_MPI:no=),      $(if $(USE_CONTRIB_P4EST:no=),mpi,),) \
+#$(if $(DEAL_II_USE_MPI:no=),      $(if $(USE_CONTRIB_P4EST:no=),gla,),) \
+#$(if $(USE_CONTRIB_P4EST:no=),    distributed_grids,) \
+#$(if $(USE_CONTRIB_PETSC:no=),    petsc,) \
+#$(if $(USE_CONTRIB_SLEPC:no=),    slepc,) \
+#$(if $(USE_CONTRIB_TRILINOS:no=), trilinos,) \
+#$(if $(USE_CONTRIB_METIS:no=),    metis,) \
+#$(if $(USE_CONTRIB_HSL:no=),      hsl,) \
+#$(if $(USE_CONTRIB_LAPACK:no=),   lapack,)
 
 #a-framework
 #all-headers
@@ -93,4 +102,7 @@ ADD_SUBDIRECTORY(codim_one)
 #serialization
 #slepc
 #trilinos
-#umfpack
+
+IF(DEAL_II_WITH_UMFPACK)
+  ADD_SUBDIRECTORY(umfpack)
+ENDIF()
diff --git a/tests/Makefile b/tests/Makefile
deleted file mode 100644
index 3f284371c9..0000000000
--- a/tests/Makefile
+++ /dev/null
@@ -1,108 +0,0 @@
-# Generated automatically from Makefile.in by configure.
-# Makefile,v 1.14 2002/09/19 13:53:47 wolf Exp
-# Common Makefile for all test directories
-
-include Makefile.paths
-include $D/common/Make.global_options
-
-# first define the directories we should work on
-nofail-dirs = a-framework       \
-	      base              \
-              lac               \
-              fe                \
-              deal.II           \
-              integrators       \
-              multigrid         \
-              grid              \
-              bits              \
-              hp                \
-              matrix_free       \
-              aniso             \
-              codim_one         \
-              serialization     \
-	      mesh_converter    \
-	      $(if $(DEAL_II_USE_MPI:no=),      $(if $(USE_CONTRIB_P4EST:no=),mpi,),) \
-	      $(if $(DEAL_II_USE_MPI:no=),      $(if $(USE_CONTRIB_P4EST:no=),gla,),) \
-	      $(if $(USE_CONTRIB_P4EST:no=),    distributed_grids,) \
-	      $(if $(USE_CONTRIB_PETSC:no=),    petsc,) \
-	      $(if $(USE_CONTRIB_SLEPC:no=),    slepc,) \
-	      $(if $(USE_CONTRIB_TRILINOS:no=), trilinos,) \
-	      $(if $(USE_CONTRIB_UMFPACK:no=),  umfpack,) \
-	      $(if $(USE_CONTRIB_METIS:no=),    metis,) \
-	      $(if $(USE_CONTRIB_HSL:no=),      hsl,) \
-	      $(if $(USE_CONTRIB_LAPACK:no=),   lapack,)
-
-# now define the targets that actually do something
-all: nofail do-fail
-
-nofail: $(addprefix do-,$(nofail-dirs))
-
-do-%:
-	cd $(@:do-%=%) && $(MAKE)
-
-
-report:
-	-@$(MAKE) -k nofail
-	@for i in $(nofail-dirs) fail all-headers ; do \
-		echo =======Report: $$i ======= ; \
-		cd $$i ; $(MAKE) report ; cd .. ; \
-	 done
-
-report+summary:
-	-@$(MAKE) -k nofail
-	@for i in $(nofail-dirs) fail all-headers ; do \
-		echo =======Report: $$i ======= ; \
-		cd $$i ; $(MAKE) report ; cd .. ; \
-	 done
-	@echo "                Compiling Linking Running   Check      OK     all"
-	@for i in $(nofail-dirs) fail all-headers ; do \
-		printf "%20s\t" "$$i"; \
-		cd $$i ; $(MAKE) -s summary ; cd .. ; \
-	 done
-
-report+mail:
-	-@$(MAKE) -k nofail
-	@for i in $(nofail-dirs) fail all-headers ; do \
-		echo =======Report: $$i ======= ; \
-		cd $$i ; $(MAKE) report+mail ; cd .. ; \
-	 done
-
-# compilation of tests only, no execution of tests
-build: $(addprefix build-,$(nofail-dirs) fail)
-build-%:
-	cd $(@:build-%=%) && $(MAKE) build
-
-
-# compilation and execution of tests only, no comparison with
-# reference values
-output: $(addprefix output-,$(nofail-dirs) fail)
-output-%:
-	cd $(@:output-%=%) && $(MAKE) output
-
-
-# update/generate references
-refs: $(addprefix output-,$(nofail-dirs))
-refs-%:
-	cd $(@:refs-%=%) && $(MAKE) refs
-
-
-# clean up output files
-clean:     $(addprefix clean-,$(nofail-dirs) fail)
-distclean: $(addprefix distclean-,$(nofail-dirs) fail)
-clean-%:
-	cd $(@:clean-%=%) && $(MAKE) clean
-distclean-%:
-	cd $(@:distclean-%=%) && $(MAKE) distclean
-
-
-
-resultname:
-	@echo $(TARGET)+$(GXX-VERSION)
-
-
-.PHONY : all do-% report report+mail build build-% refs refs-% \
-         clean clean-% \
-	 distclean distclean-% \
-	 resultname
-
-
diff --git a/tests/umfpack/Makefile b/tests/umfpack/Makefile
deleted file mode 100644
index 0ac0cebba7..0000000000
--- a/tests/umfpack/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-############################################################
-# $Id: Makefile 13843 2006-09-06 21:29:34Z kanschat $
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2010 by the deal.II authors
-############################################################
-
-include ../Makefile.paths
-include $D/common/Make.global_options
-include ../Makefile.rules
--include Makefile.depend
--include Makefile.tests
-- 
2.39.5