Run properly tests (python scripts) in terminal, gui/desktop and gui/no-desktop modes...

diff --git a/bin/launchConfigureParser.py b/bin/launchConfigureParser.py
index 0fb63c0d21f9c4162e211c8dcf75a6d29486e765..5d52301704ff915b58dc410e0d98719d5c15523c 100755 (executable)
--- 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 27d6997a4fad65eb5ddf42b3ed3656ca01f20d4a..b940608708e94bc7812be090c5001b2220ff71e9 100644 (file)
--- 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
 #