Replace DATA_DIR environment variable in tests by MED_ROOT_DIR

diff --git a/src/INTERP_KERNEL/Test/Interpolation3DTest.cxx b/src/INTERP_KERNEL/Test/Interpolation3DTest.cxx
index 1522cfac6478f6229251677b50e260bfb1e5e88a..8453fa484a2fdd8527686473b8967644631ddd9f 100644 (file)
--- a/src/INTERP_KERNEL/Test/Interpolation3DTest.cxx
+++ b/src/INTERP_KERNEL/Test/Interpolation3DTest.cxx
@@ -248,7 +248,8 @@ void Interpolation3DTest::tearDown()
 
 void Interpolation3DTest::calcIntersectionMatrix(const char* mesh1path, const char* mesh1, const char* mesh2path, const char* mesh2, IntersectionMatrix& m) const
 {
-  const string dataDir = getenv("DATA_DIR");
+  const string dataBaseDir = getenv("MED_ROOT_DIR");
+  const string dataDir = dataBaseDir + "/share/salome/resources/med/";
 
   LOG(1, std::endl << "=== -> intersecting src = " << mesh1 << ", target = " << mesh2 );
 

diff --git a/src/INTERP_KERNEL/Test/MeshTestToolkit.txx b/src/INTERP_KERNEL/Test/MeshTestToolkit.txx
index 919563a94eac69cb388b1261f23b4c709b40e46f..61fbdfcfee2f0255a00ae5cd6b05ee786fb3c81b 100644 (file)
--- a/src/INTERP_KERNEL/Test/MeshTestToolkit.txx
+++ b/src/INTERP_KERNEL/Test/MeshTestToolkit.txx
@@ -345,7 +345,7 @@ namespace INTERP_TEST
   void MeshTestToolkit<SPACEDIM,MESHDIM>::calcIntersectionMatrix(const char* mesh1path, const char* mesh1, const char* mesh2path, const char* mesh2, IntersectionMatrix& m) const
   {
     const string dataBaseDir = getenv("MED_ROOT_DIR");
-    const string dataDir = dataBaseDir + string("/share/salome/resources/MedFiles/");
+    const string dataDir = dataBaseDir + string("/share/salome/resources/med/");
 
     LOG(1, std::endl << "=== -> intersecting src = " << mesh1path << ", target = " << mesh2path );
 

diff --git a/src/INTERP_KERNEL/Test/PerfTest.cxx b/src/INTERP_KERNEL/Test/PerfTest.cxx
index 6d141be0800e39c105e9fb08ed14d9e8abac8a5a..e6597f7f65eeadab6507fbed3feb5ee1d2534dce 100644 (file)
--- a/src/INTERP_KERNEL/Test/PerfTest.cxx
+++ b/src/INTERP_KERNEL/Test/PerfTest.cxx
@@ -49,7 +49,7 @@ namespace INTERP_TEST
     void calcIntersectionMatrix(const char* mesh1path, const char* mesh1, const char* mesh2path, const char* mesh2, IntersectionMatrix& m) 
     {
       const string dataBaseDir = getenv("MED_ROOT_DIR");
-      const string dataDir = dataBaseDir + "share/salome/resources/med/";
+      const string dataDir = dataBaseDir + "/share/salome/resources/med/";
 
       LOG(1, std::endl << "=== -> intersecting src = " << mesh1 << ", target = " << mesh2 );
       

diff --git a/src/INTERP_KERNEL/Test/RemapperTest.cxx b/src/INTERP_KERNEL/Test/RemapperTest.cxx
index abd1b7c287807378deefdb472c19250053149ca1..50f4b03f895f298793b80803c91f3da19be2f06f 100644 (file)
--- a/src/INTERP_KERNEL/Test/RemapperTest.cxx
+++ b/src/INTERP_KERNEL/Test/RemapperTest.cxx
@@ -27,11 +27,11 @@ namespace INTERP_TEST
    */
   void RemapperTest::test_Remapper() {
                string sourcename=getenv("MED_ROOT_DIR");
-               sourcename +="/share/salome/resources/MedFiles/square1.med";
+               sourcename +="/share/salome/resources/med/square1.med";
                MEDMEM::MESH source_mesh (MED_DRIVER,sourcename,"Mesh_2");
 
                string targetname=getenv("MED_ROOT_DIR");
-               targetname +="/share/salome/resources/MedFiles/square2.med";
+               targetname +="/share/salome/resources/med/square2.med";
                MEDMEM::MESH target_mesh (MED_DRIVER,targetname,"Mesh_3");
 
                MEDMEM::SUPPORT source_support(&source_mesh,"on All support");

diff --git a/src/INTERP_KERNEL/Test/TestingUtils.hxx b/src/INTERP_KERNEL/Test/TestingUtils.hxx
index d10abfc0fbc0f19bd67d8db489754726a78563e7..7046410b369e917ac28978e9f791b2c912137419 100644 (file)
--- a/src/INTERP_KERNEL/Test/TestingUtils.hxx
+++ b/src/INTERP_KERNEL/Test/TestingUtils.hxx
@@ -188,7 +188,8 @@ std::pair<int,int> countNumberOfMatrixEntries(const IntersectionMatrix& m)
 
 void calcIntersectionMatrix(const char* mesh1path, const char* mesh1, const char* mesh2path, const char* mesh2, IntersectionMatrix& m) 
 {
-  const string dataDir = getenv("DATA_DIR");
+  const string dataBaseDir = getenv("MED_ROOT_DIR");
+  const string dataDir = dataBaseDir + "/share/salome/resources/med/";
 
   LOG(1, std::endl << "=== -> intersecting src = " << mesh1 << ", target = " << mesh2 );