X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FRENUMBER%2FtestRenumbering.py;h=ca09ecb8ffd50151d3239cff42b0eae0a1430713;hb=4b4c848900cf2fb2cd8cb585c6ff21c7d284b87b;hp=ab5c0c77073dfebdb39ddae65ff7bad794539b9c;hpb=45b1260e6a5ec6a871e578565eb3df695f605f0b;p=tools%2Fmedcoupling.git diff --git a/src/RENUMBER/testRenumbering.py b/src/RENUMBER/testRenumbering.py index ab5c0c770..ca09ecb8f 100755 --- a/src/RENUMBER/testRenumbering.py +++ b/src/RENUMBER/testRenumbering.py @@ -1,11 +1,11 @@ #!/usr/bin/env python # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D +# Copyright (C) 2007-2016 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -189,21 +189,9 @@ class RenumberingTest(unittest.TestCase): pass def setUp(self): - srcdir = os.getenv("srcdir") - med_root = os.getenv("MED_ROOT_DIR") - if srcdir: - # make test is being performed - self.dir_renumber="./renumber" - self.dir_mesh = os.path.join( srcdir, "../../resources") - elif med_root: - # hope renumber has been already installed - self.dir_renumber=os.path.join( med_root, "bin/salome/renumber") - self.dir_mesh = os.path.join( med_root, "share/salome/resources/med") - else: - # initial version - self.dir_renumber="../../../MED_INSTALL/bin/salome/renumber" - self.dir_mesh="../../resources" - pass + med_root_dir=os.getenv("MEDCOUPLING_ROOT_DIR") + self.dir_renumber=os.path.join(med_root_dir, "bin/renumber") + self.dir_mesh=os.path.join(med_root_dir, "share","resources","med") pass pass