From: Bruno Turcksin Date: Mon, 26 Aug 2013 01:01:58 +0000 (+0000) Subject: Convert serialization tests to ctest. X-Git-Tag: v8.1.0~570^2~409 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=760500d31447b0f65ef24dfafab710c7cedc04f6;p=dealii.git Convert serialization tests to ctest. git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30489 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9c0fa43da7..3ea2217caf 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -90,7 +90,7 @@ ADD_SUBDIRECTORY(lac) ADD_SUBDIRECTORY(matrix_free) #mesh_converter ADD_SUBDIRECTORY(multigrid) -#serialization +ADD_SUBDIRECTORY(serialization) #distributed_grids #gla diff --git a/tests/serialization/CMakeLists.txt b/tests/serialization/CMakeLists.txt new file mode 100644 index 0000000000..0efb828f2c --- /dev/null +++ b/tests/serialization/CMakeLists.txt @@ -0,0 +1 @@ +DEAL_II_PICKUP_TESTS() diff --git a/tests/serialization/Makefile b/tests/serialization/Makefile deleted file mode 100644 index 8569c49679..0000000000 --- a/tests/serialization/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -############################################################ -# $Id$ -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors -############################################################ - -############################################################ -# Include general settings for including DEAL libraries -############################################################ - -include ../Makefile.paths -include $D/common/Make.global_options -include ../Makefile.rules --include Makefile.depend --include Makefile.tests diff --git a/tests/serialization/dof_handler_01.cc b/tests/serialization/dof_handler_01.cc index 701bbf4e14..1f4caf0a28 100644 --- a/tests/serialization/dof_handler_01.cc +++ b/tests/serialization/dof_handler_01.cc @@ -179,7 +179,7 @@ void test () int main () { - std::ofstream logfile("dof_handler_01/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/dof_handler_01/cmp/generic b/tests/serialization/dof_handler_01.output similarity index 100% rename from tests/serialization/dof_handler_01/cmp/generic rename to tests/serialization/dof_handler_01.output diff --git a/tests/serialization/parameter_handler.cc b/tests/serialization/parameter_handler.cc index 1203d69bcb..f72a69610d 100644 --- a/tests/serialization/parameter_handler.cc +++ b/tests/serialization/parameter_handler.cc @@ -121,7 +121,7 @@ void test () int main () { - std::ofstream logfile("parameter_handler/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/parameter_handler/cmp/generic b/tests/serialization/parameter_handler.output similarity index 100% rename from tests/serialization/parameter_handler/cmp/generic rename to tests/serialization/parameter_handler.output diff --git a/tests/serialization/point.cc b/tests/serialization/point.cc index 17a551afd1..9261162975 100644 --- a/tests/serialization/point.cc +++ b/tests/serialization/point.cc @@ -35,7 +35,7 @@ void test () int main () { - std::ofstream logfile("point/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/point/cmp/generic b/tests/serialization/point.output similarity index 100% rename from tests/serialization/point/cmp/generic rename to tests/serialization/point.output diff --git a/tests/serialization/pointer_01.cc b/tests/serialization/pointer_01.cc index 52a1da4ad1..0ea34cbedd 100644 --- a/tests/serialization/pointer_01.cc +++ b/tests/serialization/pointer_01.cc @@ -82,7 +82,7 @@ void test () int main () { - std::ofstream logfile("pointer_01/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/pointer_01/cmp/generic b/tests/serialization/pointer_01.output similarity index 100% rename from tests/serialization/pointer_01/cmp/generic rename to tests/serialization/pointer_01.output diff --git a/tests/serialization/pointer_02.cc b/tests/serialization/pointer_02.cc index 2307043c86..6e48a928e6 100644 --- a/tests/serialization/pointer_02.cc +++ b/tests/serialization/pointer_02.cc @@ -99,7 +99,7 @@ void test () int main () { - std::ofstream logfile("pointer_02/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/pointer_02/cmp/generic b/tests/serialization/pointer_02.output similarity index 100% rename from tests/serialization/pointer_02/cmp/generic rename to tests/serialization/pointer_02.output diff --git a/tests/serialization/pointer_03.cc b/tests/serialization/pointer_03.cc index 5d792daf39..13d247e3e2 100644 --- a/tests/serialization/pointer_03.cc +++ b/tests/serialization/pointer_03.cc @@ -107,7 +107,7 @@ void test () int main () { - std::ofstream logfile("pointer_03/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/pointer_03/cmp/generic b/tests/serialization/pointer_03.output similarity index 100% rename from tests/serialization/pointer_03/cmp/generic rename to tests/serialization/pointer_03.output diff --git a/tests/serialization/pointer_04.cc b/tests/serialization/pointer_04.cc index af662e3c52..aeba465ffd 100644 --- a/tests/serialization/pointer_04.cc +++ b/tests/serialization/pointer_04.cc @@ -112,7 +112,7 @@ void test () int main () { - std::ofstream logfile("pointer_04/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/pointer_04/cmp/generic b/tests/serialization/pointer_04.output similarity index 100% rename from tests/serialization/pointer_04/cmp/generic rename to tests/serialization/pointer_04.output diff --git a/tests/serialization/pointer_05.cc b/tests/serialization/pointer_05.cc index 8466e8c94e..64fbe76240 100644 --- a/tests/serialization/pointer_05.cc +++ b/tests/serialization/pointer_05.cc @@ -128,7 +128,7 @@ void test () int main () { - std::ofstream logfile("pointer_05/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/pointer_05/cmp/generic b/tests/serialization/pointer_05.output similarity index 100% rename from tests/serialization/pointer_05/cmp/generic rename to tests/serialization/pointer_05.output diff --git a/tests/serialization/polynomial.cc b/tests/serialization/polynomial.cc index 9981823c86..b08581b41a 100644 --- a/tests/serialization/polynomial.cc +++ b/tests/serialization/polynomial.cc @@ -44,7 +44,7 @@ void test () int main () { - std::ofstream logfile("polynomial/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/polynomial/cmp/generic b/tests/serialization/polynomial.output similarity index 100% rename from tests/serialization/polynomial/cmp/generic rename to tests/serialization/polynomial.output diff --git a/tests/serialization/polynomial_hierarchical.cc b/tests/serialization/polynomial_hierarchical.cc index 58d5c9f60a..d10fa836e4 100644 --- a/tests/serialization/polynomial_hierarchical.cc +++ b/tests/serialization/polynomial_hierarchical.cc @@ -35,7 +35,7 @@ void test () int main () { - std::ofstream logfile("polynomial_hierarchical/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/polynomial_hierarchical/cmp/generic b/tests/serialization/polynomial_hierarchical.output similarity index 100% rename from tests/serialization/polynomial_hierarchical/cmp/generic rename to tests/serialization/polynomial_hierarchical.output diff --git a/tests/serialization/polynomial_lagrange_equidistant.cc b/tests/serialization/polynomial_lagrange_equidistant.cc index 50a745e4ca..f9bd48959f 100644 --- a/tests/serialization/polynomial_lagrange_equidistant.cc +++ b/tests/serialization/polynomial_lagrange_equidistant.cc @@ -39,7 +39,7 @@ void test () int main () { - std::ofstream logfile("polynomial_lagrange_equidistant/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/polynomial_lagrange_equidistant/cmp/generic b/tests/serialization/polynomial_lagrange_equidistant.output similarity index 100% rename from tests/serialization/polynomial_lagrange_equidistant/cmp/generic rename to tests/serialization/polynomial_lagrange_equidistant.output diff --git a/tests/serialization/polynomial_lagrange_gl.cc b/tests/serialization/polynomial_lagrange_gl.cc index 262a956890..b58320ad41 100644 --- a/tests/serialization/polynomial_lagrange_gl.cc +++ b/tests/serialization/polynomial_lagrange_gl.cc @@ -43,7 +43,7 @@ void test () int main () { - std::ofstream logfile("polynomial_lagrange_gl/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/polynomial_lagrange_gl/cmp/generic b/tests/serialization/polynomial_lagrange_gl.output similarity index 100% rename from tests/serialization/polynomial_lagrange_gl/cmp/generic rename to tests/serialization/polynomial_lagrange_gl.output diff --git a/tests/serialization/polynomial_legendre.cc b/tests/serialization/polynomial_legendre.cc index 7d20429bf1..0f98384159 100644 --- a/tests/serialization/polynomial_legendre.cc +++ b/tests/serialization/polynomial_legendre.cc @@ -36,7 +36,7 @@ void test () int main () { - std::ofstream logfile("polynomial_legendre/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/polynomial_legendre/cmp/generic b/tests/serialization/polynomial_legendre.output similarity index 100% rename from tests/serialization/polynomial_legendre/cmp/generic rename to tests/serialization/polynomial_legendre.output diff --git a/tests/serialization/polynomial_lobatto.cc b/tests/serialization/polynomial_lobatto.cc index 2b76b9d4ed..a0a2fca76e 100644 --- a/tests/serialization/polynomial_lobatto.cc +++ b/tests/serialization/polynomial_lobatto.cc @@ -36,7 +36,7 @@ void test () int main () { - std::ofstream logfile("polynomial_lobatto/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/polynomial_lobatto/cmp/generic b/tests/serialization/polynomial_lobatto.output similarity index 100% rename from tests/serialization/polynomial_lobatto/cmp/generic rename to tests/serialization/polynomial_lobatto.output diff --git a/tests/serialization/polynomial_monomial.cc b/tests/serialization/polynomial_monomial.cc index 2e3d519815..335c39c216 100644 --- a/tests/serialization/polynomial_monomial.cc +++ b/tests/serialization/polynomial_monomial.cc @@ -40,7 +40,7 @@ void test () int main () { - std::ofstream logfile("polynomial_monomial/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/polynomial_monomial/cmp/generic b/tests/serialization/polynomial_monomial.output similarity index 100% rename from tests/serialization/polynomial_monomial/cmp/generic rename to tests/serialization/polynomial_monomial.output diff --git a/tests/serialization/quadrature.cc b/tests/serialization/quadrature.cc index 7533277e9b..e43e9ce631 100644 --- a/tests/serialization/quadrature.cc +++ b/tests/serialization/quadrature.cc @@ -57,7 +57,7 @@ void test () int main () { - std::ofstream logfile("quadrature/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/quadrature/cmp/generic b/tests/serialization/quadrature.output similarity index 100% rename from tests/serialization/quadrature/cmp/generic rename to tests/serialization/quadrature.output diff --git a/tests/serialization/quadrature_qanisotropic.cc b/tests/serialization/quadrature_qanisotropic.cc index 1a297e3154..e96b6ca94a 100644 --- a/tests/serialization/quadrature_qanisotropic.cc +++ b/tests/serialization/quadrature_qanisotropic.cc @@ -50,7 +50,7 @@ void test () int main () { - std::ofstream logfile("quadrature_qanisotropic/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/quadrature_qanisotropic/cmp/generic b/tests/serialization/quadrature_qanisotropic.output similarity index 100% rename from tests/serialization/quadrature_qanisotropic/cmp/generic rename to tests/serialization/quadrature_qanisotropic.output diff --git a/tests/serialization/quadrature_qiterated.cc b/tests/serialization/quadrature_qiterated.cc index 095f85f29c..2b316e9694 100644 --- a/tests/serialization/quadrature_qiterated.cc +++ b/tests/serialization/quadrature_qiterated.cc @@ -51,7 +51,7 @@ void test () int main () { - std::ofstream logfile("quadrature_qiterated/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/quadrature_qiterated/cmp/generic b/tests/serialization/quadrature_qiterated.output similarity index 100% rename from tests/serialization/quadrature_qiterated/cmp/generic rename to tests/serialization/quadrature_qiterated.output diff --git a/tests/serialization/sparsity_pattern.cc b/tests/serialization/sparsity_pattern.cc index 484495a1be..72ec6111af 100644 --- a/tests/serialization/sparsity_pattern.cc +++ b/tests/serialization/sparsity_pattern.cc @@ -44,7 +44,7 @@ void test () int main () { - std::ofstream logfile("sparsity_pattern/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/sparsity_pattern/cmp/generic b/tests/serialization/sparsity_pattern.output similarity index 100% rename from tests/serialization/sparsity_pattern/cmp/generic rename to tests/serialization/sparsity_pattern.output diff --git a/tests/serialization/symmetric_tensor.cc b/tests/serialization/symmetric_tensor.cc index 0c8e6d8b99..949cf7f8da 100644 --- a/tests/serialization/symmetric_tensor.cc +++ b/tests/serialization/symmetric_tensor.cc @@ -45,7 +45,7 @@ void test () int main () { - std::ofstream logfile("symmetric_tensor/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/symmetric_tensor/cmp/generic b/tests/serialization/symmetric_tensor.output similarity index 100% rename from tests/serialization/symmetric_tensor/cmp/generic rename to tests/serialization/symmetric_tensor.output diff --git a/tests/serialization/table_1.cc b/tests/serialization/table_1.cc index 9595034076..b66a19e29c 100644 --- a/tests/serialization/table_1.cc +++ b/tests/serialization/table_1.cc @@ -44,7 +44,7 @@ void test () int main () { - std::ofstream logfile("table_1/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/table_1/cmp/generic b/tests/serialization/table_1.output similarity index 100% rename from tests/serialization/table_1/cmp/generic rename to tests/serialization/table_1.output diff --git a/tests/serialization/table_2.cc b/tests/serialization/table_2.cc index 747f0b2141..e0bf35a5c8 100644 --- a/tests/serialization/table_2.cc +++ b/tests/serialization/table_2.cc @@ -52,7 +52,7 @@ void test () int main () { - std::ofstream logfile("table_2/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/table_2/cmp/generic b/tests/serialization/table_2.output similarity index 100% rename from tests/serialization/table_2/cmp/generic rename to tests/serialization/table_2.output diff --git a/tests/serialization/table_3.cc b/tests/serialization/table_3.cc index 74fa47dad7..2362258554 100644 --- a/tests/serialization/table_3.cc +++ b/tests/serialization/table_3.cc @@ -57,7 +57,7 @@ void test () int main () { - std::ofstream logfile("table_3/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/table_3/cmp/generic b/tests/serialization/table_3.output similarity index 100% rename from tests/serialization/table_3/cmp/generic rename to tests/serialization/table_3.output diff --git a/tests/serialization/table_4.cc b/tests/serialization/table_4.cc index d73e8dd9f2..a30ee30eb3 100644 --- a/tests/serialization/table_4.cc +++ b/tests/serialization/table_4.cc @@ -61,7 +61,7 @@ void test () int main () { - std::ofstream logfile("table_4/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/table_4/cmp/generic b/tests/serialization/table_4.output similarity index 100% rename from tests/serialization/table_4/cmp/generic rename to tests/serialization/table_4.output diff --git a/tests/serialization/table_5.cc b/tests/serialization/table_5.cc index 10d475b640..fb5814aa6b 100644 --- a/tests/serialization/table_5.cc +++ b/tests/serialization/table_5.cc @@ -64,7 +64,7 @@ void test () int main () { - std::ofstream logfile("table_5/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/table_5/cmp/generic b/tests/serialization/table_5.output similarity index 100% rename from tests/serialization/table_5/cmp/generic rename to tests/serialization/table_5.output diff --git a/tests/serialization/table_6.cc b/tests/serialization/table_6.cc index 1c74b8e0be..404c41790e 100644 --- a/tests/serialization/table_6.cc +++ b/tests/serialization/table_6.cc @@ -71,7 +71,7 @@ void test () int main () { - std::ofstream logfile("table_6/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/table_6/cmp/generic b/tests/serialization/table_6.output similarity index 100% rename from tests/serialization/table_6/cmp/generic rename to tests/serialization/table_6.output diff --git a/tests/serialization/table_7.cc b/tests/serialization/table_7.cc index dfdaaaeecd..d152ee4954 100644 --- a/tests/serialization/table_7.cc +++ b/tests/serialization/table_7.cc @@ -74,7 +74,7 @@ void test () int main () { - std::ofstream logfile("table_7/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/table_7/cmp/generic b/tests/serialization/table_7.output similarity index 100% rename from tests/serialization/table_7/cmp/generic rename to tests/serialization/table_7.output diff --git a/tests/serialization/table_handler.cc b/tests/serialization/table_handler.cc index 2e11dda485..69c8c27654 100644 --- a/tests/serialization/table_handler.cc +++ b/tests/serialization/table_handler.cc @@ -58,7 +58,7 @@ void test () int main () { - std::ofstream logfile("table_handler/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/table_handler/cmp/generic b/tests/serialization/table_handler.output similarity index 100% rename from tests/serialization/table_handler/cmp/generic rename to tests/serialization/table_handler.output diff --git a/tests/serialization/tensor.cc b/tests/serialization/tensor.cc index 4caf7cc783..e4ed7b0631 100644 --- a/tests/serialization/tensor.cc +++ b/tests/serialization/tensor.cc @@ -52,7 +52,7 @@ void test () int main () { - std::ofstream logfile("tensor/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/tensor/cmp/generic b/tests/serialization/tensor.output similarity index 100% rename from tests/serialization/tensor/cmp/generic rename to tests/serialization/tensor.output diff --git a/tests/serialization/tensor_base.cc b/tests/serialization/tensor_base.cc index 44d6176a98..764fda7a10 100644 --- a/tests/serialization/tensor_base.cc +++ b/tests/serialization/tensor_base.cc @@ -37,7 +37,7 @@ void test () int main () { - std::ofstream logfile("tensor_base/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/tensor_base/cmp/generic b/tests/serialization/tensor_base.output similarity index 100% rename from tests/serialization/tensor_base/cmp/generic rename to tests/serialization/tensor_base.output diff --git a/tests/serialization/tensor_base_scalar.cc b/tests/serialization/tensor_base_scalar.cc index ad97ecff1c..3aa36a178b 100644 --- a/tests/serialization/tensor_base_scalar.cc +++ b/tests/serialization/tensor_base_scalar.cc @@ -36,7 +36,7 @@ void test () int main () { - std::ofstream logfile("tensor_base_scalar/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/tensor_base_scalar/cmp/generic b/tests/serialization/tensor_base_scalar.output similarity index 100% rename from tests/serialization/tensor_base_scalar/cmp/generic rename to tests/serialization/tensor_base_scalar.output diff --git a/tests/serialization/test_01.cc b/tests/serialization/test_01.cc index 1be9c3bee6..1f638c0a3e 100644 --- a/tests/serialization/test_01.cc +++ b/tests/serialization/test_01.cc @@ -71,7 +71,7 @@ void test () int main () { - std::ofstream logfile("test_01/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/test_01/cmp/generic b/tests/serialization/test_01.output similarity index 100% rename from tests/serialization/test_01/cmp/generic rename to tests/serialization/test_01.output diff --git a/tests/serialization/triangulation_01.cc b/tests/serialization/triangulation_01.cc index 628c3b9e54..c12557e369 100644 --- a/tests/serialization/triangulation_01.cc +++ b/tests/serialization/triangulation_01.cc @@ -147,7 +147,7 @@ void test () int main () { - std::ofstream logfile("triangulation_01/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/triangulation_01/cmp/generic b/tests/serialization/triangulation_01.output similarity index 100% rename from tests/serialization/triangulation_01/cmp/generic rename to tests/serialization/triangulation_01.output diff --git a/tests/serialization/triangulation_02.cc b/tests/serialization/triangulation_02.cc index bb5e9067e0..a6e3c1c16c 100644 --- a/tests/serialization/triangulation_02.cc +++ b/tests/serialization/triangulation_02.cc @@ -159,7 +159,7 @@ void test () int main () { - std::ofstream logfile("triangulation_02/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/triangulation_02/cmp/generic b/tests/serialization/triangulation_02.output similarity index 100% rename from tests/serialization/triangulation_02/cmp/generic rename to tests/serialization/triangulation_02.output diff --git a/tests/serialization/vector.cc b/tests/serialization/vector.cc index 9367c5959c..ee981c6f72 100644 --- a/tests/serialization/vector.cc +++ b/tests/serialization/vector.cc @@ -45,7 +45,7 @@ void test () int main () { - std::ofstream logfile("vector/output"); + std::ofstream logfile("output"); deallog << std::setprecision(3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/serialization/vector/cmp/generic b/tests/serialization/vector.output similarity index 100% rename from tests/serialization/vector/cmp/generic rename to tests/serialization/vector.output