]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
update for squish tests bsr/squish
authorBernard Secher <bernard.secher@cea.fr>
Tue, 8 Sep 2020 09:16:48 +0000 (11:16 +0200)
committerBernard Secher <bernard.secher@cea.fr>
Tue, 8 Sep 2020 09:16:48 +0000 (11:16 +0200)
bin/runSalome.py

index b4fc7270f7634d38549f529798fe2d33d33209f3..a5997a2b19ffb2dbccbd62a7014445cdbbdc93d1 100755 (executable)
@@ -34,6 +34,7 @@ from server import process_id, Server
 import json
 import subprocess
 from salomeContextUtils import ScriptAndArgsObjectEncoder
+import platform
 
 # -----------------------------------------------------------------------------
 
@@ -271,6 +272,11 @@ class SessionServer(Server):
         #
         self.initArgs()
         self.SCMD1=['SALOME_Session_Server']
+        if "SQUISH_PREFIX" in os.environ:
+            if platform.system() == "Windows" :
+                self.SCMD1 = [os.path.join(os.getenv("SQUISH_PREFIX"), "bin", "dllpreload.exe"),os.path.join(os.getenv("SQUISH_SALOME_PATH"), "W64", "GUI", "bin", "salome", self.SCMD1[0])]
+            else :
+                os.environ["LD_LIBRARY_PATH"] = os.environ["SQUISH_PREFIX"] + "/lib:" + os.environ["LD_LIBRARY_PATH"]
         self.SCMD2=[]
         if 'launcher' in self.args:
             pos = args['launcher'].find(":")