X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FINTERP_KERNELTest%2FTestInterpKernelUtils.cxx;h=6d466befbf2d994ae8fbc7760b006d3c1fc75df2;hb=8411b13fec372c7635bf04d2bb81a869dc038fdd;hp=b0ee27d2413a3cf9c89932875c76b1e581715198;hpb=e2e2cdc3f8a76bdae5b96799247e6a621a6f52ee;p=tools%2Fmedcoupling.git diff --git a/src/INTERP_KERNELTest/TestInterpKernelUtils.cxx b/src/INTERP_KERNELTest/TestInterpKernelUtils.cxx index b0ee27d24..6d466befb 100644 --- a/src/INTERP_KERNELTest/TestInterpKernelUtils.cxx +++ b/src/INTERP_KERNELTest/TestInterpKernelUtils.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 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 @@ -29,6 +29,7 @@ #endif #include #include +#include namespace INTERP_TEST { @@ -36,13 +37,23 @@ namespace INTERP_TEST { std::string resourceFile = ""; 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.c_str()); - if (my_file.good()) - return resourceFile; + // 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; } // else char * tmp_c = getcwd(NULL, 0);