X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FINTERP_KERNELTest%2FTestInterpKernelUtils.cxx;h=6d466befbf2d994ae8fbc7760b006d3c1fc75df2;hb=8411b13fec372c7635bf04d2bb81a869dc038fdd;hp=262699a35a47a40430e8388acdb5a3f076f225de;hpb=1ff18bfcccb60eb7954f23a427024379f70eb3a9;p=tools%2Fmedcoupling.git

diff --git a/src/INTERP_KERNELTest/TestInterpKernelUtils.cxx b/src/INTERP_KERNELTest/TestInterpKernelUtils.cxx
index 262699a35..6d466befb 100644
--- a/src/INTERP_KERNELTest/TestInterpKernelUtils.cxx
+++ b/src/INTERP_KERNELTest/TestInterpKernelUtils.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2020  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -21,37 +21,55 @@
 #include "InterpKernelException.hxx"
 
 #include <cstdlib>
+#ifdef WIN32
+#include<direct.h>
+#define getcwd _getcwd
+#else
 #include <unistd.h>
+#endif
 #include <sstream>
 #include <fstream>
+#include <algorithm>
 
 namespace INTERP_TEST
 {
-  std::string getResourceFile( const std::string& filename )
+  std::string getResourceFile( const std::string& filename, int levelUp)
   {
     std::string resourceFile = "";
-    bool good = false;
-
     if ( getenv("MEDCOUPLING_ROOT_DIR") ) {
-      // use MEDCOUPLING_ROOT_DIR env.var
-      resourceFile = getenv("MEDCOUPLING_ROOT_DIR");
-      resourceFile += "/share/resources/med/";
-      resourceFile += filename;
-      std::ifstream my_file(resourceFile);
-      if (my_file.good())
-        good = true;
+        // use MEDCOUPLING_ROOT_DIR env.var
+        resourceFile = getenv("MEDCOUPLING_ROOT_DIR");
+        resourceFile += "/share/resources/med/";
+        resourceFile += filename;
+        std::ifstream my_file(resourceFile.c_str());
+        if (my_file.good())
+          return resourceFile;
+    }
+    if ( getenv("MEDCOUPLING_RESOURCE_DIR") ) {
+        // use MEDCOUPLING_RESOURCE_DIR env.var
+        resourceFile = getenv("MEDCOUPLING_RESOURCE_DIR");
+        resourceFile.erase(std::remove(resourceFile.begin(), resourceFile.end(), ':'), resourceFile.end());
+        resourceFile += "/";
+        resourceFile += filename;
+        std::ifstream my_file(resourceFile.c_str());
+        if (my_file.good())
+          return resourceFile;
     }
-    if (!good)
+    // else
+    char * tmp_c = getcwd(NULL, 0);
+    resourceFile = tmp_c;
+    free(tmp_c);
+    resourceFile += "/";
+    for(int i=0; i<levelUp; i++)
+      resourceFile += "../";
+    resourceFile += "resources/";
+    resourceFile += filename;
+    std::ifstream my_file(resourceFile.c_str());
+    if (!my_file.good())
       {
-        resourceFile = get_current_dir_name();
-        resourceFile += "/../../resources/";
-        std::ifstream my_file(resourceFile);
-        if (!my_file.good())
-          {
-            std::stringstream ss;
-            ss << "INTERP_TEST::getResourceFile(): could not open resource test file: " << filename << "\n";
-            throw INTERP_KERNEL::Exception(ss.str().c_str());
-          }
+        std::stringstream ss;
+        ss << "INTERP_TEST::getResourceFile(): could not open resource test file: " << filename << "\n";
+        throw INTERP_KERNEL::Exception(ss.str().c_str());
       }
 
     return resourceFile;