From cb9340bfd231de9313bd8e527a58852ff550f094 Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 28 Feb 2013 00:57:00 +0000 Subject: [PATCH] Fixup the testsuite as well git-svn-id: https://svn.dealii.org/branches/branch_cmake@28637 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/Makefile | 3 +-- tests/base/mutex_01.cc | 2 +- tests/bits/data_out_curved_cells.cc | 2 +- tests/bits/fe_system.cc | 2 +- tests/tests.h | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index f5d0503d22..1719d13086 100644 --- 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 7ee33043a9..ce4e08bd35 100644 --- 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 663b4c67bb..ce7d0b85bc 100644 --- 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 dea26d124f..20c09141d9 100644 --- a/tests/bits/fe_system.cc +++ b/tests/bits/fe_system.cc @@ -40,7 +40,7 @@ template 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 007229b7e6..d934f20b59 100644 --- 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 { -- 2.39.5