From: Matthias Maier <tamiko@43-1.org>
Date: Sun, 21 Jul 2024 11:35:56 +0000 (-0500)
Subject: tests: fix tests failing due to pathsearch changes
X-Git-Tag: v9.6.0-rc1~47^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed949a718d897a85dd3254cd6597803a4dcf4716;p=dealii.git

tests: fix tests failing due to pathsearch changes
---

diff --git a/tests/grid/grid_in.cc b/tests/grid/grid_in.cc
index d612dbe6d9..c6f16a2b70 100644
--- a/tests/grid/grid_in.cc
+++ b/tests/grid/grid_in.cc
@@ -133,8 +133,8 @@ check_file(const std::string name, typename GridIn<dim>::Format format)
 void
 filename_resolution()
 {
-  check_file<2>(std::string(SOURCE_DIR "/grid_in/2d"), GridIn<2>::ucd);
-  check_file<2>(std::string(SOURCE_DIR "/grid_in/2d"), GridIn<2>::xda);
+  check_file<2>(std::string(SOURCE_DIR "/grid_in/2d.inp"), GridIn<2>::ucd);
+  check_file<2>(std::string(SOURCE_DIR "/grid_in/2d.xda"), GridIn<2>::xda);
 }
 
 
diff --git a/tests/grid/grid_in_msh.cc b/tests/grid/grid_in_msh.cc
index 3b1379989e..759b5cf3c3 100644
--- a/tests/grid/grid_in_msh.cc
+++ b/tests/grid/grid_in_msh.cc
@@ -46,7 +46,8 @@ check_file(const std::string name, typename GridIn<dim>::Format format)
 void
 filename_resolution()
 {
-  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh/mesh"), GridIn<2>::msh);
+  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh/mesh.msh"),
+                GridIn<2>::msh);
 }
 
 
diff --git a/tests/grid/grid_in_msh_03.cc b/tests/grid/grid_in_msh_03.cc
index 47a94a9e8a..0766aebe84 100644
--- a/tests/grid/grid_in_msh_03.cc
+++ b/tests/grid/grid_in_msh_03.cc
@@ -51,7 +51,8 @@ check_file(const std::string name, typename GridIn<dim>::Format format)
 void
 filename_resolution()
 {
-  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh_03/mesh"), GridIn<2>::msh);
+  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh_03/mesh.msh"),
+                GridIn<2>::msh);
 }
 
 
diff --git a/tests/grid/grid_in_msh_03.output b/tests/grid/grid_in_msh_03.output
index 63861ee6cc..61b392e270 100644
--- a/tests/grid/grid_in_msh_03.output
+++ b/tests/grid/grid_in_msh_03.output
@@ -1,5 +1,5 @@
 
-DEAL::grid_in_msh_03/mesh	100	81
+DEAL::grid_in_msh_03/mesh.msh	100	81
 0.0 0.0 0 2
 2.2 0.0 0 2
 2.2 1.1 0 2
diff --git a/tests/grid/grid_in_msh_03_v4.cc b/tests/grid/grid_in_msh_03_v4.cc
index 7eb0e76318..70e41875d3 100644
--- a/tests/grid/grid_in_msh_03_v4.cc
+++ b/tests/grid/grid_in_msh_03_v4.cc
@@ -53,7 +53,7 @@ check_file(const std::string name, typename GridIn<dim>::Format format)
 void
 filename_resolution()
 {
-  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh_03_v4/mesh"),
+  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh_03_v4/mesh.msh"),
                 GridIn<2>::msh);
 }
 
diff --git a/tests/grid/grid_in_msh_03_v4.output b/tests/grid/grid_in_msh_03_v4.output
index 0915ff09d9..5c06c33746 100644
--- a/tests/grid/grid_in_msh_03_v4.output
+++ b/tests/grid/grid_in_msh_03_v4.output
@@ -1,5 +1,5 @@
 
-DEAL::grid_in_msh_03_v4/mesh	100	81
+DEAL::grid_in_msh_03_v4/mesh.msh	100	81
 0 0 0 2
 2.2 0 0 2
 2.2 1.1 0 2
diff --git a/tests/grid/grid_in_msh_v4.cc b/tests/grid/grid_in_msh_v4.cc
index 99ad5952b0..433b464264 100644
--- a/tests/grid/grid_in_msh_v4.cc
+++ b/tests/grid/grid_in_msh_v4.cc
@@ -48,7 +48,8 @@ check_file(const std::string name, typename GridIn<dim>::Format format)
 void
 filename_resolution()
 {
-  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh_v4/mesh"), GridIn<2>::msh);
+  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh_v4/mesh.msh"),
+                GridIn<2>::msh);
 }
 
 
diff --git a/tests/grid/grid_in_msh_version_1.cc b/tests/grid/grid_in_msh_version_1.cc
index 1b2a9f9783..cefa66301a 100644
--- a/tests/grid/grid_in_msh_version_1.cc
+++ b/tests/grid/grid_in_msh_version_1.cc
@@ -52,9 +52,9 @@ check_file(const std::string name, typename GridIn<dim>::Format format)
 void
 filename_resolution()
 {
-  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh_version_1/input_v1"),
+  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh_version_1/input_v1.msh"),
                 GridIn<2>::msh);
-  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh_version_1/input_v2"),
+  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh_version_1/input_v2.msh"),
                 GridIn<2>::msh);
 }
 
diff --git a/tests/grid/grid_in_msh_version_1.output b/tests/grid/grid_in_msh_version_1.output
index 1dbaa89cba..3a9661a831 100644
--- a/tests/grid/grid_in_msh_version_1.output
+++ b/tests/grid/grid_in_msh_version_1.output
@@ -1,5 +1,5 @@
 
-DEAL::grid_in_msh_version_1/input_v1	64	49
+DEAL::grid_in_msh_version_1/input_v1.msh	64	49
 -1.0000 -1.0000 0 0
 -0.71429 -1.0000 0 0
 -0.71429 -0.71429 0 0
@@ -343,7 +343,7 @@ DEAL::grid_in_msh_version_1/input_v1	64	49
 0.71429 0.71429 0 0
 
 
-DEAL::grid_in_msh_version_1/input_v2	64	49
+DEAL::grid_in_msh_version_1/input_v2.msh	64	49
 -1.0000 -1.0000 0 0
 -0.71429 -1.0000 0 0
 -0.71429 -0.71429 0 0
diff --git a/tests/grid/grid_in_msh_version_2.cc b/tests/grid/grid_in_msh_version_2.cc
index 9b16a22e1c..59c362190f 100644
--- a/tests/grid/grid_in_msh_version_2.cc
+++ b/tests/grid/grid_in_msh_version_2.cc
@@ -47,9 +47,9 @@ check_file(const std::string name, typename GridIn<dim>::Format format)
 void
 filename_resolution()
 {
-  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh_version_2/hole81"),
+  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh_version_2/hole81.msh"),
                 GridIn<2>::msh);
-  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh_version_2/hole8170"),
+  check_file<2>(std::string(SOURCE_DIR "/grid_in_msh_version_2/hole8170.msh"),
                 GridIn<2>::msh);
 }
 
diff --git a/tests/grid/grid_in_unv_2d.cc b/tests/grid/grid_in_unv_2d.cc
index b258c617d4..8e14dbf648 100644
--- a/tests/grid/grid_in_unv_2d.cc
+++ b/tests/grid/grid_in_unv_2d.cc
@@ -49,11 +49,11 @@ check_file(const std::string name, typename GridIn<dim>::Format format)
 void
 filename_resolution()
 {
-  check_file<2>(std::string(SOURCE_DIR "/grid_in_unv_2d/test1427"),
+  check_file<2>(std::string(SOURCE_DIR "/grid_in_unv_2d/test1427.unv"),
                 GridIn<2>::unv);
-  check_file<2>(std::string(SOURCE_DIR "/grid_in_unv_2d/test46"),
+  check_file<2>(std::string(SOURCE_DIR "/grid_in_unv_2d/test46.unv"),
                 GridIn<2>::unv);
-  check_file<2>(std::string(SOURCE_DIR "/grid_in_unv_2d/salome_square"),
+  check_file<2>(std::string(SOURCE_DIR "/grid_in_unv_2d/salome_square.unv"),
                 GridIn<2>::unv);
 }
 
diff --git a/tests/grid/grid_in_unv_3d.cc b/tests/grid/grid_in_unv_3d.cc
index 7216049afb..a4bfbc455a 100644
--- a/tests/grid/grid_in_unv_3d.cc
+++ b/tests/grid/grid_in_unv_3d.cc
@@ -49,8 +49,9 @@ check_file(const std::string name, typename GridIn<dim>::Format format)
 void
 filename_resolution()
 {
-  check_file<3>(std::string(SOURCE_DIR "/grid_in_unv_3d/3D"), GridIn<3>::unv);
-  check_file<3>(std::string(SOURCE_DIR "/grid_in_unv_3d/salome_cube"),
+  check_file<3>(std::string(SOURCE_DIR "/grid_in_unv_3d/3D.unv"),
+                GridIn<3>::unv);
+  check_file<3>(std::string(SOURCE_DIR "/grid_in_unv_3d/salome_cube.unv"),
                 GridIn<3>::unv);
 }
 
diff --git a/tests/grid/grid_in_unv_3d_02.cc b/tests/grid/grid_in_unv_3d_02.cc
index 3b15f6c7be..7d4bdb350e 100644
--- a/tests/grid/grid_in_unv_3d_02.cc
+++ b/tests/grid/grid_in_unv_3d_02.cc
@@ -50,7 +50,7 @@ check_file(const std::string name, typename GridIn<dim>::Format format)
 void
 filename_resolution()
 {
-  check_file<3>(std::string(SOURCE_DIR "/grid_in_unv_3d_02/mesh"),
+  check_file<3>(std::string(SOURCE_DIR "/grid_in_unv_3d_02/mesh.unv"),
                 GridIn<3>::unv);
 }