tests: fix tests failing due to pathsearch changes

diff --git a/tests/grid/grid_in.cc b/tests/grid/grid_in.cc
index d612dbe6d9ef0b2e8d67238fe0451426ede4f22a..c6f16a2b709a13d846c24849425a5c29ba6e0302 100644 (file)
--- 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 3b1379989e1658326df7a81c3b8b508f574b411d..759b5cf3c3a29d79e4cda46e29094374f141b2d0 100644 (file)
--- 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 47a94a9e8a390dcde3132d25a9b642c142a88c27..0766aebe84222d769cf783a4febc413cf782f54e 100644 (file)
--- 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 63861ee6cc83c1864bfab5ad8f56f6d48c9c772b..61b392e270cb24161e1d0af7ca842db638c7274c 100644 (file)
--- 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 7eb0e763184e9ae2ccf1d5a448820515e67627d9..70e41875d33c1f6ca3f49351d0e5ca84514038a3 100644 (file)
--- 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 0915ff09d9540b5ab0d158a7a482abb3e0e933c1..5c06c3374611e046a0037755f9f7f73be026c478 100644 (file)
--- 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 99ad5952b0ce02567b81c3e0d9c47f7a72ab9d1b..433b4642644f00e1eb9ad7b0cfdee3871e11b3c8 100644 (file)
--- 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 1b2a9f9783fda599c17eb0177f0aaf9fd4233dec..cefa66301a069514cb99beb0264a32ec6b7ca60f 100644 (file)
--- 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 1dbaa89cba564667bb8b11a3f0baa65bc165327f..3a9661a83175324652e0fd5850526e591abec6da 100644 (file)
--- 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 9b16a22e1cab26050a2e6a6661dd3e755379a12d..59c362190f5d3bfa6b14f23849c8c6cfaef1d270 100644 (file)
--- 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 b258c617d46cba5fedf157c608190b877fa030a8..8e14dbf648cc4d3cfb22b573fe683fc3e8c41ce6 100644 (file)
--- 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 7216049afba54f943f22397d0700fcc25945c62a..a4bfbc455a210b48eccd6bb286fbfe5c306cea26 100644 (file)
--- 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 3b15f6c7beb0cf9e24a0e909eb33468558990ca4..7d4bdb350e59e95c8754f8fa2c6bf42143e3e7ea 100644 (file)
--- 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);
 }