Merge again from mainline.

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

diff --cc tests/base/graph_coloring_01.cc
index ca85c82d9e7f9d7e0f1ef81a35089360fe428423,9a0a79d74543466268acaf7952484d18290c55e9..ed4be3f13779d0be7cdeb93562ebde332bd8dd72
--- 1/tests/base/graph_coloring_01.cc
--- 2/tests/base/graph_coloring_01.cc
+++ b/tests/base/graph_coloring_01.cc
@@@ -59,7 -59,7 +59,7 @@@ void check(
    std::vector<std::vector<typename DoFHandler<dim>::active_cell_iterator> > coloring(
        graph_coloring::make_graph_coloring(cell,dof_handler.end(),
        std_cxx1x::function<std::vector<types::global_dof_index> (typename 
--        DoFHandler<dim>::active_cell_iterator const &)> (get_conflict_indices_cfem<dim>)));      
++        DoFHandler<dim>::active_cell_iterator const &)> (&get_conflict_indices_cfem<dim>)));      
  
    // Output the coloring
    for (unsigned int color=0; color<coloring.size(); ++color)

diff --cc tests/base/graph_coloring_02.cc
index 6fdd5216e614d48f20843110ca6be2d336d47655,56aae036ea7d7e2fe6cf0426c8f5377cb581e6b5..456732eb3656c52f36720d18c38e60cc315d5a49
--- 1/tests/base/graph_coloring_02.cc
--- 2/tests/base/graph_coloring_02.cc
+++ b/tests/base/graph_coloring_02.cc
@@@ -69,7 -69,7 +69,7 @@@ void check(
    std::vector<std::vector<typename DoFHandler<dim>::active_cell_iterator> > coloring(
        graph_coloring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(),
          std_cxx1x::function<std::vector<types::global_dof_index> (typename 
--          DoFHandler<dim>::active_cell_iterator const &)> (get_conflict_indices_cfem<dim>)));
++          DoFHandler<dim>::active_cell_iterator const &)> (&get_conflict_indices_cfem<dim>)));
  
    // Output the coloring
    for (unsigned int color=0; color<coloring.size(); ++color)

diff --cc tests/base/graph_coloring_03.cc
index 0a72963b4028e37367f8963c6724ca2ac858136d,812bb7fdf9743e0cc6427d2baaf618cf7cca89cc..3db85f0e9f2ced4bb9cc18a1e6209f7a8149e6eb
--- 1/tests/base/graph_coloring_03.cc
--- 2/tests/base/graph_coloring_03.cc
+++ b/tests/base/graph_coloring_03.cc
@@@ -71,7 -71,7 +71,7 @@@ void check(
    std::vector<std::vector<typename hp::DoFHandler<dim>::active_cell_iterator> > coloring(
        graph_coloring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(),
          std_cxx1x::function<std::vector<types::global_dof_index> (typename 
--          hp::DoFHandler<dim>::active_cell_iterator const &)> (get_conflict_indices_cfem<dim>)));
++          hp::DoFHandler<dim>::active_cell_iterator const &)> (&get_conflict_indices_cfem<dim>)));
  
    // Output the coloring
    for (unsigned int color=0; color<coloring.size(); ++color)

diff --cc tests/lac/sparse_matrices.cc
index 07fc908ca6b032b9dc2522fb0147e027d9ca81b6,60479f158c8505ddb0df2cc0fb977e2bd88756d7..e194b05555370f8f8b166ae33440b6f614b2661a
--- 1/tests/lac/sparse_matrices.cc
--- 2/tests/lac/sparse_matrices.cc
+++ b/tests/lac/sparse_matrices.cc
@@@ -279,6 -279,6 +279,7 @@@ int main(
    logfile << std::setprecision(3);
    deallog << std::setprecision(3);
    deallog.attach(logfile);
++  deallog.depth_console (0);
  
    // Switch between regression test
    // and benchmark