From cf4dae094bc8f0a107032e08b181ebbb72325aaf Mon Sep 17 00:00:00 2001 From: crouzet Date: Thu, 7 Feb 2019 11:56:29 +0100 Subject: [PATCH] =?utf8?q?Nettoyage=20effectu=C3=A9=20vis=20=C3=A0=20vis?= =?utf8?q?=20des=20anciens=20cas=20d'utilisation=20obsol=C3=A8tes?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/test_module.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/test_module.py b/src/test_module.py index 696306a..e0aa444 100644 --- a/src/test_module.py +++ b/src/test_module.py @@ -499,21 +499,6 @@ echo -e 'import os\nprint(os.environ[\"KERNEL_ROOT_DIR\"])' > tmpscript.py return default_value def generate_launching_commands(self): - # Case where "sat test" is launched in an existing SALOME environment - if 'KERNEL_ROOT_DIR' in os.environ: - binSalome = "runSalome" - binPython = "python" - killSalome = "killSalome.py" - - # Rare case where there is no KERNEL in grid list - # (for example MED_STANDALONE) - if ('APPLICATION' in self.config and - 'KERNEL' not in self.config.APPLICATION.products): - binSalome = "runSalome" - binPython = "python" - killSalome = "killSalome.py" - src.environment.load_environment(self.config, False, self.logger) - return binSalome, binPython, killSalome # Case where there the appli option is called (with path to launcher) if len(self.launcher) > 0: @@ -521,7 +506,7 @@ echo -e 'import os\nprint(os.environ[\"KERNEL_ROOT_DIR\"])' > tmpscript.py # and the new one launcherName = os.path.basename(self.launcher) launcherDir = os.path.dirname(self.launcher) - if launcherName == 'runAppli': + if os.path.basename(launcherDir) == 'APPLI': # Old application binSalome = self.launcher binPython = ("for i in " + -- 2.39.2