For the issue #1156 : do not cause Placement error on activation of previous Part...

[modules/shaper.git] / salome_run.sh

diff --git a/salome_run.sh b/salome_run.sh
index 003d5fcf9107e0ba747a02a1db23bcd334df2ca5..b7bda749c976193d30730934195965336707fea1 100755 (executable)
--- a/salome_run.sh
+++ b/salome_run.sh
@@ -1,11 +1,24 @@
-#!/bin/bash -x
-
-export SALOME_PORT=2900
+#!/bin/bash
 
 source env.sh
-source env_salome.sh
+source ${TOOLS_DIR}/env_salome.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=""
+SALOME_ARGS="${SALOME_ARGS} -r ${SOURCES_DIR}/test.squish/shared/testdata/SalomeApp.xml"
+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}"
+