From 60b432698b0656d1d3d0a5f36f6c09734d19d9f0 Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Tue, 27 Aug 2013 19:15:43 +0000 Subject: [PATCH] Convert fail tests to ctest. git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30509 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/CMakeLists.txt | 3 ++- tests/fail/CMakeLists.txt | 1 + tests/fail/Makefile | 10 ---------- tests/fail/abf_approximation_01.cc | 2 +- tests/fail/circular_01.cc | 2 +- tests/fail/fe_nothing_04.cc | 2 +- tests/fail/hp_constraints_q_08.cc | 2 +- tests/fail/hp_constraints_q_system_08.cc | 2 +- tests/fail/hp_constraints_q_system_x_08.cc | 2 +- tests/fail/hp_constraints_rt_01.cc | 2 +- tests/fail/hp_constraints_rt_02.cc | 2 +- tests/fail/hp_constraints_rt_03.cc | 2 +- tests/fail/hp_constraints_rt_04.cc | 2 +- tests/fail/hp_constraints_rt_05.cc | 2 +- tests/fail/hp_constraints_rt_06.cc | 2 +- tests/fail/injection_dgp.cc | 2 +- tests/fail/injection_dgp_nonparametric.cc | 2 +- tests/fail/injection_nedelec.cc | 2 +- tests/fail/injection_q_hierarchical.cc | 2 +- tests/fail/injection_rt.cc | 2 +- tests/fail/project_abf_01.cc | 2 +- tests/fail/project_abf_02.cc | 2 +- tests/fail/project_abf_03.cc | 2 +- tests/fail/project_abf_04.cc | 2 +- tests/fail/project_abf_05.cc | 2 +- tests/fail/project_dgp_nonparametric_01.cc | 2 +- tests/fail/project_dgp_nonparametric_02.cc | 2 +- tests/fail/project_dgp_nonparametric_03.cc | 2 +- tests/fail/project_dgp_nonparametric_04.cc | 2 +- tests/fail/project_dgp_nonparametric_05.cc | 2 +- tests/fail/project_rt_03.cc | 2 +- tests/fail/rt_4.cc | 2 +- tests/fail/rt_6.cc | 2 +- tests/fail/rt_crash_01.cc | 2 +- tests/fail/rt_distorted_01.cc | 2 +- tests/fail/rt_distorted_02.cc | 2 +- tests/fail/vectors_boundary_rhs_hp_02.cc | 2 +- tests/fail/vectors_rhs_hp_02.cc | 2 +- 38 files changed, 38 insertions(+), 46 deletions(-) create mode 100644 tests/fail/CMakeLists.txt delete mode 100644 tests/fail/Makefile diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4c1d6234d1..f07834677a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -78,7 +78,7 @@ ADD_SUBDIRECTORY(base) ADD_SUBDIRECTORY(bits) ADD_SUBDIRECTORY(codim_one) ADD_SUBDIRECTORY(deal.II) -#fail +ADD_SUBDIRECTORY(fail) ADD_SUBDIRECTORY(fe) ADD_SUBDIRECTORY(grid) ADD_SUBDIRECTORY(hp) @@ -88,6 +88,7 @@ ADD_SUBDIRECTORY(matrix_free) ADD_SUBDIRECTORY(multigrid) ADD_SUBDIRECTORY(serialization) +# These three are a little bit special #all-headers #benchmarks #mesh_converter diff --git a/tests/fail/CMakeLists.txt b/tests/fail/CMakeLists.txt new file mode 100644 index 0000000000..0efb828f2c --- /dev/null +++ b/tests/fail/CMakeLists.txt @@ -0,0 +1 @@ +DEAL_II_PICKUP_TESTS() diff --git a/tests/fail/Makefile b/tests/fail/Makefile deleted file mode 100644 index 67c80c3edf..0000000000 --- a/tests/fail/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -############################################################ -# Makefile,v 1.15 2002/06/13 12:51:13 hartmann Exp -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2010 by the deal.II authors -############################################################ - -include ../Makefile.paths -include $D/common/Make.global_options -include ../Makefile.rules --include Makefile.depend --include Makefile.tests diff --git a/tests/fail/abf_approximation_01.cc b/tests/fail/abf_approximation_01.cc index 4dc074505a..65640ff9f0 100644 --- a/tests/fail/abf_approximation_01.cc +++ b/tests/fail/abf_approximation_01.cc @@ -32,7 +32,7 @@ #include -std::ofstream logfile ("abf_approximation_01/output"); +std::ofstream logfile ("output"); char buf[1000]; diff --git a/tests/fail/circular_01.cc b/tests/fail/circular_01.cc index 7bdbe717d9..98f2d3be5a 100644 --- a/tests/fail/circular_01.cc +++ b/tests/fail/circular_01.cc @@ -18,7 +18,7 @@ // a modified version of step-27 that crashes due to circular constraints -char logname[] = "circular_01/output"; +char logname[] = "output"; #include "../tests.h" diff --git a/tests/fail/fe_nothing_04.cc b/tests/fail/fe_nothing_04.cc index 9bdfe25f98..2c81ce60f2 100644 --- a/tests/fail/fe_nothing_04.cc +++ b/tests/fail/fe_nothing_04.cc @@ -99,7 +99,7 @@ void test () int main () { - std::ofstream logfile("fe_nothing_04/output"); + std::ofstream logfile("output"); logfile.precision(2); deallog.attach(logfile); diff --git a/tests/fail/hp_constraints_q_08.cc b/tests/fail/hp_constraints_q_08.cc index eb5c6bdf49..66549f8150 100644 --- a/tests/fail/hp_constraints_q_08.cc +++ b/tests/fail/hp_constraints_q_08.cc @@ -18,7 +18,7 @@ // check that computation of hp constraints works for Q elements correctly -char logname[] = "hp_constraints_q_08/output"; +char logname[] = "output"; #include "../hp/hp_constraints_common.h" diff --git a/tests/fail/hp_constraints_q_system_08.cc b/tests/fail/hp_constraints_q_system_08.cc index 40c046a755..d440fcc8f1 100644 --- a/tests/fail/hp_constraints_q_system_08.cc +++ b/tests/fail/hp_constraints_q_system_08.cc @@ -19,7 +19,7 @@ // check that computation of hp constraints works for FESystem(FE_Q) elements correctly // on a uniformly refined mesh for functions of degree q -char logname[] = "hp_constraints_q_system_08/output"; +char logname[] = "output"; #include "../hp/hp_constraints_common.h" diff --git a/tests/fail/hp_constraints_q_system_x_08.cc b/tests/fail/hp_constraints_q_system_x_08.cc index 0434b1f8a4..9cef4dc01e 100644 --- a/tests/fail/hp_constraints_q_system_x_08.cc +++ b/tests/fail/hp_constraints_q_system_x_08.cc @@ -22,7 +22,7 @@ // these tests check that we can deal with FESystem(FE_Q(p),FE_DGQ(q)) for // different p,q -char logname[] = "hp_constraints_q_system_x_08/output"; +char logname[] = "output"; #include "../hp/hp_constraints_common.h" diff --git a/tests/fail/hp_constraints_rt_01.cc b/tests/fail/hp_constraints_rt_01.cc index dfda7338c6..19771e8837 100644 --- a/tests/fail/hp_constraints_rt_01.cc +++ b/tests/fail/hp_constraints_rt_01.cc @@ -18,7 +18,7 @@ // check that computation of hp constraints works for RT elements correctly -char logname[] = "hp_constraints_rt_01/output"; +char logname[] = "output"; #include "../hp/hp_constraints_common.h" diff --git a/tests/fail/hp_constraints_rt_02.cc b/tests/fail/hp_constraints_rt_02.cc index ebb4ae05db..cd840857ce 100644 --- a/tests/fail/hp_constraints_rt_02.cc +++ b/tests/fail/hp_constraints_rt_02.cc @@ -18,7 +18,7 @@ // check that computation of hp constraints works for RT elements correctly -char logname[] = "hp_constraints_rt_02/output"; +char logname[] = "output"; #include "../hp/hp_constraints_common.h" diff --git a/tests/fail/hp_constraints_rt_03.cc b/tests/fail/hp_constraints_rt_03.cc index 2fba2ce0f1..affc976456 100644 --- a/tests/fail/hp_constraints_rt_03.cc +++ b/tests/fail/hp_constraints_rt_03.cc @@ -18,7 +18,7 @@ // check that computation of hp constraints works for RT elements correctly -char logname[] = "hp_constraints_rt_03/output"; +char logname[] = "output"; #include "../hp/hp_constraints_common.h" diff --git a/tests/fail/hp_constraints_rt_04.cc b/tests/fail/hp_constraints_rt_04.cc index 808e1ea861..283ee4971f 100644 --- a/tests/fail/hp_constraints_rt_04.cc +++ b/tests/fail/hp_constraints_rt_04.cc @@ -18,7 +18,7 @@ // check that computation of hp constraints works for RT elements correctly -char logname[] = "hp_constraints_rt_04/output"; +char logname[] = "output"; #include "../hp/hp_constraints_common.h" diff --git a/tests/fail/hp_constraints_rt_05.cc b/tests/fail/hp_constraints_rt_05.cc index e5a7dd7042..c728520bd1 100644 --- a/tests/fail/hp_constraints_rt_05.cc +++ b/tests/fail/hp_constraints_rt_05.cc @@ -18,7 +18,7 @@ // check that computation of hp constraints works for RT elements correctly -char logname[] = "hp_constraints_rt_05/output"; +char logname[] = "output"; #include "../hp/hp_constraints_common.h" diff --git a/tests/fail/hp_constraints_rt_06.cc b/tests/fail/hp_constraints_rt_06.cc index 814d0a72d5..7a70ffafff 100644 --- a/tests/fail/hp_constraints_rt_06.cc +++ b/tests/fail/hp_constraints_rt_06.cc @@ -18,7 +18,7 @@ // check that computation of hp constraints works for RT elements correctly -char logname[] = "hp_constraints_rt_06/output"; +char logname[] = "output"; #include "../hp/hp_constraints_common.h" diff --git a/tests/fail/injection_dgp.cc b/tests/fail/injection_dgp.cc index f342d6a773..3908b1eea5 100644 --- a/tests/fail/injection_dgp.cc +++ b/tests/fail/injection_dgp.cc @@ -16,7 +16,7 @@ -char logname[] = "injection_dgp/output"; +char logname[] = "output"; #include "../fe/injection_common.h" diff --git a/tests/fail/injection_dgp_nonparametric.cc b/tests/fail/injection_dgp_nonparametric.cc index 9be137ec62..cd2e366160 100644 --- a/tests/fail/injection_dgp_nonparametric.cc +++ b/tests/fail/injection_dgp_nonparametric.cc @@ -16,7 +16,7 @@ -char logname[] = "injection_dgp_nonparametric/output"; +char logname[] = "output"; #include "../fe/injection_common.h" diff --git a/tests/fail/injection_nedelec.cc b/tests/fail/injection_nedelec.cc index c11ee8fbac..67b50726b9 100644 --- a/tests/fail/injection_nedelec.cc +++ b/tests/fail/injection_nedelec.cc @@ -16,7 +16,7 @@ -char logname[] = "injection_nedelec/output"; +char logname[] = "output"; #include "../fe/injection_common.h" diff --git a/tests/fail/injection_q_hierarchical.cc b/tests/fail/injection_q_hierarchical.cc index a250abe418..a3a3c409ec 100644 --- a/tests/fail/injection_q_hierarchical.cc +++ b/tests/fail/injection_q_hierarchical.cc @@ -16,7 +16,7 @@ -char logname[] = "injection_q_hierarchical/output"; +char logname[] = "output"; #include "../fe/injection_common.h" diff --git a/tests/fail/injection_rt.cc b/tests/fail/injection_rt.cc index b982c62d23..0093f7bf60 100644 --- a/tests/fail/injection_rt.cc +++ b/tests/fail/injection_rt.cc @@ -16,7 +16,7 @@ -char logname[] = "injection_rt/output"; +char logname[] = "output"; #include "../fe/injection_common.h" diff --git a/tests/fail/project_abf_01.cc b/tests/fail/project_abf_01.cc index 696107443f..8ebc5a16dd 100644 --- a/tests/fail/project_abf_01.cc +++ b/tests/fail/project_abf_01.cc @@ -18,7 +18,7 @@ // check that VectorTools::project works for ABF elements correctly -char logname[] = "project_abf_01/output"; +char logname[] = "output"; #include "../deal.II/project_common.h" diff --git a/tests/fail/project_abf_02.cc b/tests/fail/project_abf_02.cc index 1e76b2417b..71a4202844 100644 --- a/tests/fail/project_abf_02.cc +++ b/tests/fail/project_abf_02.cc @@ -18,7 +18,7 @@ // check that VectorTools::project works for ABF elements correctly -char logname[] = "project_abf_02/output"; +char logname[] = "output"; #include "../deal.II/project_common.h" diff --git a/tests/fail/project_abf_03.cc b/tests/fail/project_abf_03.cc index de47f4a666..5654a81900 100644 --- a/tests/fail/project_abf_03.cc +++ b/tests/fail/project_abf_03.cc @@ -18,7 +18,7 @@ // check that VectorTools::project works for ABF elements correctly -char logname[] = "project_abf_03/output"; +char logname[] = "output"; #include "../deal.II/project_common.h" diff --git a/tests/fail/project_abf_04.cc b/tests/fail/project_abf_04.cc index 2206a0b780..e507b86cec 100644 --- a/tests/fail/project_abf_04.cc +++ b/tests/fail/project_abf_04.cc @@ -18,7 +18,7 @@ // check that VectorTools::project works for ABF elements correctly -char logname[] = "project_abf_04/output"; +char logname[] = "output"; #include "../deal.II/project_common.h" diff --git a/tests/fail/project_abf_05.cc b/tests/fail/project_abf_05.cc index 050c873de6..ff6be6f5af 100644 --- a/tests/fail/project_abf_05.cc +++ b/tests/fail/project_abf_05.cc @@ -18,7 +18,7 @@ // check that VectorTools::project works for ABF elements correctly -char logname[] = "project_abf_05/output"; +char logname[] = "output"; #include "../deal.II/project_common.h" diff --git a/tests/fail/project_dgp_nonparametric_01.cc b/tests/fail/project_dgp_nonparametric_01.cc index 457ac81bea..ba34637d96 100644 --- a/tests/fail/project_dgp_nonparametric_01.cc +++ b/tests/fail/project_dgp_nonparametric_01.cc @@ -19,7 +19,7 @@ // check that VectorTools::project works for DGPNonparametric elements // correctly on a uniformly refined mesh for functions of degree q -char logname[] = "project_dgp_nonparametric_01/output"; +char logname[] = "output"; #include "../deal.II/project_common.h" diff --git a/tests/fail/project_dgp_nonparametric_02.cc b/tests/fail/project_dgp_nonparametric_02.cc index 434c750ac7..0b8db90647 100644 --- a/tests/fail/project_dgp_nonparametric_02.cc +++ b/tests/fail/project_dgp_nonparametric_02.cc @@ -19,7 +19,7 @@ // check that VectorTools::project works for DGPNonparametric elements // correctly on a uniformly refined mesh for functions of degree q -char logname[] = "project_dgp_nonparametric_02/output"; +char logname[] = "output"; #include "../deal.II/project_common.h" diff --git a/tests/fail/project_dgp_nonparametric_03.cc b/tests/fail/project_dgp_nonparametric_03.cc index e7e22929c3..f4d21ef8c0 100644 --- a/tests/fail/project_dgp_nonparametric_03.cc +++ b/tests/fail/project_dgp_nonparametric_03.cc @@ -19,7 +19,7 @@ // check that VectorTools::project works for DGPNonparametric elements // correctly on a uniformly refined mesh for functions of degree q -char logname[] = "project_dgp_nonparametric_03/output"; +char logname[] = "output"; #include "../deal.II/project_common.h" diff --git a/tests/fail/project_dgp_nonparametric_04.cc b/tests/fail/project_dgp_nonparametric_04.cc index e6b91fc994..951464402f 100644 --- a/tests/fail/project_dgp_nonparametric_04.cc +++ b/tests/fail/project_dgp_nonparametric_04.cc @@ -19,7 +19,7 @@ // check that VectorTools::project works for DGPNonparametric elements // correctly on a uniformly refined mesh for functions of degree q -char logname[] = "project_dgp_nonparametric_04/output"; +char logname[] = "output"; #include "../deal.II/project_common.h" diff --git a/tests/fail/project_dgp_nonparametric_05.cc b/tests/fail/project_dgp_nonparametric_05.cc index 59b7fece76..7e3600e554 100644 --- a/tests/fail/project_dgp_nonparametric_05.cc +++ b/tests/fail/project_dgp_nonparametric_05.cc @@ -19,7 +19,7 @@ // check that VectorTools::project works for DGPNonparametric elements // correctly on a uniformly refined mesh for functions of degree q -char logname[] = "project_dgp_nonparametric_05/output"; +char logname[] = "output"; #include "../deal.II/project_common.h" diff --git a/tests/fail/project_rt_03.cc b/tests/fail/project_rt_03.cc index d064cb95e6..49d8ffb800 100644 --- a/tests/fail/project_rt_03.cc +++ b/tests/fail/project_rt_03.cc @@ -18,7 +18,7 @@ // check that VectorTools::project works for RT elements correctly -char logname[] = "project_rt_03/output"; +char logname[] = "output"; #include "../deal.II/project_common.h" diff --git a/tests/fail/rt_4.cc b/tests/fail/rt_4.cc index ecd0534ae9..3431b46a24 100644 --- a/tests/fail/rt_4.cc +++ b/tests/fail/rt_4.cc @@ -57,7 +57,7 @@ test(const unsigned int degree) int main() { - std::ofstream logfile ("rt_4/output"); + std::ofstream logfile ("output"); logfile.precision (PRECISION); logfile.setf(std::ios::fixed); deallog.attach(logfile); diff --git a/tests/fail/rt_6.cc b/tests/fail/rt_6.cc index 2834535ee4..68f288752c 100644 --- a/tests/fail/rt_6.cc +++ b/tests/fail/rt_6.cc @@ -163,7 +163,7 @@ void test () int main() { - std::ofstream logfile ("rt_6/output"); + std::ofstream logfile ("output"); logfile.precision (PRECISION); logfile.setf(std::ios::fixed); deallog.attach(logfile); diff --git a/tests/fail/rt_crash_01.cc b/tests/fail/rt_crash_01.cc index df6c51dfb3..ef064750dc 100644 --- a/tests/fail/rt_crash_01.cc +++ b/tests/fail/rt_crash_01.cc @@ -29,7 +29,7 @@ // elements, when computing some sort of edge directions. This is the // case left over from dof_tools_19 -std::string output_file_name = "rt_crash_01/output"; +std::string output_file_name = "output"; template diff --git a/tests/fail/rt_distorted_01.cc b/tests/fail/rt_distorted_01.cc index 41a563b1d0..7e5606c857 100644 --- a/tests/fail/rt_distorted_01.cc +++ b/tests/fail/rt_distorted_01.cc @@ -29,7 +29,7 @@ #include -std::ofstream logfile ("rt_distorted_01/output"); +std::ofstream logfile ("output"); #include diff --git a/tests/fail/rt_distorted_02.cc b/tests/fail/rt_distorted_02.cc index 06e5b0b171..fcea025916 100644 --- a/tests/fail/rt_distorted_02.cc +++ b/tests/fail/rt_distorted_02.cc @@ -29,7 +29,7 @@ #include -std::ofstream logfile ("rt_distorted_02/output"); +std::ofstream logfile ("output"); char buf[1000]; diff --git a/tests/fail/vectors_boundary_rhs_hp_02.cc b/tests/fail/vectors_boundary_rhs_hp_02.cc index 1483a08b2f..44a8714d9e 100644 --- a/tests/fail/vectors_boundary_rhs_hp_02.cc +++ b/tests/fail/vectors_boundary_rhs_hp_02.cc @@ -119,7 +119,7 @@ check () int main () { - std::ofstream logfile ("vectors_boundary_rhs_hp_02/output"); + std::ofstream logfile ("output"); logfile.precision (4); logfile.setf(std::ios::fixed); deallog.attach(logfile); diff --git a/tests/fail/vectors_rhs_hp_02.cc b/tests/fail/vectors_rhs_hp_02.cc index 8a032743c8..574547fb23 100644 --- a/tests/fail/vectors_rhs_hp_02.cc +++ b/tests/fail/vectors_rhs_hp_02.cc @@ -119,7 +119,7 @@ check () int main () { - std::ofstream logfile ("vectors_rhs_hp_02/output"); + std::ofstream logfile ("output"); logfile.precision (4); logfile.setf(std::ios::fixed); deallog.attach(logfile); -- 2.39.5