From 9b1cad9f933a18c07b971b4183e2114e61d11fc8 Mon Sep 17 00:00:00 2001 From: Bernard Secher Date: Tue, 8 Sep 2020 11:16:48 +0200 Subject: [PATCH] update for squish tests --- bin/runSalome.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bin/runSalome.py b/bin/runSalome.py index b4fc7270f..a5997a2b1 100755 --- a/bin/runSalome.py +++ b/bin/runSalome.py @@ -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(":") -- 2.39.2