Make other necessary adjustments.

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

diff --git a/tests/deal.II/grid_in_vtk_2d.cc b/tests/deal.II/grid_in_vtk_2d.cc
index 750665f833c7651945c90cd8bb5504a79b17e4a1..3845042cf0cf482541daa44d8b4a50f5e72fceb9 100644 (file)
--- a/tests/deal.II/grid_in_vtk_2d.cc
+++ b/tests/deal.II/grid_in_vtk_2d.cc
@@ -33,7 +33,7 @@
 #include <iomanip>
 #include <string>
 
-std::ofstream logfile("grid_in_vtk_2d/output");
+std::ofstream logfile("output");
 
 
 template<int dim>
@@ -44,8 +44,7 @@ void check_file (const std::string name,
   GridIn<dim> gi;
   gi.attach_triangulation (tria);
   gi.read(name, format);
-  deallog << name
-          << '\t' << tria.n_vertices()
+  deallog << '\t' << tria.n_vertices()
           << '\t' << tria.n_cells()
           << std::endl;
 

diff --git a/tests/deal.II/grid_in_vtk_2d.output b/tests/deal.II/grid_in_vtk_2d.output
index 34d6bb61c270a91f27f632414440acd6db240e7f..f113f801e9c6892011c4942eb0a230a7be8ae3f6 100644 (file)
--- a/tests/deal.II/grid_in_vtk_2d.output
+++ b/tests/deal.II/grid_in_vtk_2d.output
@@ -1,5 +1,5 @@
 
-DEAL::grid_in_vtk_2d/mesh      4       1
+DEAL:: 4       1
 -0.50 -0.50 0 1
 0.50 -0.50 0 1
 0.50 0.50 0 1

diff --git a/tests/deal.II/grid_in_vtk_3d.cc b/tests/deal.II/grid_in_vtk_3d.cc
index ff521d5255acc5c7771c2f1dd2bdca54d452b3eb..d7baf9c943db3d73594102ee6adcc37a4988e3c9 100644 (file)
--- a/tests/deal.II/grid_in_vtk_3d.cc
+++ b/tests/deal.II/grid_in_vtk_3d.cc
@@ -33,7 +33,7 @@
 #include <iomanip>
 #include <string>
 
-std::ofstream logfile("grid_in_vtk_3d/output");
+std::ofstream logfile("output");
 
 
 template<int dim>
@@ -44,8 +44,7 @@ void check_file (const std::string name,
   GridIn<dim> gi;
   gi.attach_triangulation (tria);
   gi.read(name, format);
-  deallog << name
-          << '\t' << tria.n_vertices()
+  deallog << '\t' << tria.n_vertices()
           << '\t' << tria.n_cells()
           << std::endl;
 

diff --git a/tests/deal.II/grid_in_vtk_3d.output b/tests/deal.II/grid_in_vtk_3d.output
index a023078bb673ee9e695f314cb41d059788d2c5a4..97ff19c979338683e401b30d8c9e2823ac6b8aa9 100644 (file)
--- a/tests/deal.II/grid_in_vtk_3d.output
+++ b/tests/deal.II/grid_in_vtk_3d.output
@@ -1,5 +1,5 @@
 
-DEAL::grid_in_vtk_3d/mesh      216     125
+DEAL:: 216     125
 0.0 0.0 1.0 0 0
 1.0 0.0 1.0 0 0
 1.0 1.0 1.0 0 0