From: heister Date: Thu, 19 Sep 2013 20:55:47 +0000 (+0000) Subject: fix tests X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff3a3d86dfd1a38ca5153b2e54d6df8dac011ea6;p=dealii-svn.git fix tests git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30847 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/distributed_grids/2d_coarse_grid_04.cc b/tests/distributed_grids/2d_coarse_grid_04.cc index 66c4ada1dc..f92f3a52b2 100644 --- a/tests/distributed_grids/2d_coarse_grid_04.cc +++ b/tests/distributed_grids/2d_coarse_grid_04.cc @@ -36,7 +36,7 @@ void test(std::ostream & /*out*/) GridIn gi; gi.attach_triangulation (tr); - gi.read ("../bits/step-5/circle-grid.inp"); + gi.read (SOURCE_DIR "../bits/step-5/circle-grid.inp"); write_vtk(tr, "1"); } diff --git a/tests/distributed_grids/3d_coarse_grid_02.cc b/tests/distributed_grids/3d_coarse_grid_02.cc index c3d1abd922..82c1b8924c 100644 --- a/tests/distributed_grids/3d_coarse_grid_02.cc +++ b/tests/distributed_grids/3d_coarse_grid_02.cc @@ -35,7 +35,8 @@ template void test(const char *filename) { - deallog.push (filename); + const char * p = strrchr(filename,'/'); + deallog.push (p); parallel::distributed::Triangulation tr(MPI_COMM_WORLD); diff --git a/tests/distributed_grids/3d_coarse_grid_02.output b/tests/distributed_grids/3d_coarse_grid_02.output index de5f309b18..85522d3480 100644 --- a/tests/distributed_grids/3d_coarse_grid_02.output +++ b/tests/distributed_grids/3d_coarse_grid_02.output @@ -1,5 +1,5 @@ -DEAL:3d:../deal.II/grid_in_3d/1.in::Checksum: 104595457 +DEAL:3d:/1.in::Checksum: 104595457 @@ -152896,7 +152896,7 @@ DEAL:3d:../deal.II/grid_in_3d/1.in::Checksum: 104595457 -DEAL:3d:../deal.II/grid_in_3d/2.in::Checksum: 377487361 +DEAL:3d:/2.in::Checksum: 377487361 @@ -156280,7 +156280,7 @@ DEAL:3d:../deal.II/grid_in_3d/2.in::Checksum: 377487361 -DEAL:3d:../deal.II/grid_in_3d/3.in::Checksum: 2097153 +DEAL:3d:/3.in::Checksum: 2097153 @@ -156347,7 +156347,7 @@ DEAL:3d:../deal.II/grid_in_3d/3.in::Checksum: 2097153 -DEAL:3d:../deal.II/grid_in_3d/4.in::Checksum: 1613561857 +DEAL:3d:/4.in::Checksum: 1613561857 @@ -284612,7 +284612,7 @@ DEAL:3d:../deal.II/grid_in_3d/4.in::Checksum: 1613561857 -DEAL:3d:../deal.II/grid_in_3d/evil_0.in::Checksum: 10485761 +DEAL:3d:/evil_0.in::Checksum: 10485761 @@ -284752,7 +284752,7 @@ DEAL:3d:../deal.II/grid_in_3d/evil_0.in::Checksum: 10485761 -DEAL:3d:../deal.II/grid_in_3d/evil_1.in::Checksum: 10485761 +DEAL:3d:/evil_1.in::Checksum: 10485761 @@ -284892,7 +284892,7 @@ DEAL:3d:../deal.II/grid_in_3d/evil_1.in::Checksum: 10485761 -DEAL:3d:../deal.II/grid_in_3d/evil_2.in::Checksum: 10485761 +DEAL:3d:/evil_2.in::Checksum: 10485761 @@ -285032,7 +285032,7 @@ DEAL:3d:../deal.II/grid_in_3d/evil_2.in::Checksum: 10485761 -DEAL:3d:../deal.II/grid_in_3d/evil_3.in::Checksum: 10485761 +DEAL:3d:/evil_3.in::Checksum: 10485761 @@ -285172,7 +285172,7 @@ DEAL:3d:../deal.II/grid_in_3d/evil_3.in::Checksum: 10485761 -DEAL:3d:../deal.II/grid_in_3d/evil_4.in::Checksum: 10485761 +DEAL:3d:/evil_4.in::Checksum: 10485761 diff --git a/tests/distributed_grids/3d_coarse_grid_03.cc b/tests/distributed_grids/3d_coarse_grid_03.cc index 272f0ca1fb..ae664583e8 100644 --- a/tests/distributed_grids/3d_coarse_grid_03.cc +++ b/tests/distributed_grids/3d_coarse_grid_03.cc @@ -37,7 +37,7 @@ void test(std::ostream & /*out*/) GridIn gi; gi.attach_triangulation (tr); - std::ifstream in ("../bits/gerold_1.inp"); + std::ifstream in (SOURCE_DIR "../bits/gerold_1.inp"); gi.read_ucd (in); write_vtk(tr, "1"); diff --git a/tests/distributed_grids/3d_coarse_grid_04.cc b/tests/distributed_grids/3d_coarse_grid_04.cc index 0d2bf946ad..a0ebb10fbd 100644 --- a/tests/distributed_grids/3d_coarse_grid_04.cc +++ b/tests/distributed_grids/3d_coarse_grid_04.cc @@ -36,7 +36,7 @@ void test(std::ostream & /*out*/) GridIn gi; gi.attach_triangulation (tr); - gi.read ("../bits/two_cubes.inp"); + gi.read (SOURCE_DIR "../bits/two_cubes.inp"); write_vtk(tr, "1"); }