From f6d6c65664de3d46a3d4840278906db6fbdbb6aa Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 30 Jan 2014 11:19:02 +0000 Subject: [PATCH] Run properly tests (python scripts) in terminal, gui/desktop and gui/no-desktop modes; fix regression with 'make test' in GEOM and SMESH modules caused by prevous integration --- bin/launchConfigureParser.py | 2 +- bin/salomeLauncherUtils.py.in | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/bin/launchConfigureParser.py b/bin/launchConfigureParser.py index 0fb63c0d2..5d5230170 100755 --- a/bin/launchConfigureParser.py +++ b/bin/launchConfigureParser.py @@ -1069,7 +1069,7 @@ def get_env(theAdditionalOptions=[], appname=salomeappname, cfgname=salomecfgnam # Python scripts args[script_nam] = getScriptsAndArgs(cmd_args) new_args = [] - if args[gui_nam]: + if args[gui_nam] and args["session_gui"]: for d in args[script_nam]: for s, a in d.items(): v = re.sub(r'^python.*\s+', r'', s) diff --git a/bin/salomeLauncherUtils.py.in b/bin/salomeLauncherUtils.py.in index 27d6997a4..b94060870 100644 --- a/bin/salomeLauncherUtils.py.in +++ b/bin/salomeLauncherUtils.py.in @@ -130,7 +130,7 @@ def formatScriptsAndArgs(scriptArgs=[]): commands = [] for sc_dict in scriptArgs: for script, sc_args in sc_dict.items(): # single entry - cmd = "@PYTHONBIN@ " + script + cmd = script if sc_args: cmd = cmd + " " + " ".join(sc_args) commands.append(cmd) @@ -138,9 +138,6 @@ def formatScriptsAndArgs(scriptArgs=[]): if sys.platform == "win32": sep= " & " command = sep.join(["%s"%x for x in commands]) - - - command = "; ".join(["%s"%x for x in commands]) return command # -- 2.39.2