Fixup the testsuite as well

git-svn-id: https://svn.dealii.org/branches/branch_cmake@28637 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/Makefile b/tests/Makefile
index f5d0503d22381110f5e2be17141264431802153d..1719d13086d18fb106d185243bd929edf6efdc86 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -28,8 +28,7 @@ nofail-dirs = a-framework       \
              $(if $(USE_CONTRIB_UMFPACK:no=),  umfpack,) \
              $(if $(USE_CONTRIB_METIS:no=),    metis,) \
              $(if $(USE_CONTRIB_HSL:no=),      hsl,) \
-             $(shell if grep -q 'define HAVE_LIBLAPACK' $D/include/deal.II/base/config.h ;\
-                then echo lapack ; fi)
+             $(if $(USE_CONTRIB_LAPACK:no=),   lapack,)
 
 # now define the targets that actually do something
 all: nofail do-fail

diff --git a/tests/base/mutex_01.cc b/tests/base/mutex_01.cc
index 7ee33043a9dd179e6a7ae00fae793105cb09e1b2..ce4e08bd3557e5867c5bc63a87fb5000383f1439 100644 (file)
--- a/tests/base/mutex_01.cc
+++ b/tests/base/mutex_01.cc
@@ -41,7 +41,7 @@ int main()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 
   mutex.acquire ();
 

diff --git a/tests/bits/data_out_curved_cells.cc b/tests/bits/data_out_curved_cells.cc
index 663b4c67bb2a94e6bee4cc1e4ddc5619bf2f30d0..ce7d0b85bc17f99f78010935c16213b1264099c9 100644 (file)
--- a/tests/bits/data_out_curved_cells.cc
+++ b/tests/bits/data_out_curved_cells.cc
@@ -256,7 +256,7 @@ int main ()
                                   // to me, appears to deadlock at
                                   // times. make sure we kill it
                                   // after some time
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
   DeadlockKiller killer;
 #endif
 

diff --git a/tests/bits/fe_system.cc b/tests/bits/fe_system.cc
index dea26d124f62b996e269d10d467ec98bef4fd13c..20c09141d992bf49afd349b9b43c88a40323605b 100644 (file)
--- a/tests/bits/fe_system.cc
+++ b/tests/bits/fe_system.cc
@@ -40,7 +40,7 @@
 template<int dim>
 void test()
 {
-  #ifdef DEAL_II_USE_MT
+  #ifdef DEAL_II_WITH_THREADS
 
   DeadlockKiller killer;
   #endif

diff --git a/tests/tests.h b/tests/tests.h
index 007229b7e6c8392c7cebb4a4e21ae160e404a680..d934f20b5921c982fdb6abeca8d2583513c52e7d 100644 (file)
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -125,7 +125,7 @@ set_grain_sizes;
 //
 // the actual sleep time isn't all that important. the point is that
 // we need to kill deadlocked threads at one point, whenever that is
-#ifdef DEAL_II_USE_MT
+#ifdef DEAL_II_WITH_THREADS
 
 struct DeadlockKiller
 {