X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=salome_run.sh;h=8feb27cac881deaa6b8c23b1fcdf268edc6aeb81;hb=f2709e635f5490138f93c8ed401de6686bcc685f;hp=003d5fcf9107e0ba747a02a1db23bcd334df2ca5;hpb=438157bbee75d04c3737ec50ce1953e9fde8607a;p=modules%2Fshaper.git

diff --git a/salome_run.sh b/salome_run.sh
index 003d5fcf9..8feb27cac 100755
--- a/salome_run.sh
+++ b/salome_run.sh
@@ -1,11 +1,28 @@
-#!/bin/bash -x
-
-export SALOME_PORT=2900
+#!/bin/bash
 
 source env.sh
-source env_salome.sh
+source ${TOOLS_DIR}/env_salome.sh
 
+${TOOLS_DIR}/solver.sh "$@"
+
+# kill processes of previous SALOME run
+if [ -f .salomeport ]; then
+  SALOME_PORT=$(cat .salomeport)
+  ${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py ${SALOME_PORT}
+  pkill -f "omniNames -start ${SALOME_PORT}"
+  rm .salomeport
+fi 
+
+SALOME_ARGS=""
+if [[ "${SALOME_SQUISH_PREFS:-FALSE}" == "TRUE" ]]; then
+  SALOME_ARGS="${SALOME_ARGS} -r ${SOURCES_DIR}/test.squish/shared/testdata/SalomeApp.xml"
+fi
+SALOME_ARGS="${SALOME_ARGS} --ns-port-log=$(pwd)/.salomeport"
+
+${KERNEL_ROOT_DIR}/bin/salome/runSalome.py ${SALOME_ARGS} >log_runSalome 2>err_runSalome
+
+SALOME_PORT=$(cat .salomeport)
+echo "Kill SALOME on port ${SALOME_PORT}"
 ${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py ${SALOME_PORT}
-${KERNEL_ROOT_DIR}/bin/salome/runSalome.py --port=${SALOME_PORT} -r ./test.squish/shared/testdata/SalomeApp.xml
-sleep 5
-${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py ${SALOME_PORT}
+pkill -f "omniNames -start ${SALOME_PORT}"
+